--- swt-gtk-3.7.orig/debian/README +++ swt-gtk-3.7/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.7.orig/debian/libswt-gtk-3-java.postinst +++ swt-gtk-3.7/debian/libswt-gtk-3-java.postinst @@ -0,0 +1,24 @@ +#! /bin/sh +set -e + +case "$1" in + configure) + update-alternatives --install \ + /usr/share/java/swt.jar \ + swt.jar \ + /usr/lib/java/swt-gtk-3.7.jar \ + 103 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- swt-gtk-3.7.orig/debian/watch +++ swt-gtk-3.7/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.7.orig/debian/NEWS.Debian +++ swt-gtk-3.7/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.7.orig/debian/rules +++ swt-gtk-3.7/debian/rules @@ -0,0 +1,44 @@ +#!/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 + +ifneq (,$(filter $(DEB_HOST_ARCH), powerpcspe)) + AWT_LIB_DIR = ppc +endif + +ifneq (,$(filter $(DEB_HOST_ARCH), sh4)) + AWT_LIB_DIR = sh +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 --- swt-gtk-3.7.orig/debian/control +++ swt-gtk-3.7/debian/control @@ -0,0 +1,101 @@ +Source: swt-gtk +Section: libs +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Adrian Perez , + أحمد المحمودي (Ahmed El-Mahmoudy) +DM-Upload-Allowed: yes +Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev, + libxcb-render-util0-dev, libxt-dev, + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, + fastjar, cdbs, patchutils, debhelper (>= 8), libwebkit-dev +Standards-Version: 3.9.2 +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-java +Architecture: any +Section: java +Depends: libswt-gtk-3-jni (= ${binary:Version}), ${misc:Depends} +Suggests: libswt-gtk-3-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-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libswt-gnome-gtk-3-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-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-cairo-gtk-3-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-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-webkit-gtk-3-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Standard Widget Toolkit for GTK+ WebKit 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 WebKit JNI libraries. + +Package: libswt-gtk-3-java-gcj +Architecture: any +Section: java +Depends: ${misc:Depends}, ${shlibs:Depends}, + libswt-cairo-gtk-3-jni (= ${binary:Version}), + libswt-glx-gtk-3-jni (= ${binary:Version}), + libswt-gnome-gtk-3-jni (= ${binary:Version}), + libswt-gtk-3-jni (= ${binary:Version}), + libswt-webkit-gtk-3-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.7.orig/debian/compat +++ swt-gtk-3.7/debian/compat @@ -0,0 +1 @@ +8 --- swt-gtk-3.7.orig/debian/libswt-webkit-gtk-3-jni.install +++ swt-gtk-3.7/debian/libswt-webkit-gtk-3-jni.install @@ -0,0 +1 @@ +libswt-webkit-*[0-9].so usr/lib/jni --- swt-gtk-3.7.orig/debian/libswt-gtk-3-java.lintian-overrides +++ swt-gtk-3.7/debian/libswt-gtk-3-java.lintian-overrides @@ -0,0 +1,2 @@ +# swt-gtk-3.jar is architecture-dependent: +libswt-gtk-3-java: jar-not-in-usr-share usr/lib/java/swt-gtk-3.7.jar --- swt-gtk-3.7.orig/debian/libswt-gtk-3-java.install +++ swt-gtk-3.7/debian/libswt-gtk-3-java.install @@ -0,0 +1,2 @@ +swt-gtk-*.jar usr/lib/java +debian/java-config/libswt-gtk* usr/share/java-config --- swt-gtk-3.7.orig/debian/gbp.conf +++ swt-gtk-3.7/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- swt-gtk-3.7.orig/debian/libswt-cairo-gtk-3-jni.install +++ swt-gtk-3.7/debian/libswt-cairo-gtk-3-jni.install @@ -0,0 +1 @@ +libswt-cairo-*[0-9].so usr/lib/jni --- swt-gtk-3.7.orig/debian/libswt-gtk-3-java.links +++ swt-gtk-3.7/debian/libswt-gtk-3-java.links @@ -0,0 +1 @@ +usr/lib/java/swt-gtk-3.7.jar usr/share/java/swt-gtk-3.7.jar --- swt-gtk-3.7.orig/debian/copyright +++ swt-gtk-3.7/debian/copyright @@ -0,0 +1,845 @@ +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-2010, 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 or GPL-2 or LGPL-2.1 + +Files: org/eclipse/swt/internal/mozilla/*.java +Copyright: 2003-2009, 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/gnome/* +Copyright: 2000-2008, IBM Corporation and others +License: LGPL-2.1 + +Files: org/eclipse/swt/internal/cde/* +Copyright: 2000-2008, 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.7.orig/debian/libswt-gnome-gtk-3-jni.install +++ swt-gtk-3.7/debian/libswt-gnome-gtk-3-jni.install @@ -0,0 +1 @@ +libswt-gnome-*[0-9].so usr/lib/jni --- swt-gtk-3.7.orig/debian/libswt-gtk-3-jni.install +++ swt-gtk-3.7/debian/libswt-gtk-3-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.7.orig/debian/changelog +++ swt-gtk-3.7/debian/changelog @@ -0,0 +1,444 @@ +swt-gtk (3.7-2) unstable; urgency=low + + * Disable xulrunner support and enable webkit (Closes: #631048) + + debian/control: + - Remove xulrunner-dev from Build-Deps + - Remove libswt-mozilla-gtk-3-jni package + + debian/Makefile: do not build mozilla/xpcom/xulrunner extensions + + debian/rules: do not call dh_xulrunner + + remove debian/libswt-mozilla-gtk-3-jni.install + (Patch from Ubuntu) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 13 Jul 2011 17:57:26 +0200 + +swt-gtk (3.7-1) unstable; urgency=low + + * New upstream release. + * Mass package rename 3.6[.2] => 3 (Use major version only). + * Updated arch64.diff patch for new upstream release. + * Removed 02-webkit_linkage and 04-fix-webkit-includes patches as they got + applied upstream. + * debian/control: Bumped Standards-Version to 3.9.2, no changes needed. + * Added 01-as-needed.diff patch to use -Wl,--as-needed when linking + * Added debian/libswt-gtk-3.7-java.lintian-overrides + * Added debian/gbp.conf + * debian/Makefile: Figure out the RELEASE from Debian changelog instead of + hard-coding it. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Tue, 28 Jun 2011 14:57:14 +0200 + +swt-gtk (3.6.2-1) unstable; urgency=low + + * New upstream release. (Closes: #592338) + * debian/control, debian/Makefile, debian/libswt-webkit-gtk-3.6-jni.install: + add WebKit package. + * Dropped 02-bp-accessible-object.diff, since it is applied upstream. + * debian/control: Set Maintainer to Debian Java Maintainers, and added + Adrian and myself to Uploaders. + * Updated 64/arch64.diff patch (from Ubuntu package) + * Added common/02-webkit_linkage.patch patch from Ubuntu to fix linkage for + WebKit (>= 1.3). + * Added common/04-fix-webkit-includes.patch (based on a patch from Ubuntu), + to fix a missing include for WebKit (>= 1.3) JNI. + * debian/control: Put libswt-gtk-3.6-java-gcj in java section + * Bump to compat level 8. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 02 Apr 2011 10:48:43 +0200 + +swt-gtk (3.5.1-5) unstable; urgency=low + + * debian/patches: Move 02-bp-accessible-object to common/ directory. + * debian/copyright: More updates. + + -- Adrian Perez Thu, 16 Sep 2010 13:09:55 -0400 + +swt-gtk (3.5.1-4) unstable; urgency=low + + * debian/patches: + - Refresh arch64.diff. FTBFS on x86_64 CPUs. + - Rename bp-accessible-object patch. + * debian/rules: + - Support powerpcspe builds. Closes: #597056. + Thanks: Sebastian Andrzej Siewior. + + -- Adrian Perez Thu, 16 Sep 2010 11:15:48 -0400 + +swt-gtk (3.5.1-3) unstable; urgency=low + + * Acknowledge AWL-forced NMU. Thanks: Ahmed El-Mahmoudy. + * debian/control: Update maintainer e-mail address. + * debian/copyright: Minor updates. + * debian/rules: Support SH4 builds. Closes: #593178. + Thanks: Nobuhiro Iwamatsu. + * debian/patches: + - Backport AccessibleObject.getAccessibleObject() upstream + patch. Closes: #563046. + * Partly revert removal of alternatives scripts. + Closes: #594641, #568940. Thanks: Ahmed El-Mahmoudy. + + -- Adrian Perez Tue, 14 Sep 2010 18:10:36 -0400 + +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.7.orig/debian/libswt-glx-gtk-3-jni.install +++ swt-gtk-3.7/debian/libswt-glx-gtk-3-jni.install @@ -0,0 +1 @@ +libswt-glx-*[0-9].so usr/lib/jni --- swt-gtk-3.7.orig/debian/libswt-gtk-3-java.prerm +++ swt-gtk-3.7/debian/libswt-gtk-3-java.prerm @@ -0,0 +1,19 @@ +#! /bin/sh +set -e + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --remove swt.jar \ + /usr/lib/java/swt-gtk-3.7.jar + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- swt-gtk-3.7.orig/debian/README.Debian +++ swt-gtk-3.7/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.7.orig/debian/docs +++ swt-gtk-3.7/debian/docs @@ -0,0 +1,2 @@ +debian/README +debian/README.Debian --- swt-gtk-3.7.orig/debian/Makefile +++ swt-gtk-3.7/debian/Makefile @@ -0,0 +1,36 @@ +RELEASE=$(strip $(shell dpkg-parsechangelog | grep Version: | cut -d: -f2 | cut -d- -f1)) +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_swt make_webkit + +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.7.orig/debian/patches/common/01-make_linux.patch +++ swt-gtk-3.7/debian/patches/common/01-make_linux.patch @@ -0,0 +1,40 @@ +diff -Nur -x '*.orig' -x '*~' swt-gtk/make_linux.mak swt-gtk.new/make_linux.mak +--- swt-gtk/make_linux.mak 2011-12-06 19:13:57.054148957 -0500 ++++ swt-gtk.new/make_linux.mak 2011-12-06 20:07:00.554197279 -0500 +@@ -66,6 +66,7 @@ + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS + ++JAVA_HOME=/usr/lib/jvm/default-java + MOZILLACFLAGS = -O \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ +@@ -78,8 +79,10 @@ + -I. \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/linux \ ++ `pkg-config --cflags libxul-embedding` \ + ${SWT_PTR_CFLAGS} +-MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic ++MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \ ++ `pkg-config --libs libxul-embedding` + MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ + -DNO__1XPCOMGlueStartup \ + -DNO__1XPCOMGlueLoadXULFunctions \ +@@ -107,7 +110,7 @@ + WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o + GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o + +-CFLAGS = -O -Wall \ ++override CFLAGS += \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ +@@ -117,6 +120,7 @@ + ${SWT_PTR_CFLAGS} + LFLAGS = -shared -fPIC ${SWT_LFLAGS} + ++NO_STRIP=1 + ifndef NO_STRIP + AWT_LFLAGS := $(AWT_LFLAGS) -s + MOZILLALFLAGS := $(MOZILLALFLAGS) -s --- swt-gtk-3.7.orig/debian/patches/common/01-as-needed.diff +++ swt-gtk-3.7/debian/patches/common/01-as-needed.diff @@ -0,0 +1,104 @@ +Description: Use -Wl,--as-needed when linking +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346 +--- a/make_linux.mak ++++ b/make_linux.mak +@@ -137,7 +137,7 @@ + $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c + + $(SWTPI_LIB): $(SWTPI_OBJECTS) +- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) ++ $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) -Wl,--as-needed $(GTKLIBS) + + swt.o: swt.c swt.h + $(CC) $(CFLAGS) -c swt.c +@@ -156,7 +156,7 @@ + make_cairo: $(CAIRO_LIB) + + $(CAIRO_LIB): $(CAIRO_OBJECTS) +- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) ++ $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) -Wl,--as-needed $(CAIROLIBS) + + cairo.o: cairo.c cairo.h swt.h + $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c +@@ -172,7 +172,7 @@ + make_cde: $(CDE_LIB) + + $(CDE_LIB): $(CDE_OBJECTS) +- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) ++ $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) -Wl,--as-needed $(CDE_LIBS) + + # + # AWT lib +@@ -180,7 +180,7 @@ + make_awt:$(AWT_LIB) + + $(AWT_LIB): $(AWT_OBJECTS) +- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) ++ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS) + + # + # Atk lib +@@ -188,7 +188,7 @@ + make_atk: $(ATK_LIB) + + $(ATK_LIB): $(ATK_OBJECTS) +- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) ++ $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) -Wl,--as-needed $(ATKLIBS) + + atk.o: atk.c atk.h + $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c +@@ -205,7 +205,7 @@ + make_gnome: $(GNOME_LIB) + + $(GNOME_LIB): $(GNOME_OBJECTS) +- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) ++ $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) -Wl,--as-needed $(GNOMELIBS) + + gnome.o: gnome.c + $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c +@@ -222,7 +222,7 @@ + make_mozilla:$(MOZILLA_LIB) + + $(MOZILLA_LIB): $(MOZILLA_OBJECTS) +- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} ++ $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${MOZILLA_LIBS} + + xpcom.o: xpcom.cpp + $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp +@@ -242,7 +242,7 @@ + make_xulrunner:$(XULRUNNER_LIB) + + $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) +- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} ++ $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS} + + xpcomxul.o: xpcom.cpp + $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp +@@ -262,7 +262,7 @@ + make_xpcominit:$(XPCOMINIT_LIB) + + $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) +- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} ++ $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS} + + xpcominit.o: xpcominit.cpp + $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp +@@ -279,7 +279,7 @@ + make_webkit: $(WEBKIT_LIB) + + $(WEBKIT_LIB): $(WEBKIT_OBJECTS) +- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) ++ $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) -Wl,--as-needed $(WEBKITLIBS) + + webkit.o: webkitgtk.c + $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o +@@ -296,7 +296,7 @@ + make_glx: $(GLX_LIB) + + $(GLX_LIB): $(GLX_OBJECTS) +- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) ++ $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) -Wl,--as-needed $(GLXLIBS) + + glx.o: glx.c + $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c --- swt-gtk-3.7.orig/debian/patches/64/make_jni64.diff +++ swt-gtk-3.7/debian/patches/64/make_jni64.diff @@ -0,0 +1,13 @@ +diff --git a/make_linux.mak b/make_linux.mak +index c1bc1a1..1629f7f 100644 +--- a/make_linux.mak ++++ b/make_linux.mak +@@ -14,7 +14,7 @@ + include make_common.mak + + SWT_VERSION=$(maj_ver)$(min_ver) +- ++SWT_PTR_CFLAGS=-DJNI64 + # Define the various shared libraries to be build. + WS_PREFIX = gtk + SWT_PREFIX = swt --- swt-gtk-3.7.orig/debian/patches/64/arch64.diff +++ swt-gtk-3.7/debian/patches/64/arch64.diff @@ -0,0 +1,50638 @@ +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/accessibility/AccessibleFactory.java swt-gtk-3.7//org/eclipse/swt/accessibility/AccessibleFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/accessibility/AccessibleFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/accessibility/AccessibleFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -157,14 +157,14 @@ + static final Callback InitValueIfaceCB; + static final Callback GTypeInfo_base_init_factory; + /* interface definitions */ +- static final int /*long*/ ActionIfaceDefinition; +- static final int /*long*/ ComponentIfaceDefinition; +- static final int /*long*/ EditableTextIfaceDefinition; +- static final int /*long*/ HypertextIfaceDefinition; +- static final int /*long*/ SelectionIfaceDefinition; +- static final int /*long*/ TableIfaceDefinition; +- static final int /*long*/ TextIfaceDefinition; +- static final int /*long*/ ValueIfaceDefinition; ++ static final long /*int*/ ActionIfaceDefinition; ++ static final long /*int*/ ComponentIfaceDefinition; ++ static final long /*int*/ EditableTextIfaceDefinition; ++ static final long /*int*/ HypertextIfaceDefinition; ++ static final long /*int*/ SelectionIfaceDefinition; ++ static final long /*int*/ TableIfaceDefinition; ++ static final long /*int*/ TextIfaceDefinition; ++ static final long /*int*/ ValueIfaceDefinition; + static { + AtkActionCB_do_action = newCallback (AccessibleObject.class, "atkAction_do_action", 2); //$NON-NLS-1$ + AtkActionCB_get_n_actions = newCallback (AccessibleObject.class, "atkAction_get_n_actions", 1); //$NON-NLS-1$ +@@ -301,15 +301,15 @@ + return callback; + } + +- static String getTypeName (int /*long*/ type) { +- int /*long*/ typeName = OS.g_type_name (type); ++ static String getTypeName (long /*int*/ type) { ++ long /*int*/ typeName = OS.g_type_name (type); + int widgetTypeNameLength = OS.strlen (typeName); + byte[] buffer = new byte [widgetTypeNameLength]; + OS.memmove (buffer, typeName, widgetTypeNameLength); + return new String(Converter.mbcsToWcs(null, buffer)); + } + +- static int /*long*/ getParentType (int /*long*/ widgetType) { ++ static long /*int*/ getParentType (long /*int*/ widgetType) { + LONG type = null; + while (widgetType != 0 && (type = (LONG)Factories.get(new LONG(widgetType))) == null) { + widgetType = OS.g_type_parent (widgetType); +@@ -318,14 +318,14 @@ + return ((LONG)type).value; + } + +- static int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) { ++ static 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 (getParentType(OS.G_OBJECT_TYPE (widget)), 0); ++ long /*int*/ result = OS.g_object_new (getParentType(OS.G_OBJECT_TYPE (widget)), 0); + ATK.atk_object_initialize (result, widget); + return result; + } +@@ -333,10 +333,10 @@ + if (accessible.accessibleObject != null) { + return accessible.accessibleObject.handle; + } +- int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget); +- int /*long*/ parentType = getParentType (widgetType); ++ long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget); ++ long /*int*/ parentType = getParentType (widgetType); + if (parentType == 0) parentType = ATK.GTK_TYPE_ACCESSIBLE(); +- int /*long*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF); ++ long /*int*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF); + AccessibleObject object = new AccessibleObject (type, widget, accessible, false); + accessible.accessibleObject = object; + accessible.addRelations (); +@@ -344,16 +344,16 @@ + } + + static AccessibleObject createChildAccessible (Accessible accessible, int childId) { +- int /*long*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId); ++ long /*int*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId); + return new AccessibleObject(childType, 0, accessible, true); + } + + static void createAccessible (Accessible accessible) { +- int /*long*/ controlHandle = accessible.getControlHandle (); ++ long /*int*/ controlHandle = accessible.getControlHandle (); + OS.gtk_widget_get_accessible(controlHandle); + } + +- static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { ++ static long /*int*/ getType (String widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) { + AccessibleControlEvent event = new AccessibleControlEvent (accessible); + event.childID = childId; + Vector listeners = accessible.accessibleControlListeners; +@@ -418,11 +418,11 @@ + if (value) swtTypeName += "Value"; //$NON-NLS-1$ + + byte[] nameBytes = Converter.wcsToMbcs(null, swtTypeName, true); +- int /*long*/ type = OS.g_type_from_name(nameBytes); ++ long /*int*/ type = OS.g_type_from_name(nameBytes); + if (type == 0) { + if (AccessibleObject.DEBUG) AccessibleObject.print("-->New Type=" + swtTypeName); //$NON-NLS-1$ + /* 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); +@@ -431,7 +431,7 @@ + typeInfo.base_init = GTypeInfo_base_init_type.getAddress (); + typeInfo.class_size = (short) query.class_size; + typeInfo.instance_size = (short) query.instance_size; +- int /*long*/ definition = OS.g_malloc (GTypeInfo.sizeof); ++ long /*int*/ definition = OS.g_malloc (GTypeInfo.sizeof); + OS.memmove (definition, typeInfo, GTypeInfo.sizeof); + type = OS.g_type_register_static (parentType, nameBytes, definition, 0); + OS.g_type_add_interface_static (type, ATK.ATK_TYPE_COMPONENT(), ComponentIfaceDefinition); +@@ -446,7 +446,7 @@ + return type; + } + +- static int /*long*/ gTypeInfo_base_init_factory (int /*long*/ klass) { ++ static long /*int*/ gTypeInfo_base_init_factory (long /*int*/ klass) { + AtkObjectFactoryClass objectClass = new AtkObjectFactoryClass (); + ATK.memmove (objectClass, klass); + objectClass.create_accessible = AtkObjectFactoryCB_create_accessible.getAddress (); +@@ -454,7 +454,7 @@ + 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 (); +@@ -466,7 +466,7 @@ + objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress (); + objectClass.ref_child = AtkObjectCB_ref_child.getAddress (); + objectClass.get_attributes = AtkObjectCB_get_attributes.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 (); +@@ -475,7 +475,7 @@ + return 0; + } + +- static int /*long*/ initActionIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initActionIfaceCB (long /*int*/ iface) { + AtkActionIface inter = new AtkActionIface (); + ATK.memmove (inter, iface); + inter.do_action = AtkActionCB_do_action.getAddress (); +@@ -487,7 +487,7 @@ + return 0; + } + +- static int /*long*/ initComponentIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initComponentIfaceCB (long /*int*/ iface) { + AtkComponentIface inter = new AtkComponentIface (); + ATK.memmove (inter, iface); + inter.get_extents = AtkComponentCB_get_extents.getAddress (); +@@ -498,7 +498,7 @@ + return 0; + } + +- static int /*long*/ initEditableTextIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initEditableTextIfaceCB (long /*int*/ iface) { + AtkEditableTextIface inter = new AtkEditableTextIface (); + ATK.memmove (inter, iface); + inter.set_run_attributes = AtkEditableTextCB_set_run_attributes.getAddress (); +@@ -512,7 +512,7 @@ + return 0; + } + +- static int /*long*/ initHypertextIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initHypertextIfaceCB (long /*int*/ iface) { + AtkHypertextIface inter = new AtkHypertextIface (); + ATK.memmove (inter, iface); + inter.get_link = AtkHypertextCB_get_link.getAddress (); +@@ -522,7 +522,7 @@ + return 0; + } + +- static int /*long*/ initSelectionIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initSelectionIfaceCB (long /*int*/ iface) { + AtkSelectionIface inter = new AtkSelectionIface (); + ATK.memmove (inter, iface); + inter.is_child_selected = AtkSelectionCB_is_child_selected.getAddress (); +@@ -531,7 +531,7 @@ + return 0; + } + +- static int /*long*/ initTableIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initTableIfaceCB (long /*int*/ iface) { + AtkTableIface inter = new AtkTableIface (); + ATK.memmove (inter, iface); + inter.ref_at = AtkTableCB_ref_at.getAddress(); +@@ -561,7 +561,7 @@ + return 0; + } + +- static int /*long*/ initTextIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initTextIfaceCB (long /*int*/ iface) { + AtkTextIface inter = new AtkTextIface (); + ATK.memmove (inter, iface); + inter.get_range_extents = AtkTextCB_get_range_extents.getAddress (); +@@ -586,7 +586,7 @@ + return 0; + } + +- static int /*long*/ initValueIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initValueIfaceCB (long /*int*/ iface) { + AtkValueIface inter = new AtkValueIface (); + ATK.memmove (inter, iface); + inter.get_current_value = AtkValueCB_get_current_value.getAddress (); +@@ -598,10 +598,10 @@ + } + + static void registerAccessible (Accessible accessible) { +- int /*long*/ widget = accessible.getControlHandle (); +- int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget); +- int /*long*/ registry = ATK.atk_get_default_registry (); +- int /*long*/ factory = ATK.atk_registry_get_factory (registry, widgetType); ++ long /*int*/ widget = accessible.getControlHandle (); ++ long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget); ++ long /*int*/ registry = ATK.atk_get_default_registry (); ++ long /*int*/ factory = ATK.atk_registry_get_factory (registry, widgetType); + /* If NO_OP factory is registered then OS accessibility is not active */ + if (ATK.ATK_IS_NO_OP_OBJECT_FACTORY(factory)) return; + String name = FACTORY_TYPENAME + getTypeName(widgetType); +@@ -613,10 +613,10 @@ + typeInfo.base_init = GTypeInfo_base_init_factory.getAddress (); + 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 (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0); +- int /*long*/ parentType = ATK.atk_object_factory_get_accessible_type(factory); ++ long /*int*/ swtFactoryType = OS.g_type_register_static (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0); ++ long /*int*/ parentType = ATK.atk_object_factory_get_accessible_type(factory); + ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType); + Factories.put (new LONG (widgetType), new LONG (parentType)); + } +@@ -625,7 +625,7 @@ + } + + static void unregisterAccessible (Accessible accessible) { +- int /*long*/ widget = accessible.getControlHandle (); ++ long /*int*/ widget = accessible.getControlHandle (); + Accessibles.remove (new LONG (widget)); + if (AccessibleObject.DEBUG) AccessibleObject.print("-->Deregister=" + accessible.control + " " + widget); //$NON-NLS-1$ + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/accessibility/Accessible.java swt-gtk-3.7//org/eclipse/swt/accessibility/Accessible.java +--- swt-gtk-3.7.orig//org/eclipse/swt/accessibility/Accessible.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/accessibility/Accessible.java 2011-06-13 20:53:32.000000000 +0000 +@@ -475,14 +475,14 @@ + return accessibleObject; + } + +- int /*long*/ getControlHandle () { +- int /*long*/ result = control.handle; ++ long /*int*/ getControlHandle () { ++ long /*int*/ result = control.handle; + if (control instanceof Label) { +- int /*long*/ list = OS.gtk_container_get_children (result); ++ long /*int*/ list = OS.gtk_container_get_children (result); + if (list != 0) { +- int /*long*/ temp = list; ++ long /*int*/ temp = list; + while (temp != 0) { +- int /*long*/ widget = OS.g_list_data( temp); ++ long /*int*/ widget = OS.g_list_data( temp); + if (OS.GTK_WIDGET_VISIBLE (widget)) { + result = widget; + break; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/accessibility/AccessibleObject.java swt-gtk-3.7//org/eclipse/swt/accessibility/AccessibleObject.java +--- swt-gtk-3.7.orig//org/eclipse/swt/accessibility/AccessibleObject.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/accessibility/AccessibleObject.java 2011-06-13 20:53:32.000000000 +0000 +@@ -21,7 +21,7 @@ + import org.eclipse.swt.internal.gtk.*; + + class AccessibleObject { +- int /*long*/ handle; ++ long /*int*/ handle; + int index = -1, id = ACC.CHILDID_SELF; + Accessible accessible; + AccessibleObject parent; +@@ -32,10 +32,10 @@ + */ + 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 boolean DEBUG = Device.DEBUG; + +@@ -45,7 +45,7 @@ + COLUMN_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "column", true)); //$NON-NLS-1$ + } + +- AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, boolean isLightweight) { ++ AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) { + super (); + handle = ATK.g_object_new (type, 0); + ATK.atk_object_initialize (handle, widget); +@@ -59,7 +59,7 @@ + System.out.println (str); + } + +- static AtkActionIface getActionIface (int /*long*/ atkObject) { ++ static AtkActionIface getActionIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_ACTION())) { + AtkActionIface iface = new AtkActionIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject))); +@@ -68,7 +68,7 @@ + return null; + } + +- static int /*long*/ atkAction_do_action (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkAction_do_action (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) print ("-->atkAction_do_action"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -85,7 +85,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkActionIface iface = getActionIface (atkObject); + if (iface != null && iface.do_action != 0) { + parentResult = ATK.call (iface.do_action, atkObject, index); +@@ -93,7 +93,7 @@ + return parentResult; + } + +- static int /*long*/ atkAction_get_n_actions (int /*long*/ atkObject) { ++ static long /*int*/ atkAction_get_n_actions (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkAction_get_n_actions"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -109,7 +109,7 @@ + return event.count; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkActionIface iface = getActionIface (atkObject); + if (iface != null && iface.get_n_actions != 0) { + parentResult = ATK.call (iface.get_n_actions, atkObject); +@@ -117,7 +117,7 @@ + return parentResult; + } + +- static int /*long*/ atkAction_get_description (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkAction_get_description (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) print ("-->atkAction_get_description"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -136,7 +136,7 @@ + return descriptionPtr = getStringPtr (event.result); + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkActionIface iface = getActionIface (atkObject); + if (iface != null && iface.get_description != 0) { + parentResult = ATK.call (iface.get_description, atkObject, index); +@@ -144,10 +144,10 @@ + return parentResult; + } + +- 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) print ("-->atkAction_get_keybinding"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkActionIface iface = getActionIface (atkObject); + if (iface != null && iface.get_keybinding != 0) { + parentResult = ATK.call (iface.get_keybinding, atkObject, index); +@@ -187,10 +187,10 @@ + return parentResult; + } + +- 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) print ("-->atkAction_get_name"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkActionIface iface = getActionIface (atkObject); + if (iface != null && iface.get_name != 0) { + parentResult = ATK.call (iface.get_name, atkObject, index); +@@ -232,7 +232,7 @@ + return parentResult; + } + +- static AtkComponentIface getComponentIface (int /*long*/ atkObject) { ++ static AtkComponentIface getComponentIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_COMPONENT())) { + AtkComponentIface iface = new AtkComponentIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject))); +@@ -241,7 +241,7 @@ + return null; + } + +- 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) print ("-->atkComponent_get_extents: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + OS.memmove (x, new int[] {0}, 4); +@@ -291,7 +291,7 @@ + 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) print ("-->atkComponent_get_position, object: " + atkObject + " x: " + x + " y: " + y + " coord: " + coord_type); + AccessibleObject object = getAccessibleObject (atkObject); + OS.memmove (x, new int[] {0}, 4); +@@ -332,7 +332,7 @@ + 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) print ("-->atkComponent_get_size"); + AccessibleObject object = getAccessibleObject (atkObject); + OS.memmove (width, new int[] {0}, 4); +@@ -363,7 +363,7 @@ + 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) print ("-->atkComponent_ref_accessible_at_point: " + atkObject + " " + x + "," + y); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -392,7 +392,7 @@ + } + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkComponentIface iface = getComponentIface (atkObject); + if (iface != null && iface.ref_accessible_at_point != 0) { + parentResult = ATK.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type); +@@ -401,7 +401,7 @@ + } + + +- static AtkEditableTextIface getEditableTextIface (int /*long*/ atkObject) { ++ static AtkEditableTextIface getEditableTextIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_EDITABLE_TEXT())) { + AtkEditableTextIface iface = new AtkEditableTextIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject))); +@@ -411,7 +411,7 @@ + } + + // gboolean atk_editable_text_set_run_attributes(AtkEditableText *text, AtkAttributeSet *attrib_set, gint start_offset, gint end_offset); +- static int /*long*/ atkEditableText_set_run_attributes (int /*long*/ atkObject, int /*long*/ attrib_set, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkEditableText_set_run_attributes (long /*int*/ atkObject, long /*int*/ attrib_set, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) print ("-->atkEditableText_set_run_attributes"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -420,14 +420,14 @@ + int length = listeners.size(); + if (length > 0) { + Display display = accessible.control.getDisplay(); +- int /*long*/ fontDesc = OS.pango_font_description_new (); ++ long /*int*/ fontDesc = OS.pango_font_description_new (); + boolean createFont = false; + TextStyle style = new TextStyle(); + String [] attributes = new String [0]; +- int /*long*/ current = attrib_set; ++ long /*int*/ current = attrib_set; + int listLength = OS.g_slist_length (attrib_set); + for (int i = 0; i < listLength; i++) { +- int /*long*/ attrPtr = OS.g_slist_data (current); ++ long /*int*/ attrPtr = OS.g_slist_data (current); + if (attrPtr != 0) { + AtkAttribute attr = new AtkAttribute(); + ATK.memmove(attr, attrPtr, AtkAttribute.sizeof); +@@ -550,7 +550,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.set_run_attributes != 0) { + parentResult = ATK.call (iface.set_run_attributes, atkObject, attrib_set, start_offset, end_offset); +@@ -576,7 +576,7 @@ + } + + // void atk_editable_text_set_text_contents (AtkEditableText *text, const gchar *string); +- static int /*long*/ atkEditableText_set_text_contents (int /*long*/ atkObject, int /*long*/ string) { ++ static long /*int*/ atkEditableText_set_text_contents (long /*int*/ atkObject, long /*int*/ string) { + if (DEBUG) print ("-->atkEditableText_set_text_contents"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -596,7 +596,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.set_text_contents != 0) { + parentResult = ATK.call (iface.set_text_contents, atkObject, string); +@@ -605,7 +605,7 @@ + } + + // void atk_editable_text_insert_text (AtkEditableText *text, const gchar *string, gint length, gint *position); +- static int /*long*/ atkEditableText_insert_text (int /*long*/ atkObject, int /*long*/ string, int /*long*/ string_length, int /*long*/ position) { ++ static long /*int*/ atkEditableText_insert_text (long /*int*/ atkObject, long /*int*/ string, long /*int*/ string_length, long /*int*/ position) { + if (DEBUG) print ("-->atkEditableText_insert_text"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -625,7 +625,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.insert_text != 0) { + parentResult = ATK.call (iface.insert_text, atkObject, string, string_length, position); +@@ -634,7 +634,7 @@ + } + + // void atk_editable_text_copy_text (AtkEditableText *text, gint start_pos, gint end_pos); +- static int /*long*/ atkEditableText_copy_text(int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { ++ static long /*int*/ atkEditableText_copy_text(long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + if (DEBUG) print ("-->atkEditableText_copy_text"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -652,7 +652,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.copy_text != 0) { + parentResult = ATK.call (iface.copy_text, atkObject, start_pos, end_pos); +@@ -661,7 +661,7 @@ + } + + // void atk_editable_text_cut_text (AtkEditableText *text, gint start_pos, gint end_pos); +- static int /*long*/ atkEditableText_cut_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { ++ static long /*int*/ atkEditableText_cut_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + if (DEBUG) print ("-->atkEditableText_cut_text"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -679,7 +679,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.cut_text != 0) { + parentResult = ATK.call (iface.cut_text, atkObject, start_pos, end_pos); +@@ -688,7 +688,7 @@ + } + + // void atk_editable_text_delete_text (AtkEditableText *text, gint start_pos, gint end_pos); +- static int /*long*/ atkEditableText_delete_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { ++ static long /*int*/ atkEditableText_delete_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { + if (DEBUG) print ("-->atkEditableText_delete_text"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -707,7 +707,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.delete_text != 0) { + parentResult = ATK.call (iface.delete_text, atkObject, start_pos, end_pos); +@@ -716,7 +716,7 @@ + } + + // void atk_editable_text_paste_text (AtkEditableText *text, gint position); +- static int /*long*/ atkEditableText_paste_text (int /*long*/ atkObject, int /*long*/ position) { ++ static long /*int*/ atkEditableText_paste_text (long /*int*/ atkObject, long /*int*/ position) { + if (DEBUG) print ("-->atkEditableText_paste_text"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -733,7 +733,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkEditableTextIface iface = getEditableTextIface (atkObject); + if (iface != null && iface.paste_text != 0) { + parentResult = ATK.call (iface.paste_text, atkObject, position); +@@ -741,7 +741,7 @@ + return parentResult; + } + +- static AtkHypertextIface getHypertextIface (int /*long*/ atkObject) { ++ static AtkHypertextIface getHypertextIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_HYPERTEXT())) { + AtkHypertextIface iface = new AtkHypertextIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject))); +@@ -750,7 +750,7 @@ + return null; + } + +- 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) print ("-->atkHypertext_get_link"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -768,7 +768,7 @@ + return result != null ? result.getAccessibleObject().handle : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkHypertextIface iface = getHypertextIface (atkObject); + if (iface != null && iface.get_link != 0) { + parentResult = ATK.call (iface.get_link, atkObject, link_index); +@@ -776,7 +776,7 @@ + return parentResult; + } + +- static int /*long*/ atkHypertext_get_n_links (int /*long*/ atkObject) { ++ static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkHypertext_get_n_links"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -792,7 +792,7 @@ + return event.count; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkHypertextIface iface = getHypertextIface (atkObject); + if (iface != null && iface.get_n_links != 0) { + parentResult = ATK.call (iface.get_n_links, atkObject); +@@ -800,7 +800,7 @@ + return parentResult; + } + +- 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) print ("-->atkHypertext_get_link_index"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -818,7 +818,7 @@ + return event.index; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkHypertextIface iface = getHypertextIface (atkObject); + if (iface != null && iface.get_link_index != 0) { + parentResult = ATK.call (iface.get_link_index, atkObject, char_index); +@@ -826,16 +826,16 @@ + return parentResult; + } + +- static AtkObjectClass getObjectClass (int /*long*/ atkObject) { ++ static AtkObjectClass getObjectClass (long /*int*/ atkObject) { + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, ATK.g_type_class_peek (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)))); + return objectClass; + } + +- static int /*long*/ atkObject_get_description (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_description (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_description: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_description != 0) { + parentResult = ATK.call (objectClass.get_description, atkObject); +@@ -861,10 +861,10 @@ + return parentResult; + } + +- static int /*long*/ atkObject_get_attributes (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_attributes (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_attributes: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_attributes != 0) { + parentResult = ATK.call (objectClass.get_attributes, atkObject); +@@ -882,48 +882,48 @@ + } + AtkAttribute attr = new AtkAttribute(); + if (event.leftMargin != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_LEFT_MARGIN)); + attr.value = getStringPtr (String.valueOf(event.leftMargin)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } + if (event.rightMargin != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RIGHT_MARGIN)); + attr.value = getStringPtr (String.valueOf(event.rightMargin)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } + if (event.topMargin != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$ + attr.value = getStringPtr (String.valueOf(event.topMargin)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } + if (event.bottomMargin != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$ + attr.value = getStringPtr (String.valueOf(event.bottomMargin)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } + if (event.indent != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_INDENT)); + attr.value = getStringPtr (String.valueOf(event.indent)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } + if (event.justify) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); + attr.value = getStringPtr ("fill"); //$NON-NLS-1$ + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + parentResult = OS.g_slist_append(parentResult, attrPtr); + } else if (event.alignment != -1) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); + String str = "left"; //$NON-NLS-1$ + switch (event.alignment) { +@@ -939,7 +939,7 @@ + if (event.attributes != null) { + int end = event.attributes.length / 2 * 2; + for (int i = 0; i < end; i+= 2) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = getStringPtr (event.attributes[i]); + attr.value = getStringPtr (event.attributes[i + 1]); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); +@@ -951,10 +951,10 @@ + return parentResult; + } + +- static int /*long*/ atkObject_get_name (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_name (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_name: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_name != 0) { + parentResult = ATK.call (objectClass.get_name, atkObject); +@@ -980,10 +980,10 @@ + return parentResult; + } + +- static int /*long*/ atkObject_get_n_children (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_n_children: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_n_children != 0) { + parentResult = ATK.call (objectClass.get_n_children, atkObject); +@@ -1007,7 +1007,7 @@ + return parentResult; + } + +- static int /*long*/ atkObject_get_index_in_parent (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_index_in_parent: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1031,12 +1031,12 @@ + } + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_index_in_parent == 0) return 0; +- int /*long*/ result = ATK.call (objectClass.get_index_in_parent, atkObject); ++ long /*int*/ result = ATK.call (objectClass.get_index_in_parent, atkObject); + if (DEBUG) print ("---*> " + result); + return result; + } + +- static int /*long*/ atkObject_get_parent (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_parent: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1047,12 +1047,12 @@ + } + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.get_parent == 0) return 0; +- int /*long*/ parentResult = ATK.call (objectClass.get_parent, atkObject); ++ long /*int*/ parentResult = ATK.call (objectClass.get_parent, atkObject); + if (DEBUG) print ("---> " + parentResult); + return parentResult; + } + +- static int /*long*/ atkObject_get_role (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_role (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_get_role: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1132,7 +1132,7 @@ + return ATK.call (objectClass.get_role, atkObject); + } + +- 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) print ("-->atkObject_ref_child: " + index + " of: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null && object.id == ACC.CHILDID_SELF) { +@@ -1165,10 +1165,10 @@ + return ATK.call (objectClass.ref_child, atkObject, index); + } + +- static int /*long*/ atkObject_ref_state_set (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkObject_ref_state_set: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkObjectClass objectClass = getObjectClass (atkObject); + if (objectClass.ref_state_set != 0) { + parentResult = ATK.call (objectClass.ref_state_set, atkObject); +@@ -1178,7 +1178,7 @@ + Vector listeners = accessible.accessibleControlListeners; + int length = listeners.size(); + if (length > 0) { +- int /*long*/ set = parentResult; ++ long /*int*/ set = parentResult; + AccessibleControlEvent event = new AccessibleControlEvent (accessible); + event.childID = object.id; + event.detail = -1; +@@ -1218,7 +1218,7 @@ + return parentResult; + } + +- static AtkSelectionIface getSelectionIface (int /*long*/ atkObject) { ++ static AtkSelectionIface getSelectionIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_SELECTION())) { + AtkSelectionIface iface = new AtkSelectionIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject))); +@@ -1227,10 +1227,10 @@ + return null; + } + +- 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) print ("-->atkSelection_is_child_selected"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkSelectionIface iface = getSelectionIface (atkObject); + if (iface != null && iface.is_child_selected != 0) { + parentResult = ATK.call (iface.is_child_selected, atkObject, index); +@@ -1256,10 +1256,10 @@ + 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) print ("-->atkSelection_ref_selection"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkSelectionIface iface = getSelectionIface (atkObject); + if (iface != null && iface.ref_selection != 0) { + parentResult = ATK.call (iface.ref_selection, atkObject, index); +@@ -1286,7 +1286,7 @@ + return parentResult; + } + +- static AtkTableIface getTableIface (int /*long*/ atkObject) { ++ static AtkTableIface getTableIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TABLE())) { + AtkTableIface iface = new AtkTableIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject))); +@@ -1295,7 +1295,7 @@ + return null; + } + +- static int /*long*/ atkTable_ref_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { ++ static long /*int*/ atkTable_ref_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_ref_at"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1318,7 +1318,7 @@ + } + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.ref_at != 0) { + parentResult = ATK.call (iface.ref_at, atkObject, row, column); +@@ -1326,7 +1326,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_index_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { ++ static long /*int*/ atkTable_get_index_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_get_index_at"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1351,7 +1351,7 @@ + return row * event.count + column; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_index_at != 0) { + parentResult = ATK.call (iface.get_index_at, atkObject, row, column); +@@ -1359,7 +1359,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_column_at_index (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkTable_get_column_at_index (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) print ("-->atkTable_get_column_at_index: " + atkObject + " " + index); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1372,12 +1372,12 @@ + AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i); + listener.getColumnCount(event); + } +- int /*long*/ result = event.count == 0 ? -1 : index % event.count; ++ long /*int*/ result = event.count == 0 ? -1 : index % event.count; + if (DEBUG) print ("---> " + result); + return result; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_column_at_index != 0) { + parentResult = ATK.call (iface.get_column_at_index, atkObject, index); +@@ -1385,7 +1385,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_row_at_index (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkTable_get_row_at_index (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) print ("-->atkTable_get_row_at_index: " + atkObject + " " + index); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1398,12 +1398,12 @@ + AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i); + listener.getColumnCount(event); + } +- int /*long*/ result = event.count == 0 ? -1 : index / event.count; ++ long /*int*/ result = event.count == 0 ? -1 : index / event.count; + if (DEBUG) print ("---> " + result); + return result; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_row_at_index != 0) { + parentResult = ATK.call (iface.get_row_at_index, atkObject, index); +@@ -1411,10 +1411,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_n_columns (int /*long*/ atkObject) { ++ static long /*int*/ atkTable_get_n_columns (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkTable_get_n_columns"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_n_columns != 0) { + parentResult = ATK.call (iface.get_n_columns, atkObject); +@@ -1436,10 +1436,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_n_rows (int /*long*/ atkObject) { ++ static long /*int*/ atkTable_get_n_rows (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkTable_get_n_rows"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_n_rows != 0) { + parentResult = ATK.call (iface.get_n_rows, atkObject); +@@ -1461,10 +1461,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_column_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { ++ static long /*int*/ atkTable_get_column_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_get_column_extent_at"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_column_extent_at != 0) { + parentResult = ATK.call (iface.get_column_extent_at, atkObject, row, column); +@@ -1500,10 +1500,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_row_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { ++ static long /*int*/ atkTable_get_row_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_get_row_extent_at"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_row_extent_at != 0) { + parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column); +@@ -1539,7 +1539,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_caption (int /*long*/ atkObject) { ++ static long /*int*/ atkTable_get_caption (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkTable_get_caption"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1556,7 +1556,7 @@ + if (result != null) return result.getAccessibleObject().handle; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_caption != 0) { + parentResult = ATK.call (iface.get_caption, atkObject); +@@ -1564,7 +1564,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_summary (int /*long*/ atkObject) { ++ static long /*int*/ atkTable_get_summary (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkTable_get_summary"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1581,7 +1581,7 @@ + if (result != null) return result.getAccessibleObject().handle; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_summary != 0) { + parentResult = ATK.call (iface.get_summary, atkObject); +@@ -1589,10 +1589,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_column_description (int /*long*/ atkObject, int /*long*/ column) { ++ static long /*int*/ atkTable_get_column_description (long /*int*/ atkObject, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_get_column_description"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_column_description != 0) { + parentResult = ATK.call (iface.get_column_description, atkObject, column); +@@ -1617,7 +1617,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_column_header (int /*long*/ atkObject, int /*long*/ column) { ++ static long /*int*/ atkTable_get_column_header (long /*int*/ atkObject, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_get_column_header"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1638,7 +1638,7 @@ + } + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_column_header != 0) { + parentResult = ATK.call (iface.get_column_header, atkObject, column); +@@ -1646,10 +1646,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_row_description (int /*long*/ atkObject, int /*long*/ row) { ++ static long /*int*/ atkTable_get_row_description (long /*int*/ atkObject, long /*int*/ row) { + if (DEBUG) print ("-->atkTable_get_row_description"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_row_description != 0) { + parentResult = ATK.call (iface.get_row_description, atkObject, row); +@@ -1674,7 +1674,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_row_header (int /*long*/ atkObject, int /*long*/ row) { ++ static long /*int*/ atkTable_get_row_header (long /*int*/ atkObject, long /*int*/ row) { + if (DEBUG) print ("-->atkTable_get_row_header"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1695,7 +1695,7 @@ + } + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_row_header != 0) { + parentResult = ATK.call (iface.get_row_header, atkObject, row); +@@ -1703,7 +1703,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_selected_columns (int /*long*/ atkObject, int /*long*/ selected) { ++ static long /*int*/ atkTable_get_selected_columns (long /*int*/ atkObject, long /*int*/ selected) { + if (DEBUG) print ("-->atkTable_get_selected_columns"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1717,13 +1717,13 @@ + listener.getSelectedColumns(event); + } + int count = event.selected != null ? event.selected.length : 0; +- int /*long*/ result = OS.g_malloc(count * 4); ++ long /*int*/ result = OS.g_malloc(count * 4); + if (event.selected != null) OS.memmove(result, event.selected, count * 4); +- if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF); ++ if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); + return count; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_selected_columns != 0) { + parentResult = ATK.call (iface.get_selected_columns, atkObject, selected); +@@ -1731,7 +1731,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_get_selected_rows (int /*long*/ atkObject, int /*long*/ selected) { ++ static long /*int*/ atkTable_get_selected_rows (long /*int*/ atkObject, long /*int*/ selected) { + if (DEBUG) print ("-->atkTable_get_selected_rows"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1745,13 +1745,13 @@ + listener.getSelectedRows(event); + } + int count = event.selected != null ? event.selected.length : 0; +- int /*long*/ result = OS.g_malloc(count * 4); ++ long /*int*/ result = OS.g_malloc(count * 4); + if (event.selected != null) OS.memmove(result, event.selected, count * 4); +- if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF); ++ if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); + return count; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.get_selected_rows != 0) { + parentResult = ATK.call (iface.get_selected_rows, atkObject, selected); +@@ -1759,10 +1759,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_is_column_selected (int /*long*/ atkObject, int /*long*/ column) { ++ static long /*int*/ atkTable_is_column_selected (long /*int*/ atkObject, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_is_column_selected"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.is_column_selected != 0) { + parentResult = ATK.call (iface.is_column_selected, atkObject, column); +@@ -1785,10 +1785,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_is_row_selected (int /*long*/ atkObject, int /*long*/ row) { ++ static long /*int*/ atkTable_is_row_selected (long /*int*/ atkObject, long /*int*/ row) { + if (DEBUG) print ("-->atkTable_is_row_selected"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.is_row_selected != 0) { + parentResult = ATK.call (iface.is_row_selected, atkObject, row); +@@ -1811,10 +1811,10 @@ + return parentResult; + } + +- static int /*long*/ atkTable_is_selected (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { ++ static long /*int*/ atkTable_is_selected (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_is_selected"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.is_selected != 0) { + parentResult = ATK.call (iface.is_selected, atkObject, row, column); +@@ -1850,7 +1850,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_add_row_selection (int /*long*/ atkObject, int /*long*/ row) { ++ static long /*int*/ atkTable_add_row_selection (long /*int*/ atkObject, long /*int*/ row) { + if (DEBUG) print ("-->atkTable_add_row_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1867,7 +1867,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.add_row_selection != 0) { + parentResult = ATK.call (iface.add_row_selection, atkObject, row); +@@ -1875,7 +1875,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_remove_row_selection (int /*long*/ atkObject, int /*long*/ row) { ++ static long /*int*/ atkTable_remove_row_selection (long /*int*/ atkObject, long /*int*/ row) { + if (DEBUG) print ("-->atkTable_remove_row_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1892,7 +1892,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.remove_row_selection != 0) { + parentResult = ATK.call (iface.remove_row_selection, atkObject, row); +@@ -1900,7 +1900,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_add_column_selection (int /*long*/ atkObject, int /*long*/ column) { ++ static long /*int*/ atkTable_add_column_selection (long /*int*/ atkObject, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_add_column_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1917,7 +1917,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.add_column_selection != 0) { + parentResult = ATK.call (iface.add_column_selection, atkObject, column); +@@ -1925,7 +1925,7 @@ + return parentResult; + } + +- static int /*long*/ atkTable_remove_column_selection (int /*long*/ atkObject, int /*long*/ column) { ++ static long /*int*/ atkTable_remove_column_selection (long /*int*/ atkObject, long /*int*/ column) { + if (DEBUG) print ("-->atkTable_remove_column_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1942,7 +1942,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTableIface iface = getTableIface (atkObject); + if (iface != null && iface.remove_column_selection != 0) { + parentResult = ATK.call (iface.remove_column_selection, atkObject, column); +@@ -1950,7 +1950,7 @@ + return parentResult; + } + +- static AtkTextIface getTextIface (int /*long*/ atkObject) { ++ static AtkTextIface getTextIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TEXT())) { + AtkTextIface iface = new AtkTextIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject))); +@@ -1959,7 +1959,7 @@ + return null; + } + +- static int /*long*/ atkText_get_character_extents (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coords) { ++ static long /*int*/ atkText_get_character_extents (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coords) { + if (DEBUG) print ("-->atkText_get_character_extents"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -1994,21 +1994,21 @@ + return 0; + } + +- static String getString (int /*long*/ strPtr) { ++ static String getString (long /*int*/ strPtr) { + int length = OS.strlen (strPtr); + byte [] buffer = new byte [length]; + OS.memmove (buffer, strPtr, length); + return new String (Converter.mbcsToWcs (null, buffer)); + } + +- static int /*long*/ getStringPtr (String str) { ++ static long /*int*/ getStringPtr (String str) { + byte [] buffer = Converter.wcsToMbcs(null, str != null ? str : "", true); +- int /*long*/ ptr = OS.g_malloc(buffer.length); ++ long /*int*/ ptr = OS.g_malloc(buffer.length); + OS.memmove(ptr, buffer, buffer.length); + return ptr; + } + +- static int /*long*/ atkText_get_range_extents (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset, int /*long*/ coord_type, int /*long*/ rect) { ++ static long /*int*/ atkText_get_range_extents (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset, long /*int*/ coord_type, long /*int*/ rect) { + if (DEBUG) print ("-->atkText_get_range_extents"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2045,7 +2045,7 @@ + return 0; + } + +- static int /*long*/ atkText_get_run_attributes (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_run_attributes (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) print ("-->atkText_get_run_attributes"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2062,18 +2062,18 @@ + OS.memmove (start_offset, new int []{event.start}, 4); + OS.memmove (end_offset, new int []{event.end}, 4); + TextStyle style = event.textStyle; +- int /*long*/ result = 0; ++ long /*int*/ result = 0; + AtkAttribute attr = new AtkAttribute(); + if (style != null) { + if (style.rise != 0) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE)); + attr.value = getStringPtr (String.valueOf(style.rise)); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); + result = OS.g_slist_append(result, attrPtr); + } + if (style.underline) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE)); + String str = "none"; //$NON-NLS-1$ + switch (style.underlineStyle) { +@@ -2087,7 +2087,7 @@ + result = OS.g_slist_append(result, attrPtr); + } + if (style.strikeout) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRIKETHROUGH)); + attr.value = getStringPtr ("1"); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); +@@ -2096,7 +2096,7 @@ + Font font = style.font; + if (font != null && !font.isDisposed()) { + //TODO language and direction +- int /*long*/ attrPtr; ++ long /*int*/ attrPtr; + attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME)); + attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle)); +@@ -2135,7 +2135,7 @@ + } + Color color = style.foreground; + if (color != null && !color.isDisposed()) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR)); + attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$ + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); +@@ -2143,7 +2143,7 @@ + } + color = style.background; + if (color != null && !color.isDisposed()) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR)); + attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$ + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); +@@ -2153,7 +2153,7 @@ + if (event.attributes != null) { + int end = event.attributes.length / 2 * 2; + for (int i = 0; i < end; i+= 2) { +- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); ++ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + attr.name = getStringPtr (event.attributes[i]); + attr.value = getStringPtr (event.attributes[i + 1]); + ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); +@@ -2163,7 +2163,7 @@ + return result; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.get_run_attributes != 0) { + parentResult = ATK.call (iface.get_run_attributes, atkObject, offset, start_offset, end_offset); +@@ -2171,7 +2171,7 @@ + return parentResult; + } + +- static int /*long*/ atkText_get_offset_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coords) { ++ static long /*int*/ atkText_get_offset_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coords) { + if (DEBUG) print ("-->atkText_get_offset_at_point"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2195,7 +2195,7 @@ + return event.offset; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.get_offset_at_point != 0) { + parentResult = ATK.call (iface.get_offset_at_point, atkObject, x, y, coords); +@@ -2203,7 +2203,7 @@ + return parentResult; + } + +- static int /*long*/ atkText_add_selection (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_add_selection (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) print ("-->atkText_add_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2221,7 +2221,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.add_selection != 0) { + parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset); +@@ -2229,7 +2229,7 @@ + return parentResult; + } + +- static int /*long*/ atkText_remove_selection (int /*long*/ atkObject, int /*long*/ selection_num) { ++ static long /*int*/ atkText_remove_selection (long /*int*/ atkObject, long /*int*/ selection_num) { + if (DEBUG) print ("-->atkText_remove_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2246,7 +2246,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.remove_selection != 0) { + parentResult = ATK.call (iface.remove_selection, atkObject, selection_num); +@@ -2254,7 +2254,7 @@ + return parentResult; + } + +- static int /*long*/ atkText_set_caret_offset (int /*long*/ atkObject, int /*long*/ offset) { ++ static long /*int*/ atkText_set_caret_offset (long /*int*/ atkObject, long /*int*/ offset) { + if (DEBUG) print ("-->atkText_set_caret_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2278,7 +2278,7 @@ + return 0; + } + +- static int /*long*/ atkText_set_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_set_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) print ("-->atkText_set_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2297,7 +2297,7 @@ + return ACC.OK.equals(event.result) ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.set_selection != 0) { + parentResult = ATK.call (iface.set_selection, atkObject, selection_num, start_offset, end_offset); +@@ -2305,10 +2305,10 @@ + return parentResult; + } + +- static int /*long*/ atkText_get_caret_offset (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkText_get_caret_offset"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.get_caret_offset != 0) { + parentResult = ATK.call (iface.get_caret_offset, atkObject); +@@ -2341,7 +2341,7 @@ + return parentResult; + } + +- static int /*long*/ atkText_get_bounded_ranges (int /*long*/ atkObject, int /*long*/ rect, int /*long*/ coord_type, int /*long*/ x_clip_type, int /*long*/ y_clip_type) { ++ static long /*int*/ atkText_get_bounded_ranges (long /*int*/ atkObject, long /*int*/ rect, long /*int*/ coord_type, long /*int*/ x_clip_type, long /*int*/ y_clip_type) { + if (DEBUG) print ("-->atkText_get_bounded_ranges"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2362,7 +2362,7 @@ + } + int [] ranges = event.ranges; + int size = ranges == null ? 1 : ranges.length / 2; +- int /*long*/ result = OS.malloc(size * AtkTextRange.sizeof); ++ long /*int*/ result = OS.malloc(size * AtkTextRange.sizeof); + AtkTextRange range = new AtkTextRange(); + for (int j = 0, end = (ranges != null ? ranges.length / 2 : 1); j < end; j++) { + if (ranges != null) { +@@ -2394,7 +2394,7 @@ + return result; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.get_bounded_ranges != 0) { + parentResult = ATK.call (iface.get_bounded_ranges, atkObject); +@@ -2402,7 +2402,7 @@ + return parentResult; + } + +- 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) print ("-->atkText_get_character_at_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2431,7 +2431,7 @@ + return 0; + } + +- static int /*long*/ atkText_get_character_count (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkText_get_character_count"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2456,7 +2456,7 @@ + return 0; + } + +- static int /*long*/ atkText_get_n_selections (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) { + if (DEBUG) print ("-->atkText_get_n_selections"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2483,7 +2483,7 @@ + if (event.length > 0) return 1; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkTextIface iface = getTextIface (atkObject); + if (iface != null && iface.get_n_selections != 0) { + parentResult = ATK.call (iface.get_n_selections, atkObject); +@@ -2491,10 +2491,10 @@ + return parentResult; + } + +- 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) print ("-->atkText_get_selection"); + AccessibleObject object = getAccessibleObject (atkObject); +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + OS.memmove (start_offset, new int[] {0}, 4); + OS.memmove (end_offset, new int[] {0}, 4); + AtkTextIface iface = getTextIface (atkObject); +@@ -2560,7 +2560,7 @@ + return parentResult; + } + +- 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) print ("-->atkText_get_text: " + atkObject + " " + start_offset + "," + end_offset); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2597,7 +2597,7 @@ + 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) print ("-->atkText_get_text_after_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2605,7 +2605,7 @@ + Vector listeners = accessible.accessibleTextExtendedListeners; + int length = listeners.size(); + if (length > 0) { +- int /*long*/ charCount = atkText_get_character_count (atkObject); ++ long /*int*/ charCount = atkText_get_character_count (atkObject); + AccessibleTextEvent event = new AccessibleTextEvent(accessible); + event.start = event.end = (int)/*64*/offset_value; + event.count = 1; +@@ -2845,7 +2845,7 @@ + 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) print ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -2853,7 +2853,7 @@ + Vector listeners = accessible.accessibleTextExtendedListeners; + int length = listeners.size(); + if (length > 0) { +- int /*long*/ charCount = atkText_get_character_count (atkObject); ++ long /*int*/ charCount = atkText_get_character_count (atkObject); + AccessibleTextEvent event = new AccessibleTextEvent(accessible); + event.start = event.end = (int)/*64*/offset_value; + event.count = 0; +@@ -3036,7 +3036,7 @@ + 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) print ("-->atkText_get_text_before_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -3044,7 +3044,7 @@ + Vector listeners = accessible.accessibleTextExtendedListeners; + int length = listeners.size(); + if (length > 0) { +- int /*long*/ charCount = atkText_get_character_count (atkObject); ++ long /*int*/ charCount = atkText_get_character_count (atkObject); + AccessibleTextEvent event = new AccessibleTextEvent(accessible); + event.start = event.end = (int)/*64*/offset_value; + event.count = -1; +@@ -3232,7 +3232,7 @@ + return 0; + } + +- static void setGValue (int /*long*/ value, Number number) { ++ static void setGValue (long /*int*/ value, Number number) { + if (number == null) return; + if (OS.G_VALUE_TYPE(value) != 0) OS.g_value_unset(value); + if (number instanceof Double) { +@@ -3250,8 +3250,8 @@ + } + } + +- static Number getGValue (int /*long*/ value) { +- int /*long*/ type = OS.G_VALUE_TYPE(value); ++ static Number getGValue (long /*int*/ value) { ++ long /*int*/ type = OS.G_VALUE_TYPE(value); + if (type == 0) return null; + if (type == OS.G_TYPE_DOUBLE()) return new Double(OS.g_value_get_double(value)); + if (type == OS.G_TYPE_FLOAT()) return new Float(OS.g_value_get_float(value)); +@@ -3259,7 +3259,7 @@ + return new Integer(OS.g_value_get_int(value)); + } + +- static AtkValueIface getValueIface (int /*long*/ atkObject) { ++ static AtkValueIface getValueIface (long /*int*/ atkObject) { + if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_VALUE())) { + AtkValueIface iface = new AtkValueIface (); + ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject))); +@@ -3267,7 +3267,7 @@ + } + return null; + } +- static int /*long*/ atkValue_get_current_value (int /*long*/ atkObject, int /*long*/ value) { ++ static long /*int*/ atkValue_get_current_value (long /*int*/ atkObject, long /*int*/ value) { + if (DEBUG) print ("-->atkValue_get_current_value"); + AccessibleObject object = getAccessibleObject (atkObject); + AtkValueIface iface = getValueIface (atkObject); +@@ -3291,7 +3291,7 @@ + return 0; + } + +- static int /*long*/ atkValue_get_maximum_value (int /*long*/ atkObject, int /*long*/ value) { ++ static long /*int*/ atkValue_get_maximum_value (long /*int*/ atkObject, long /*int*/ value) { + if (DEBUG) print ("-->atkValue_get_maximum_value"); + AccessibleObject object = getAccessibleObject (atkObject); + AtkValueIface iface = getValueIface (atkObject); +@@ -3315,7 +3315,7 @@ + return 0; + } + +- static int /*long*/ atkValue_get_minimum_value (int /*long*/ atkObject, int /*long*/ value) { ++ static long /*int*/ atkValue_get_minimum_value (long /*int*/ atkObject, long /*int*/ value) { + if (DEBUG) print ("-->atkValue_get_minimum_value"); + AccessibleObject object = getAccessibleObject (atkObject); + AtkValueIface iface = getValueIface (atkObject); +@@ -3339,7 +3339,7 @@ + return 0; + } + +- static int /*long*/ atkValue_set_current_value (int /*long*/ atkObject, int /*long*/ value) { ++ static long /*int*/ atkValue_set_current_value (long /*int*/ atkObject, long /*int*/ value) { + if (DEBUG) print ("-->atkValue_set_current_value"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object != null) { +@@ -3356,7 +3356,7 @@ + return event.value != null ? 1 : 0; + } + } +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + AtkValueIface iface = getValueIface (atkObject); + if (iface != null && iface.set_current_value != 0) { + parentResult = ATK.call (iface.set_current_value, atkObject, value); +@@ -3364,7 +3364,7 @@ + return parentResult; + } + +- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) { ++ static AccessibleObject getAccessibleObject (long /*int*/ atkObject) { + AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); + if (object == null) return null; + if (object.accessible == null) return null; +@@ -3397,9 +3397,9 @@ + String parentText = ""; //$NON-NLS-1$ + AtkTextIface iface = getTextIface (handle); + if (iface != null && iface.get_character_count != 0) { +- int /*long*/ characterCount = ATK.call (iface.get_character_count, handle); ++ long /*int*/ characterCount = ATK.call (iface.get_character_count, handle); + if (characterCount > 0 && iface.get_text != 0) { +- int /*long*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount); ++ long /*int*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount); + if (parentResult != 0) { + parentText = getString (parentResult); + OS.g_free(parentResult); +@@ -3418,10 +3418,10 @@ + return null; + } + +- static int /*long*/ gObjectClass_finalize (int /*long*/ atkObject) { ++ static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) { + if (DEBUG) print ("-->gObjectClass_finalize: " + atkObject); +- int /*long*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject)); +- int /*long*/ gObjectClass = ATK.G_OBJECT_CLASS (superType); ++ 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); +@@ -3461,8 +3461,8 @@ + ATK.memmove (gtkAccessible, object.handle); + } + if (gtkAccessible.widget == 0) return; +- 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); + OS.gdk_window_get_origin (window, x, y); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/awt/SWT_AWT.java swt-gtk-3.7//org/eclipse/swt/awt/SWT_AWT.java +--- swt-gtk-3.7.orig//org/eclipse/swt/awt/SWT_AWT.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/awt/SWT_AWT.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/AppFileLocProvider.java swt-gtk-3.7//org/eclipse/swt/browser/AppFileLocProvider.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/AppFileLocProvider.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/AppFileLocProvider.java 2011-06-13 20:53:32.000000000 +0000 +@@ -46,7 +46,7 @@ + this.profilePath = profilePath + SEPARATOR_OS; + this.isXULRunner = isXULRunner; + if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$ +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + nsEmbedString pathString = new nsEmbedString (profilePath); + int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +@@ -69,24 +69,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]);} + }; + } + +@@ -105,32 +105,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; + } + +@@ -142,7 +142,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); +@@ -153,7 +153,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]; +@@ -204,9 +204,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++) { +@@ -240,7 +240,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; + } + +@@ -249,7 +249,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); +@@ -303,9 +303,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); +@@ -318,7 +318,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/Download_1_8.java swt-gtk-3.7//org/eclipse/swt/browser/Download_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/Download_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/Download_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/DownloadFactory_1_8.java swt-gtk-3.7//org/eclipse/swt/browser/DownloadFactory_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/DownloadFactory_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/DownloadFactory_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/DownloadFactory.java swt-gtk-3.7//org/eclipse/swt/browser/DownloadFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/DownloadFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/DownloadFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/Download.java swt-gtk-3.7//org/eclipse/swt/browser/Download.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/Download.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/Download.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/ExternalFactory.java swt-gtk-3.7//org/eclipse/swt/browser/ExternalFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/ExternalFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/ExternalFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/External.java swt-gtk-3.7//org/eclipse/swt/browser/External.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/External.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/External.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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, 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 callJava ((int)/*64*/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 callJava ((int)/*64*/args[0], args[1], args[2], args[3]);} + }; + + } +@@ -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]); +@@ -507,26 +507,26 @@ + rc = variant.SetAsEmptyArray (); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + } else { +- 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); +@@ -541,7 +541,7 @@ + return null; + } + +-int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ args, int /*long*/ returnPtr) { ++int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ args, long /*int*/ returnPtr) { + Object key = new Integer (functionId); + BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key); + Object returnValue = null; +@@ -582,7 +582,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); +@@ -596,7 +596,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePicker_1_8.java swt-gtk-3.7//org/eclipse/swt/browser/FilePicker_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePicker_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/FilePicker_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePickerFactory_1_8.java swt-gtk-3.7//org/eclipse/swt/browser/FilePickerFactory_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePickerFactory_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/FilePickerFactory_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePickerFactory.java swt-gtk-3.7//org/eclipse/swt/browser/FilePickerFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePickerFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/FilePickerFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePicker.java swt-gtk-3.7//org/eclipse/swt/browser/FilePicker.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/FilePicker.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/FilePicker.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialog.java swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/HelperAppLauncherDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/HelperAppLauncherDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/InputStream.java swt-gtk-3.7//org/eclipse/swt/browser/InputStream.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/InputStream.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/InputStream.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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,7 +107,7 @@ + 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 = buffer == null ? 0 : buffer.length - index; + if (aCount != -1) { + max = Math.min (max, aCount); +@@ -115,7 +115,7 @@ + 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]; +@@ -124,7 +124,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/MozillaDelegate.java swt-gtk-3.7//org/eclipse/swt/browser/MozillaDelegate.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/MozillaDelegate.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/MozillaDelegate.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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); + } +@@ -87,7 +87,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 +@@ -117,7 +117,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) { +@@ -183,7 +183,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); +@@ -209,7 +209,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); +@@ -225,7 +225,7 @@ + return true; + } + +-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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/Mozilla.java swt-gtk-3.7//org/eclipse/swt/browser/Mozilla.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/Mozilla.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/Mozilla.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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; +@@ -46,7 +46,7 @@ + int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT; + int registerFunctionsOnState = 0; + int refCount, lastKeyCode, lastCharCode, authCount; +- int /*long*/ request; ++ long /*int*/ request; + Point location, size; + boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText; + boolean updateLastNavigateUrl; +@@ -122,7 +122,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); +@@ -187,18 +187,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); +@@ -220,7 +220,7 @@ + boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null; + if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return; + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + byte[] buffer = new byte[1]; + int rc = prefService.GetBranch (buffer, result); /* empty buffer denotes root preference level */ + if (rc != XPCOM.NS_OK) error (rc); +@@ -325,7 +325,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); +@@ -355,9 +355,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); +@@ -380,7 +380,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); +@@ -394,7 +394,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 (); +@@ -408,7 +408,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; +@@ -483,7 +483,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); +@@ -497,7 +497,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 (); +@@ -619,7 +619,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 { +@@ -663,7 +663,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) { + LoadLibraries (); + +@@ -996,7 +996,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); +@@ -1026,122 +1026,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]);} + }; + } + +@@ -1220,7 +1220,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); +@@ -1271,12 +1271,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) { +@@ -1293,7 +1293,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]; +@@ -1301,7 +1301,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 (); + if (pathBytes_JSEvaluateUCScriptForPrincipals == null) { +@@ -1356,12 +1356,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); +@@ -1380,7 +1380,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); +@@ -1408,7 +1408,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); +@@ -1428,7 +1428,7 @@ + if (LocationProvider != null) return LocationProvider.mozillaPath; + 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); +@@ -1458,11 +1458,11 @@ + + nsIFile mozillaDir = new nsIFile (result[0]); + result[0] = 0; +- int /*long*/ path = XPCOM.nsEmbedCString_new (); ++ long /*int*/ path = XPCOM.nsEmbedCString_new (); + rc = mozillaDir.GetNativePath (path); + if (rc != XPCOM.NS_OK) 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); + XPCOM.nsEmbedCString_delete (path); +@@ -1476,7 +1476,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); +@@ -1488,7 +1488,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); +@@ -1505,12 +1505,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); +@@ -1535,13 +1535,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 (); +@@ -1549,11 +1549,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); +@@ -1616,29 +1616,29 @@ + + 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; + + GREProperty property = new GREProperty (); + bytes = MozillaDelegate.wcsToMbcs (null, PROPERTY_ABI, true); +- int /*long*/ name = C.malloc (bytes.length); ++ long /*int*/ name = C.malloc (bytes.length); + C.memmove (name, bytes, bytes.length); + property.property = name; + bytes = MozillaDelegate.wcsToMbcs (null, Arch () + GCC3, true); +- int /*long*/ value = C.malloc (bytes.length); ++ long /*int*/ value = C.malloc (bytes.length); + C.memmove (value, bytes, bytes.length); + property.value = value; + + int length = XPCOMInit.PATH_MAX; +- int /*long*/ greBuffer = C.malloc (length); ++ long /*int*/ greBuffer = C.malloc (length); + int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length); + + if (rc != XPCOM.NS_OK) { +@@ -1697,7 +1697,7 @@ + } + + void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + + int rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result); + if (rc != XPCOM.NS_OK) { +@@ -1808,7 +1808,7 @@ + + String initMozilla (String mozillaPath) { + /* 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]; +@@ -1862,7 +1862,7 @@ + } + + void initXPCOM (String mozillaPath, boolean isXULRunner) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + + nsEmbedString pathString = new nsEmbedString (mozillaPath); + int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result); +@@ -1881,18 +1881,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); +@@ -1917,7 +1917,7 @@ + } + + void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + + /* + * As a result of using a common profile the user cannot change their locale +@@ -2284,7 +2284,7 @@ + } + + void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + + byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true); + int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result); +@@ -2319,18 +2319,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_NotifyProfile", true); //$NON-NLS-1$ + functionLoad.functionName = C.malloc (bytes.length); + C.memmove (functionLoad.functionName, bytes, bytes.length); + functionLoad.function = C.malloc (C.PTR_SIZEOF); +- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF); ++ 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); +@@ -2348,7 +2348,7 @@ + + void initSpinup (nsIComponentManager componentManager) { + if (delegate.needsSpinup ()) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + + /* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */ + int rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.NS_IAPPSHELL_IID, result); +@@ -2385,7 +2385,7 @@ + error (rc); + } + +- 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) { + browser.dispose (); +@@ -2428,7 +2428,7 @@ + WindowCreator = new WindowCreator2 (); + WindowCreator.AddRef (); + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true); + int rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result); + if (rc != XPCOM.NS_OK) { +@@ -2473,7 +2473,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); +@@ -2486,7 +2486,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); +@@ -2524,7 +2524,7 @@ + + unhookDOMListeners (); + +- 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); +@@ -2569,7 +2569,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); +@@ -2581,7 +2581,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); +@@ -2597,7 +2597,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); +@@ -2612,7 +2612,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); +@@ -2682,7 +2682,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) { + /* +@@ -2716,9 +2716,9 @@ + webNavigation.Release (); + } else { + byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false); //$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", false); // $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); +@@ -2738,7 +2738,7 @@ + } else { + aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, 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); +@@ -2783,7 +2783,7 @@ + public boolean setUrl (String url, String postData, String[] headers) { + 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); +@@ -2868,7 +2868,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); +@@ -2927,7 +2927,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 || result[0] == 0) return; + +@@ -3017,73 +3017,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; + } + +@@ -3100,18 +3100,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); +@@ -3121,15 +3121,15 @@ + 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 (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) { + registerFunctionsOnState = 0; + Enumeration elements = functions.elements (); +@@ -3160,11 +3160,11 @@ + */ + if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) { + nsIRequest request = new nsIRequest (aRequest); +- int /*long*/ name = XPCOM.nsEmbedCString_new (); ++ long /*int*/ name = XPCOM.nsEmbedCString_new (); + int rc = request.GetName (name); + if (rc == XPCOM.NS_OK) { + int length = XPCOM.nsEmbedCString_Length (name); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name); + byte[] bytes = new byte[length]; + XPCOM.memmove (bytes, buffer, length); + String value = new String (bytes); +@@ -3175,7 +3175,7 @@ + + 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 +@@ -3221,7 +3221,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); +@@ -3263,11 +3263,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); +@@ -3300,7 +3300,7 @@ + } else { + aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, 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); +@@ -3318,7 +3318,7 @@ + result[0] = 0; + + byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $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); +@@ -3342,11 +3342,11 @@ + */ + registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START; + +- 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) { +@@ -3430,7 +3430,7 @@ + } else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) { + if (updateLastNavigateUrl) { + updateLastNavigateUrl = false; +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + nsIRequest request = new nsIRequest (aRequest); + + int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result); +@@ -3444,11 +3444,11 @@ + + nsIURI uri = new nsIURI (result[0]); + result[0] = 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); + byte[] bytes = new byte[length]; + XPCOM.memmove (bytes, buffer, length); + lastNavigateURL = new String (bytes); +@@ -3461,7 +3461,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); +@@ -3500,7 +3500,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 (); +@@ -3513,7 +3513,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 +@@ -3528,13 +3528,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); +@@ -3544,10 +3544,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); +@@ -3584,7 +3584,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 (); +@@ -3599,13 +3599,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 (); +@@ -3621,8 +3621,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 (); +@@ -3631,13 +3631,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 */ +@@ -3677,7 +3677,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); +@@ -3707,7 +3707,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; +@@ -3741,7 +3741,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 */ +@@ -3761,7 +3761,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); +@@ -3779,7 +3779,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; +@@ -3822,11 +3822,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 (); +@@ -3850,7 +3850,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 +@@ -3858,7 +3858,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; + } + +@@ -3898,9 +3898,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); +@@ -3930,15 +3930,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); +@@ -3994,7 +3994,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); +@@ -4013,11 +4013,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) { +@@ -4028,7 +4028,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); +@@ -4040,7 +4040,7 @@ + rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result); + if (rc == XPCOM.NS_OK) { + byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, false); +- 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 */ +@@ -4070,34 +4070,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); +@@ -4135,21 +4135,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); +@@ -4166,7 +4166,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); +@@ -4274,7 +4274,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); +@@ -4330,7 +4330,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); +@@ -4387,7 +4387,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); +@@ -4505,10 +4505,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); +@@ -4518,7 +4518,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); +@@ -4538,7 +4538,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); +@@ -4561,7 +4561,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); +@@ -4590,7 +4590,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); +@@ -4620,7 +4620,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); +@@ -4636,7 +4636,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptDialog.java swt-gtk-3.7//org/eclipse/swt/browser/PromptDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/PromptDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -141,7 +141,7 @@ + viewCertButton.setText(Compatibility.getMessage("SWT_ViewCertificate")); //$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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptService2Factory.java swt-gtk-3.7//org/eclipse/swt/browser/PromptService2Factory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptService2Factory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/PromptService2Factory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptService2.java swt-gtk-3.7//org/eclipse/swt/browser/PromptService2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/PromptService2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/PromptService2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -44,41 +44,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]);} + }; + } + +@@ -97,32 +97,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; + } + +@@ -132,13 +132,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) { +@@ -159,7 +159,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); +@@ -199,7 +199,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); +@@ -226,11 +226,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); + + if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) { +@@ -258,11 +258,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); +@@ -304,7 +304,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]; +@@ -322,7 +322,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]); +@@ -353,7 +353,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); +@@ -373,9 +373,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]); +@@ -387,7 +387,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); +@@ -441,11 +441,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); +@@ -474,13 +474,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); +@@ -521,7 +521,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; + +@@ -572,7 +572,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]); +@@ -581,7 +581,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]); +@@ -619,12 +619,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); +@@ -649,9 +649,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]; +@@ -659,17 +659,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/SimpleEnumerator.java swt-gtk-3.7//org/eclipse/swt/browser/SimpleEnumerator.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/SimpleEnumerator.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/SimpleEnumerator.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/WebKit.java swt-gtk-3.7//org/eclipse/swt/browser/WebKit.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/WebKit.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/WebKit.java 2011-06-13 20:53:32.000000000 +0000 +@@ -24,7 +24,7 @@ + import org.eclipse.swt.widgets.*; + + class WebKit extends WebBrowser { +- int /*long*/ webView, webViewData, scrolledWindow; ++ long /*int*/ webView, webViewData, scrolledWindow; + int failureCount, lastKeyCode, lastCharCode; + String postData; + String[] headers; +@@ -32,7 +32,7 @@ + byte[] htmlBytes; + BrowserFunction eventFunction; + +- static int /*long*/ ExternalClass, PostString; ++ static long /*int*/ ExternalClass, PostString; + static boolean LibraryLoaded; + + static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$ +@@ -126,16 +126,16 @@ + NativeClearSessions = new Runnable () { + public void run () { + if (!LibraryLoaded) return; +- int /*long*/ session = WebKitGTK.webkit_get_default_session (); +- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type (); +- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type); ++ long /*int*/ session = WebKitGTK.webkit_get_default_session (); ++ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); ++ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + if (jar == 0) return; +- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); ++ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); + int length = OS.g_slist_length (cookies); +- int /*long*/ current = cookies; ++ long /*int*/ current = cookies; + for (int i = 0; i < length; i++) { +- int /*long*/ cookie = OS.g_slist_data (current); +- int /*long*/ expires = WebKitGTK.SoupCookie_expires (cookie); ++ long /*int*/ cookie = OS.g_slist_data (current); ++ long /*int*/ expires = WebKitGTK.SoupCookie_expires (cookie); + if (expires == 0) { + /* indicates a session cookie */ + WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie); +@@ -149,14 +149,14 @@ + NativeGetCookie = new Runnable () { + public void run () { + if (!LibraryLoaded) return; +- int /*long*/ session = WebKitGTK.webkit_get_default_session (); +- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type (); +- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type); ++ long /*int*/ session = WebKitGTK.webkit_get_default_session (); ++ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); ++ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + if (jar == 0) return; + byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true); +- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes); ++ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + if (uri == 0) return; +- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); ++ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); + WebKitGTK.soup_uri_free (uri); + if (cookies == 0) return; + int length = OS.strlen (cookies); +@@ -182,9 +182,9 @@ + NativeSetCookie = new Runnable () { + public void run () { + if (!LibraryLoaded) return; +- int /*long*/ session = WebKitGTK.webkit_get_default_session (); +- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type (); +- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type); ++ long /*int*/ session = WebKitGTK.webkit_get_default_session (); ++ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); ++ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + if (jar == 0) { + /* this happens if a navigation has not occurred yet */ + WebKitGTK.soup_session_add_feature_by_type (session, type); +@@ -192,10 +192,10 @@ + } + if (jar == 0) return; + byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true); +- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes); ++ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + if (uri == 0) return; + bytes = Converter.wcsToMbcs (null, CookieValue, true); +- int /*long*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri); ++ long /*int*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri); + if (cookie != 0) { + WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie); + // the following line is intentionally commented +@@ -213,9 +213,9 @@ + } + } + +-static Browser findBrowser (int /*long*/ webView) { ++static Browser findBrowser (long /*int*/ webView) { + if (webView == 0) return null; +- int /*long*/ parent = OS.gtk_widget_get_parent (webView); ++ long /*int*/ parent = OS.gtk_widget_get_parent (webView); + parent = OS.gtk_widget_get_parent (parent); + return (Browser)Display.getCurrent ().findWidget (parent); + } +@@ -233,12 +233,12 @@ + (major == MIN_VERSION[0] && minor == MIN_VERSION[1] && micro >= MIN_VERSION[2]); + } + +-static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ function, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) { ++static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { + if (WebKitGTK.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) { + return WebKitGTK.JSValueMakeUndefined (ctx); + } +- int /*long*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject); +- int /*long*/[] handle = new int /*long*/[1]; ++ long /*int*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject); ++ long /*int*/[] handle = new long /*int*/[1]; + C.memmove (handle, ptr, C.PTR_SIZEOF); + Browser browser = findBrowser (handle[0]); + if (browser == null) return 0; +@@ -246,20 +246,20 @@ + return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception); + } + +-static int /*long*/ JSObjectGetPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ exception) { ++static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) { + byte[] bytes = null; + try { + bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$ + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, FUNCTIONNAME_CALLJAVA, true); + } +- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); +- int /*long*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); ++ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); + WebKitGTK.JSStringRelease (name); + return function; + } + +-static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName) { ++static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) { + byte[] bytes = null; + try { + bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$ +@@ -269,14 +269,14 @@ + return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes); + } + +-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) { ++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) { + Browser browser = findBrowser (handle); + if (browser == null) return 0; + WebKit webkit = (WebKit)browser.webBrowser; + return webkit.webViewProc (handle, user_data); + } + +-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + if (OS.GTK_IS_SCROLLED_WINDOW (handle)) { + /* + * Stop the propagation of events that are not consumed by WebKit, before +@@ -285,7 +285,7 @@ + return user_data; + } + +- int /*long*/ webView; ++ long /*int*/ webView; + if (WebKitGTK.WEBKIT_IS_WEB_FRAME (handle)) { + webView = WebKitGTK.webkit_web_frame_get_web_view (handle); + } else { +@@ -301,15 +301,15 @@ + } + } + +-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) { ++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { + Browser browser = findBrowser (handle); + if (browser == null) return 0; + WebKit webkit = (WebKit)browser.webBrowser; + return webkit.webViewProc (handle, arg0, arg1, user_data); + } + +-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { +- int /*long*/ webView; ++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { ++ long /*int*/ webView; + if (WebKitGTK.SOUP_IS_SESSION (handle)) { + webView = user_data; + } else { +@@ -325,14 +325,14 @@ + } + } + +-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) { ++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { + Browser browser = findBrowser (handle); + if (browser == null) return 0; + WebKit webkit = (WebKit)browser.webBrowser; + return webkit.webViewProc (handle, arg0, arg1, arg2, arg3, user_data); + } + +-int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ auth, int /*long*/ retrying, int /*long*/ user_data) { ++long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ auth, long /*int*/ retrying, long /*int*/ user_data) { + /* authentication challenges are currently the only notification received from the session */ + if (retrying == 0) { + failureCount = 0; +@@ -340,8 +340,8 @@ + if (++failureCount >= 3) return 0; + } + +- int /*long*/ uri = WebKitGTK.soup_message_get_uri (msg); +- int /*long*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0); ++ long /*int*/ uri = WebKitGTK.soup_message_get_uri (msg); ++ long /*int*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0); + int length = C.strlen (uriString); + byte[] bytes = new byte[length]; + OS.memmove (bytes, uriString, length); +@@ -367,14 +367,14 @@ + return 0; + } + +-int /*long*/ webFrameProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ webFrameProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case NOTIFY_LOAD_STATUS: return webframe_notify_load_status (handle, arg0); + default: return 0; + } + } + +-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) { ++long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case CLOSE_WEB_VIEW: return webkit_close_web_view (handle); + case WEB_VIEW_READY: return webkit_web_view_ready (handle); +@@ -382,7 +382,7 @@ + } + } + +-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0); + case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0); +@@ -395,14 +395,14 @@ + } + } + +-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) { ++long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1); + default: return 0; + } + } + +-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { ++long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2); + case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2); +@@ -410,7 +410,7 @@ + } + } + +-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) { ++long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3); + case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3); +@@ -433,7 +433,7 @@ + OS.memmove (jsClassDefinition.className, bytes, bytes.length); + jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress (); + jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress (); +- int /*long*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); ++ long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); + WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof); + ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr); + +@@ -446,7 +446,7 @@ + OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC); + webView = WebKitGTK.webkit_web_view_new (); + webViewData = C.malloc (C.PTR_SIZEOF); +- C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF); ++ C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF); + OS.gtk_container_add (scrolledWindow, webView); + OS.gtk_container_add (browser.handle, scrolledWindow); + OS.gtk_widget_show (scrolledWindow); +@@ -482,7 +482,7 @@ + OS.g_signal_connect (scrolledWindow, OS.scroll_event, Proc3.getAddress (), STOP_PROPOGATE); + OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, Proc3.getAddress (), STOP_PROPOGATE); + +- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); ++ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0); + OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0); + byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$ +@@ -524,8 +524,8 @@ + * queue by removing the default Authenticate listener, adding ours, + * and then re-adding the default listener. + */ +- int /*long*/ session = WebKitGTK.webkit_get_default_session (); +- int /*long*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); ++ long /*int*/ session = WebKitGTK.webkit_get_default_session (); ++ long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); + WebKitGTK.soup_session_feature_detach (originalAuth, session); + OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); + WebKitGTK.soup_session_feature_attach (originalAuth, session); +@@ -551,7 +551,7 @@ + } + proxyHost += ":" + port; //$NON-NLS-1$ + bytes = Converter.wcsToMbcs (null, proxyHost, true); +- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes); ++ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + if (uri != 0) { + OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0); + WebKitGTK.soup_uri_free (uri); +@@ -660,8 +660,8 @@ + } + + public boolean execute (String script) { +- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); +- int /*long*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame); ++ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); ++ long /*int*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame); + + byte[] bytes = null; + try { +@@ -669,16 +669,16 @@ + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, script, true); + } +- int /*long*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + + try { + bytes = (getUrl () + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$ + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, getUrl (), true); + } +- int /*long*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + +- int /*long*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); ++ long /*int*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); + WebKitGTK.JSStringRelease (urlString); + WebKitGTK.JSStringRelease (scriptString); + return result != 0; +@@ -695,13 +695,13 @@ + } + + public String getText () { +- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); +- int /*long*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame); ++ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); ++ long /*int*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame); + if (source == 0) return ""; //$NON-NLS-1$ +- int /*long*/ data = WebKitGTK.webkit_web_data_source_get_data (source); ++ long /*int*/ data = WebKitGTK.webkit_web_data_source_get_data (source); + if (data == 0) return ""; //$NON-NLS-1$ + +- int /*long*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); ++ long /*int*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); + int length = OS.strlen (encoding); + byte[] bytes = new byte [length]; + OS.memmove (bytes, encoding, length); +@@ -709,7 +709,7 @@ + + length = OS.GString_len (data); + bytes = new byte[length]; +- int /*long*/ string = OS.GString_str (data); ++ long /*int*/ string = OS.GString_str (data); + C.memmove (bytes, string, length); + + try { +@@ -720,7 +720,7 @@ + } + + public String getUrl () { +- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); ++ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + + /* WebKit auto-navigates to about:blank at startup */ + if (uri == 0) return ABOUT_BLANK; +@@ -1019,7 +1019,7 @@ + return true; + } + +-int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) { ++long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) { + int length = OS.strlen (uri); + byte[] bytes = new byte[length]; + OS.memmove (bytes, uri, length); +@@ -1057,7 +1057,7 @@ + return 0; + } + +-int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) { ++long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) { + int length = OS.strlen (uri); + byte[] bytes = new byte[length]; + OS.memmove (bytes, uri, length); +@@ -1109,8 +1109,8 @@ + * the event here with the page's url as the title. + */ + if (top) { +- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); +- int /*long*/ title = WebKitGTK.webkit_web_frame_get_title (frame); ++ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); ++ long /*int*/ title = WebKitGTK.webkit_web_frame_get_title (frame); + if (title == 0) { + TitleEvent newEvent = new TitleEvent (browser); + newEvent.display = browser.getDisplay (); +@@ -1171,7 +1171,7 @@ + OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height); + } + +-void openDownloadWindow (final int /*long*/ webkitDownload) { ++void openDownloadWindow (final long /*int*/ webkitDownload) { + final Shell shell = new Shell (); + String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$ + shell.setText (msg); +@@ -1181,12 +1181,12 @@ + gridLayout.verticalSpacing = 20; + shell.setLayout (gridLayout); + +- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); ++ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); + int length = OS.strlen (name); + byte[] bytes = new byte[length]; + OS.memmove (bytes, name, length); + String nameString = new String (Converter.mbcsToWcs (null, bytes)); +- int /*long*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload); ++ long /*int*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload); + length = OS.strlen (url); + bytes = new byte[length]; + OS.memmove (bytes, url, length); +@@ -1318,7 +1318,7 @@ + * set the value on the WebView when initiating the load request and then + * remove it afterwards. + */ +- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); ++ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + if (headers != null) { + for (int i = 0; i < headers.length; i++) { + String current = headers[i]; +@@ -1347,11 +1347,11 @@ + WebKitGTK.webkit_web_view_stop_loading (webView); + } + +-int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ pspec) { ++long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ pspec) { + int status = WebKitGTK.webkit_web_frame_get_load_status (web_frame); + switch (status) { + case WebKitGTK.WEBKIT_LOAD_COMMITTED: { +- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); ++ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + return handleLoadCommitted (uri, false); + } + case WebKitGTK.WEBKIT_LOAD_FINISHED: { +@@ -1361,9 +1361,9 @@ + * response to navigating to a main document containing frames) then + * treat this as a completed load. + */ +- int /*long*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); ++ long /*int*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); + if (WebKitGTK.webkit_web_frame_get_load_status (parentFrame) == WebKitGTK.WEBKIT_LOAD_FINISHED) { +- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); ++ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + return handleLoadFinished (uri, false); + } + } +@@ -1371,7 +1371,7 @@ + return 0; + } + +-int /*long*/ webkit_close_web_view (int /*long*/ web_view) { ++long /*int*/ webkit_close_web_view (long /*int*/ web_view) { + WindowEvent newEvent = new WindowEvent (browser); + newEvent.display = browser.getDisplay (); + newEvent.widget = browser; +@@ -1382,11 +1382,11 @@ + return 0; + } + +-int /*long*/ webkit_console_message (int /*long*/ web_view, int /*long*/ message, int /*long*/ line, int /*long*/ source_id) { ++long /*int*/ webkit_console_message (long /*int*/ web_view, long /*int*/ message, long /*int*/ line, long /*int*/ source_id) { + return 1; /* stop the message from being written to stderr */ + } + +-int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame) { ++long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) { + WindowEvent newEvent = new WindowEvent (browser); + newEvent.display = browser.getDisplay (); + newEvent.widget = browser; +@@ -1406,8 +1406,8 @@ + return 0; + } + +-int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ download) { +- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (download); ++long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ download) { ++ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (download); + int length = OS.strlen (name); + byte[] bytes = new byte[length]; + OS.memmove (bytes, name, length); +@@ -1429,7 +1429,7 @@ + return 1; + } + +-int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ title, int /*long*/ uri) { ++long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ title, long /*int*/ uri) { + if (uri != 0) { + int length = OS.strlen (uri); + byte[] bytes = new byte[length]; +@@ -1446,7 +1446,7 @@ + return 0; + } + +-int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ mimetype, int /*long*/ policy_decision) { ++long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ mimetype, long /*int*/ policy_decision) { + boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0; + if (!canShow) { + WebKitGTK.webkit_web_policy_decision_download (policy_decision); +@@ -1455,7 +1455,7 @@ + return 0; + } + +-int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ navigation_action, int /*long*/ policy_decision) { ++long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ navigation_action, long /*int*/ policy_decision) { + if (loadingText) { + /* + * WebKit is auto-navigating to about:blank in response to a +@@ -1466,7 +1466,7 @@ + return 0; + } + +- int /*long*/ uri = WebKitGTK.webkit_network_request_get_uri (request); ++ long /*int*/ uri = WebKitGTK.webkit_network_request_get_uri (request); + int length = OS.strlen (uri); + byte[] bytes = new byte[length]; + OS.memmove (bytes, uri, length); +@@ -1498,12 +1498,12 @@ + if (newEvent.doit && !browser.isDisposed ()) { + if (jsEnabledChanged) { + jsEnabledChanged = false; +- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); ++ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + OS.g_object_set (settings, WebKitGTK.enable_scripts, jsEnabled ? 1 : 0, 0); + } + + /* hook status change signal if frame is a newly-created sub-frame */ +- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); ++ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + if (frame != mainFrame) { + int id = OS.g_signal_handler_find (frame, OS.G_SIGNAL_MATCH_FUNC | OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, Proc3.getAddress (), NOTIFY_LOAD_STATUS); + if (id == 0) { +@@ -1526,22 +1526,22 @@ + return 0; + } + +-int /*long*/ webkit_notify_load_status (int /*long*/ web_view, int /*long*/ pspec) { ++long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspec) { + int status = WebKitGTK.webkit_web_view_get_load_status (webView); + switch (status) { + case WebKitGTK.WEBKIT_LOAD_COMMITTED: { +- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); ++ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + return handleLoadCommitted (uri, true); + } + case WebKitGTK.WEBKIT_LOAD_FINISHED: { +- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); ++ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + return handleLoadFinished (uri, true); + } + } + return 0; + } + +-int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec) { ++long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) { + ProgressEvent event = new ProgressEvent (browser); + event.display = browser.getDisplay (); + event.widget = browser; +@@ -1553,8 +1553,8 @@ + return 0; + } + +-int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) { +- int /*long*/ title = WebKitGTK.webkit_web_view_get_title (webView); ++long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) { ++ long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView); + String titleString; + if (title == 0) { + titleString = ""; //$NON-NLS-1$ +@@ -1574,7 +1574,7 @@ + return 0; + } + +-int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_menu) { ++long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_menu) { + Point pt = browser.getDisplay ().getCursorLocation (); + Event event = new Event (); + event.x = pt.x; +@@ -1582,10 +1582,10 @@ + browser.notifyListeners (SWT.MenuDetect, event); + if (!event.doit) { + /* clear the menu */ +- int /*long*/ children = OS.gtk_container_get_children (webkit_menu); +- int /*long*/ current = children; ++ long /*int*/ children = OS.gtk_container_get_children (webkit_menu); ++ long /*int*/ current = children; + while (current != 0) { +- int /*long*/ item = OS.g_list_data (current); ++ long /*int*/ item = OS.g_list_data (current); + OS.gtk_container_remove (webkit_menu, item); + current = OS.g_list_next (current); + } +@@ -1599,10 +1599,10 @@ + } + menu.setVisible (true); + /* clear the menu */ +- int /*long*/ children = OS.gtk_container_get_children (webkit_menu); +- int /*long*/ current = children; ++ long /*int*/ children = OS.gtk_container_get_children (webkit_menu); ++ long /*int*/ current = children; + while (current != 0) { +- int /*long*/ item = OS.g_list_data (current); ++ long /*int*/ item = OS.g_list_data (current); + OS.gtk_container_remove (webkit_menu, item); + current = OS.g_list_next (current); + } +@@ -1611,18 +1611,18 @@ + return 0; + } + +-int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long*/ web_frame, int /*long*/ web_resource, int /*long*/ request, int /*long*/ response) { ++long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int*/ web_frame, long /*int*/ web_resource, long /*int*/ request, long /*int*/ response) { + if (postData != null || headers != null) { +- int /*long*/ message = WebKitGTK.webkit_network_request_get_message (request); ++ long /*int*/ message = WebKitGTK.webkit_network_request_get_message (request); + if (message == 0) { + headers = null; + postData = null; + } else { + if (postData != null) { + WebKitGTK.SoupMessage_method (message, PostString); +- int /*long*/ body = WebKitGTK.SoupMessage_request_body (message); ++ long /*int*/ body = WebKitGTK.SoupMessage_request_body (message); + byte[] bytes = Converter.wcsToMbcs (null, postData, false); +- int /*long*/ data = C.malloc (bytes.length); ++ long /*int*/ data = C.malloc (bytes.length); + C.memmove (data, bytes, bytes.length); + WebKitGTK.soup_message_body_append (body, WebKitGTK.SOUP_MEMORY_TAKE, data, bytes.length); + WebKitGTK.soup_message_body_flatten (body); +@@ -1636,7 +1636,7 @@ + } + + /* headers */ +- int /*long*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message); ++ long /*int*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message); + for (int i = 0; i < headers.length; i++) { + String current = headers[i]; + if (current != null) { +@@ -1659,7 +1659,7 @@ + return 0; + } + +-int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/ text) { ++long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ text) { + int length = OS.strlen (text); + byte[] bytes = new byte[length]; + OS.memmove (bytes, text, length); +@@ -1673,12 +1673,12 @@ + return 0; + } + +-int /*long*/ webkit_web_view_ready (int /*long*/ web_view) { ++long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { + WindowEvent newEvent = new WindowEvent (browser); + newEvent.display = browser.getDisplay (); + newEvent.widget = browser; + +- int /*long*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView); ++ long /*int*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView); + int[] result = new int[1]; + OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0); + newEvent.addressBar = result[0] != 0; +@@ -1716,16 +1716,16 @@ + return 0; + } + +-int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ frame, int /*long*/ context, int /*long*/ window_object) { +- int /*long*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context); +- int /*long*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); ++long /*int*/ webkit_window_object_cleared (long /*int*/ web_view, long /*int*/ frame, long /*int*/ context, long /*int*/ window_object) { ++ long /*int*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context); ++ long /*int*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); + byte[] bytes = null; + try { + bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (CHARSET_UTF8); + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, OBJECTNAME_EXTERNAL, true); + } +- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null); + WebKitGTK.JSStringRelease (name); + Enumeration elements = functions.elements (); +@@ -1733,16 +1733,16 @@ + BrowserFunction current = (BrowserFunction)elements.nextElement (); + execute (current.functionString); + } +- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); ++ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + boolean top = mainFrame == frame; + addEventHandlers (top); + return 0; + } + +-int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) { ++long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { + Object returnValue = null; + if (argumentCount == 3) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + C.memmove (result, arguments, C.PTR_SIZEOF); + int type = WebKitGTK.JSValueGetType (ctx, result[0]); + if (type == WebKitGTK.kJSTypeNumber) { +@@ -1782,7 +1782,7 @@ + return convertToJS (ctx, returnValue); + } + +-int /*long*/ convertToJS (int /*long*/ ctx, Object value) { ++long /*int*/ convertToJS (long /*int*/ ctx, Object value) { + if (value == null) { + return WebKitGTK.JSValueMakeUndefined (ctx); + } +@@ -1793,8 +1793,8 @@ + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, (String)value, true); + } +- int /*long*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); +- int /*long*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef); ++ long /*int*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef); + WebKitGTK.JSStringRelease (stringRef); + return result; + } +@@ -1807,10 +1807,10 @@ + if (value instanceof Object[]) { + Object[] arrayValue = (Object[]) value; + int length = arrayValue.length; +- int /*long*/[] arguments = new int /*long*/[length]; ++ long /*int*/[] arguments = new long /*int*/[length]; + for (int i = 0; i < length; i++) { + Object javaObject = arrayValue[i]; +- int /*long*/ jsObject = convertToJS (ctx, javaObject); ++ long /*int*/ jsObject = convertToJS (ctx, javaObject); + arguments[i] = jsObject; + } + return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null); +@@ -1819,7 +1819,7 @@ + return 0; + } + +-Object convertToJava (int /*long*/ ctx, int /*long*/ value) { ++Object convertToJava (long /*int*/ ctx, long /*int*/ value) { + int type = WebKitGTK.JSValueGetType (ctx, value); + switch (type) { + case WebKitGTK.kJSTypeBoolean: { +@@ -1831,9 +1831,9 @@ + return new Double(result); + } + case WebKitGTK.kJSTypeString: { +- int /*long*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null); ++ long /*int*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null); + if (string == 0) return ""; //$NON-NLS-1$ +- int /*long*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); ++ long /*int*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); + byte[] bytes = new byte[(int)/*64*/length]; + length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length); + WebKitGTK.JSStringRelease (string); +@@ -1854,15 +1854,15 @@ + } catch (UnsupportedEncodingException e) { + bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true); + } +- int /*long*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); +- int /*long*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); ++ long /*int*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); ++ long /*int*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); + WebKitGTK.JSStringRelease (propertyName); + type = WebKitGTK.JSValueGetType (ctx, valuePtr); + if (type == WebKitGTK.kJSTypeNumber) { + int length = (int)WebKitGTK.JSValueToNumber (ctx, valuePtr, null); + Object[] result = new Object[length]; + for (int i = 0; i < length; i++) { +- int /*long*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); ++ long /*int*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); + if (current != 0) { + result[i] = convertToJava (ctx, current); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/browser/WindowCreator2.java swt-gtk-3.7//org/eclipse/swt/browser/WindowCreator2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/browser/WindowCreator2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/browser/WindowCreator2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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); +@@ -182,11 +182,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)); +@@ -215,11 +215,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/ByteArrayTransfer.java swt-gtk-3.7//org/eclipse/swt/dnd/ByteArrayTransfer.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/ByteArrayTransfer.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/ByteArrayTransfer.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/Clipboard.java swt-gtk-3.7//org/eclipse/swt/dnd/Clipboard.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/Clipboard.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/Clipboard.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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) { +@@ -563,7 +563,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; + } +@@ -573,7 +573,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; + } +@@ -592,7 +592,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); + /* + * This call to gdk_threads_leave() is a temporary work around + * to avoid deadlocks when gdk_threads_init() is called by native +@@ -616,7 +616,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); + /* + * This call to gdk_threads_leave() is a temporary work around + * to avoid deadlocks when gdk_threads_init() is called by native +@@ -639,11 +639,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/ClipboardProxy.java swt-gtk-3.7//org/eclipse/swt/dnd/ClipboardProxy.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/ClipboardProxy.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/ClipboardProxy.java 2011-06-13 20:53:32.000000000 +0000 +@@ -30,7 +30,7 @@ + Object[] primaryClipboardData; + Transfer[] primaryClipboardDataTypes; + +- int /*long*/ clipboardOwner = OS.gtk_window_new(0); ++ long /*int*/ clipboardOwner = OS.gtk_window_new(0); + Display display; + Clipboard activeClipboard = null; + Clipboard activePrimaryClipboard = null; +@@ -72,7 +72,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; +@@ -119,7 +119,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); +@@ -146,7 +146,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]; +@@ -156,7 +156,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]; +@@ -175,8 +175,8 @@ + if ((clipboards & DND.CLIPBOARD) != 0) { + clipboardData = data; + clipboardDataTypes = dataTypes; +- int /*long*/ getFuncProc = getFunc.getAddress(); +- int /*long*/ clearFuncProc = clearFunc.getAddress(); ++ long /*int*/ getFuncProc = getFunc.getAddress(); ++ long /*int*/ clearFuncProc = clearFunc.getAddress(); + /* + * Feature in GTK. When the contents are set again, clipboard_set_with_data() + * invokes clearFunc and then, getFunc is not sequentially called. +@@ -198,8 +198,8 @@ + if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) { + 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_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) { + return false; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/DragSource.java swt-gtk-3.7//org/eclipse/swt/dnd/DragSource.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/DragSource.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/DragSource.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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) { +- 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 -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/RTFTransfer.java swt-gtk-3.7//org/eclipse/swt/dnd/RTFTransfer.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/RTFTransfer.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/RTFTransfer.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/dnd/TableDragSourceEffect.java swt-gtk-3.7//org/eclipse/swt/dnd/TableDragSourceEffect.java +--- swt-gtk-3.7.orig//org/eclipse/swt/dnd/TableDragSourceEffect.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/dnd/TableDragSourceEffect.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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= 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]; +@@ -432,10 +432,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; +@@ -485,7 +485,7 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-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 -ur swt-gtk-3.7.orig//org/eclipse/swt/graphics/Device.java swt-gtk-3.7//org/eclipse/swt/graphics/Device.java +--- swt-gtk-3.7.orig//org/eclipse/swt/graphics/Device.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/graphics/Device.java 2011-06-13 20:53:32.000000000 +0000 +@@ -36,8 +36,8 @@ + * + * @noreference This field is not intended to be referenced by clients. + */ +- protected int /*long*/ xDisplay; +- int /*long*/ shellHandle; ++ protected long /*int*/ xDisplay; ++ long /*int*/ shellHandle; + + /* Debugging */ + public static boolean DEBUG; +@@ -55,7 +55,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", "GIO"}; +@@ -64,7 +64,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]; + + /* +@@ -82,7 +82,7 @@ + /* Device dpi */ + Point dpi; + +- int /*long*/ emptyTab; ++ long /*int*/ emptyTab; + + boolean useXRender; + boolean useCairo; +@@ -174,7 +174,7 @@ + } else { + buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true); + } +- int /*long*/ libcairo = OS.dlopen(buffer, flags); ++ long /*int*/ libcairo = OS.dlopen(buffer, flags); + if (libcairo != 0) { + OS.dlclose(libcairo); + } else { +@@ -273,7 +273,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, +@@ -740,7 +740,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 (); +@@ -811,7 +811,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) { +@@ -904,7 +904,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) { +@@ -922,7 +922,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/graphics/Drawable.java swt-gtk-3.7//org/eclipse/swt/graphics/Drawable.java +--- swt-gtk-3.7.orig//org/eclipse/swt/graphics/Drawable.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/graphics/Drawable.java 2011-06-13 20:53:32.000000000 +0000 +@@ -45,7 +45,7 @@ + * @noreference This method is not intended to be referenced by clients. + */ + +-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. +@@ -62,6 +62,6 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public void internal_dispose_GC (int /*long*/ handle, GCData data); ++public void internal_dispose_GC (long /*int*/ handle, GCData data); + + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/graphics/Font.java swt-gtk-3.7//org/eclipse/swt/graphics/Font.java +--- swt-gtk-3.7.orig//org/eclipse/swt/graphics/Font.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/graphics/Font.java 2011-06-13 20:53:32.000000000 +0000 +@@ -44,7 +44,7 @@ + * + * @noreference This field is not intended to be referenced by clients. + */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + Font(Device device) { + super(device); +@@ -180,7 +180,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); +@@ -194,7 +194,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); +@@ -219,7 +219,7 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-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 -ur swt-gtk-3.7.orig//org/eclipse/swt/graphics/GCData.java swt-gtk-3.7//org/eclipse/swt/graphics/GCData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/graphics/GCData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/graphics/GCData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/graphics/GC.java swt-gtk-3.7//org/eclipse/swt/graphics/GC.java +--- swt-gtk-3.7.orig//org/eclipse/swt/graphics/GC.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/graphics/GC.java 2011-06-13 20:53:32.000000000 +0000 +@@ -69,7 +69,7 @@ + * + * @noreference This field is not intended to be referenced by clients. + */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + Drawable drawable; + GCData data; +@@ -156,7 +156,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); +@@ -165,10 +165,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); +@@ -194,7 +194,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); +@@ -203,7 +203,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; +@@ -214,7 +214,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; +@@ -230,7 +230,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}; +@@ -390,10 +390,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]; +@@ -420,7 +420,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); + } +@@ -449,7 +449,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); +@@ -497,7 +497,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) { +@@ -537,10 +537,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()); +@@ -560,13 +560,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) { +@@ -629,7 +629,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) { +@@ -680,8 +680,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]; +@@ -786,7 +786,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(); +@@ -808,7 +808,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) { + /* +@@ -827,8 +827,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); +@@ -851,7 +851,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); +@@ -891,7 +891,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); +@@ -908,12 +908,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; +@@ -926,7 +926,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; +@@ -943,33 +943,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); +@@ -1617,7 +1617,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 +@@ -1666,13 +1666,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); +@@ -1745,7 +1745,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) { +@@ -1822,9 +1822,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 { +@@ -1874,7 +1874,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); +@@ -1920,8 +1920,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); +@@ -1951,7 +1951,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); +@@ -1986,7 +1986,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); +@@ -2052,7 +2052,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); +@@ -2077,7 +2077,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); +@@ -2296,11 +2296,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; +@@ -2356,10 +2356,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) { +@@ -2375,7 +2375,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 { +@@ -2390,7 +2390,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); +@@ -2411,7 +2411,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; + } +@@ -2447,9 +2447,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)); +@@ -2694,13 +2694,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); + } + } +@@ -2735,7 +2735,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(); +@@ -2795,7 +2795,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; +@@ -2818,27 +2818,27 @@ + } + 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; + if (OS.GTK_VERSION < OS.VERSION(2, 17, 0)) { +- 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]; +@@ -2848,7 +2848,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); +@@ -2972,7 +2972,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; +@@ -3052,7 +3052,7 @@ + SWT.error(SWT.ERROR_INVALID_ARGUMENT); + } + initCairo(); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + Cairo.cairo_set_antialias(cairo, mode); + } + +@@ -3114,12 +3114,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); +@@ -3136,12 +3136,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= OS.VERSION(2, 8, 0)) { + Cairo.cairo_save(cairo); +@@ -502,7 +502,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); +@@ -517,7 +517,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_utf16_offset_to_pointer(ptr, selectionStart) - ptr); + int byteSelEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionEnd + 1) - ptr); + int strlen = OS.strlen(ptr); +@@ -539,7 +539,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); +@@ -555,7 +555,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); +@@ -563,7 +563,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); +@@ -580,9 +580,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); +@@ -602,10 +602,10 @@ + int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); + int byteEnd = (int)/*64*/(OS.g_utf16_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; +@@ -680,10 +680,10 @@ + int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); + int byteEnd = (int)/*64*/(OS.g_utf16_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; +@@ -706,8 +706,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); +@@ -779,10 +779,10 @@ + int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr); + int byteEnd = (int)/*64*/(OS.g_utf16_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; +@@ -805,8 +805,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); +@@ -945,14 +945,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_utf16_offset_to_pointer (ptr, start) - ptr); + int byteEnd = (int)/*64*/(OS.g_utf16_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(); + +@@ -962,9 +962,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 { +@@ -1080,17 +1080,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_utf16_offset_to_pointer(ptr, offset) - ptr; ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ byteOffset = OS.g_utf16_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); +@@ -1122,7 +1122,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(); +@@ -1179,11 +1179,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_utf16_offset_to_pointer(ptr,offset) - ptr; ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ byteOffset = OS.g_utf16_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; +@@ -1215,9 +1215,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); +@@ -1248,10 +1248,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_utf16_pointer_to_offset(ptr, ptr + line.start_index); + offsets[i] = untranslateOffset(pos); +@@ -1282,7 +1282,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_utf16_offset_to_pointer(ptr, offset) - ptr); + int strlen = OS.strlen(ptr); + byteOffset = Math.min(byteOffset, strlen); +@@ -1333,12 +1333,12 @@ + } + 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; + +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + int utf8Offset = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset)); + int utf8Length = (int)/*64*/OS.g_utf8_strlen(ptr, -1); + utf8Offset += step; +@@ -1451,7 +1451,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 { +@@ -1471,7 +1471,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_utf16_pointer_to_offset(ptr, ptr + index[0]); + if (trailing != null) { + trailing[0] = piTrailing[0]; +@@ -2171,7 +2171,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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,9 +17,9 @@ + + public class AtkAttribute { + /** @field cast=(char *) */ +- public int /*long*/ name; ++ public long /*int*/ name; + /** @field cast=(char *) */ +- public int /*long*/ value; ++ public long /*int*/ value; + public static final int sizeof = ATK.AtkAttribute_sizeof (); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -16,17 +16,17 @@ + + public class AtkEditableTextIface { + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ set_run_attributes; ++ public long /*int*/ set_run_attributes; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_text_contents; ++ public long /*int*/ set_text_contents; + /** @field cast=(void (*)()) */ +- public int /*long*/ insert_text; ++ public long /*int*/ insert_text; + /** @field cast=(void (*)()) */ +- public int /*long*/ copy_text; ++ public long /*int*/ copy_text; + /** @field cast=(void (*)()) */ +- public int /*long*/ cut_text; ++ public long /*int*/ cut_text; + /** @field cast=(void (*)()) */ +- public int /*long*/ delete_text; ++ public long /*int*/ delete_text; + /** @field cast=(void (*)()) */ +- public int /*long*/ paste_text; ++ public long /*int*/ paste_text; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/ATK.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/ATK.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/ATK.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/ATK.java 2011-06-13 20:53:32.000000000 +0000 +@@ -198,28 +198,28 @@ + /** Natives */ + + /** @method flags=const */ +-public static final native int /*long*/ GTK_TYPE_ACCESSIBLE (); ++public static final native long /*int*/ GTK_TYPE_ACCESSIBLE (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_ACTION (); ++public static final native long /*int*/ ATK_TYPE_ACTION (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_COMPONENT (); ++public static final native long /*int*/ ATK_TYPE_COMPONENT (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_EDITABLE_TEXT (); ++public static final native long /*int*/ ATK_TYPE_EDITABLE_TEXT (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_HYPERTEXT (); ++public static final native long /*int*/ ATK_TYPE_HYPERTEXT (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_SELECTION (); ++public static final native long /*int*/ ATK_TYPE_SELECTION (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_TABLE (); ++public static final native long /*int*/ ATK_TYPE_TABLE (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_TEXT (); ++public static final native long /*int*/ ATK_TYPE_TEXT (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_VALUE (); ++public static final native long /*int*/ ATK_TYPE_VALUE (); + /** @method flags=const */ +-public static final native int /*long*/ ATK_TYPE_OBJECT_FACTORY (); +-public static final native boolean ATK_IS_NO_OP_OBJECT_FACTORY (int /*long*/ obj); +-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_TYPE_OBJECT_FACTORY (); ++public static final native boolean ATK_IS_NO_OP_OBJECT_FACTORY (long /*int*/ 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); +@@ -227,8 +227,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); +@@ -236,9 +236,9 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass); +-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_OBJECT_FACTORY_CLASS (long /*int*/ klass); ++public static final native long /*int*/ _ATK_SELECTION_GET_IFACE (long /*int*/ obj); ++public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) { + lock.lock(); + try { + return _ATK_SELECTION_GET_IFACE(obj); +@@ -246,8 +246,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_EDITABLE_TEXT_GET_IFACE (int /*long*/ handle); +-public static final int /*long*/ ATK_EDITABLE_TEXT_GET_IFACE (int /*long*/ handle) { ++public static final native long /*int*/ _ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle); ++public static final long /*int*/ ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle) { + lock.lock(); + try { + return _ATK_EDITABLE_TEXT_GET_IFACE(handle); +@@ -255,8 +255,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_HYPERTEXT_GET_IFACE (int /*long*/ handle); +-public static final int /*long*/ ATK_HYPERTEXT_GET_IFACE (int /*long*/ handle) { ++public static final native long /*int*/ _ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle); ++public static final long /*int*/ ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle) { + lock.lock(); + try { + return _ATK_HYPERTEXT_GET_IFACE(handle); +@@ -264,8 +264,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_TABLE_GET_IFACE (int /*long*/ handle); +-public static final int /*long*/ ATK_TABLE_GET_IFACE (int /*long*/ handle) { ++public static final native long /*int*/ _ATK_TABLE_GET_IFACE (long /*int*/ handle); ++public static final long /*int*/ ATK_TABLE_GET_IFACE (long /*int*/ handle) { + lock.lock(); + try { + return _ATK_TABLE_GET_IFACE(handle); +@@ -273,8 +273,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); +@@ -282,8 +282,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_VALUE_GET_IFACE (int /*long*/ handle); +-public static final int /*long*/ ATK_VALUE_GET_IFACE (int /*long*/ handle) { ++public static final native long /*int*/ _ATK_VALUE_GET_IFACE (long /*int*/ handle); ++public static final long /*int*/ ATK_VALUE_GET_IFACE (long /*int*/ handle) { + lock.lock(); + try { + return _ATK_VALUE_GET_IFACE(handle); +@@ -291,8 +291,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); +@@ -301,8 +301,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); +@@ -310,8 +310,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(); +@@ -323,8 +323,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); +@@ -333,8 +333,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); +@@ -346,8 +346,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); +@@ -356,8 +356,8 @@ + } + } + /** @param accessible cast=(AtkObject *) */ +-public static final native void _atk_object_notify_state_change (int /*long*/ accessible, int state, boolean value); +-public static final void atk_object_notify_state_change (int /*long*/ accessible, int state, boolean value) { ++public static final native void _atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value); ++public static final void atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value) { + lock.lock(); + try { + _atk_object_notify_state_change(accessible, state, value); +@@ -366,8 +366,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); +@@ -403,8 +403,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); +@@ -417,8 +417,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); +@@ -427,8 +427,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); +@@ -437,8 +437,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); +@@ -450,8 +450,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); +@@ -463,8 +463,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); +@@ -472,8 +472,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(); +@@ -481,8 +481,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _atk_text_attribute_get_name (int attr); +-public static final int /*long*/ atk_text_attribute_get_name (int attr) { ++public static final native long /*int*/ _atk_text_attribute_get_name (int attr); ++public static final long /*int*/ atk_text_attribute_get_name (int attr) { + lock.lock(); + try { + return _atk_text_attribute_get_name(attr); +@@ -490,8 +490,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _atk_text_attribute_get_value (int attr, int index); +-public static final int /*long*/ atk_text_attribute_get_value (int attr, int index) { ++public static final native long /*int*/ _atk_text_attribute_get_value (int attr, int index); ++public static final long /*int*/ atk_text_attribute_get_value (int attr, int index) { + lock.lock(); + try { + return _atk_text_attribute_get_value(attr, index); +@@ -499,8 +499,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); +@@ -508,8 +508,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); +@@ -517,8 +517,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); +@@ -526,8 +526,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); +@@ -535,8 +535,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); +@@ -544,8 +544,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); +@@ -554,62 +554,62 @@ + } + } + /** @param str cast=(char *) */ +-public static final native int /*long*/ g_strdup (int /*long*/ str); +-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 (AtkEditableTextIface 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 (AtkTableIface dest, int /*long*/ src); +-public static final native void memmove (AtkTextIface dest, int /*long*/ src); +-public static final native void memmove (AtkValueIface 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, AtkEditableTextIface 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, AtkTableIface src); +-public static final native void memmove (int /*long*/ dest, AtkTextIface src); +-public static final native void memmove (int /*long*/ dest, AtkValueIface src); ++public static final native long /*int*/ g_strdup (long /*int*/ str); ++public static final native void memmove (AtkActionIface dest, long /*int*/ src); ++public static final native void memmove (AtkComponentIface dest, long /*int*/ src); ++public static final native void memmove (AtkEditableTextIface dest, long /*int*/ src); ++public static final native void memmove (AtkHypertextIface dest, long /*int*/ src); ++public static final native void memmove (AtkObjectClass dest, long /*int*/ src); ++public static final native void memmove (AtkObjectFactoryClass dest, long /*int*/ src); ++public static final native void memmove (AtkSelectionIface dest, long /*int*/ src); ++public static final native void memmove (AtkTableIface dest, long /*int*/ src); ++public static final native void memmove (AtkTextIface dest, long /*int*/ src); ++public static final native void memmove (AtkValueIface dest, long /*int*/ src); ++public static final native void memmove (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, AtkEditableTextIface src); ++public static final native void memmove (long /*int*/ dest, AtkHypertextIface src); ++public static final native void memmove (long /*int*/ dest, AtkObjectClass src); ++public static final native void memmove (long /*int*/ dest, AtkObjectFactoryClass src); ++public static final native void memmove (long /*int*/ dest, AtkSelectionIface src); ++public static final native void memmove (long /*int*/ dest, AtkTableIface src); ++public static final native void memmove (long /*int*/ dest, AtkTextIface src); ++public static final native void memmove (long /*int*/ dest, AtkValueIface src); + /** + * @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, AtkTextRectangle src, int size); ++public static final native void memmove (long /*int*/ dest, AtkTextRectangle src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove (AtkTextRectangle dest, int /*long*/ src, int size); ++public static final native void memmove (AtkTextRectangle dest, long /*int*/ src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove (int /*long*/ dest, AtkTextRange src, int size); ++public static final native void memmove (long /*int*/ dest, AtkTextRange src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove (AtkTextRange dest, int /*long*/ src, int size); ++public static final native void memmove (AtkTextRange dest, long /*int*/ src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove (int /*long*/ dest, AtkAttribute src, int size); ++public static final native void memmove (long /*int*/ dest, AtkAttribute src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove (AtkAttribute dest, int /*long*/ src, int size); ++public static final native void memmove (AtkAttribute dest, long /*int*/ src, int size); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,51 +17,51 @@ + + 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; + /** @field accessor=SWT_AtkObjectClass_get_attributes,cast=(SWT_AtkObjectClass_get_attributes_cast) */ +- public int /*long*/ get_attributes; ++ public long /*int*/ get_attributes; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,75 +17,75 @@ + + public class AtkTableIface { + /** @field cast=(AtkObject* (*)()) */ +- public int /*long*/ ref_at; ++ public long /*int*/ ref_at; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_index_at; ++ public long /*int*/ get_index_at; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_column_at_index; ++ public long /*int*/ get_column_at_index; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_row_at_index; ++ public long /*int*/ get_row_at_index; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_n_columns; ++ public long /*int*/ get_n_columns; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_n_rows; ++ public long /*int*/ get_n_rows; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_column_extent_at; ++ public long /*int*/ get_column_extent_at; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_row_extent_at; ++ public long /*int*/ get_row_extent_at; + /** @field cast=(AtkObject* (*)()) */ +- public int /*long*/ get_caption; ++ public long /*int*/ get_caption; + /** @field cast=(G_CONST_RETURN gchar* (*)()) */ +- public int /*long*/ get_column_description; ++ public long /*int*/ get_column_description; + /** @field cast=(AtkObject* (*)()) */ +- public int /*long*/ get_column_header; ++ public long /*int*/ get_column_header; + /** @field cast=(G_CONST_RETURN gchar* (*)()) */ +- public int /*long*/ get_row_description; ++ public long /*int*/ get_row_description; + /** @field cast=(AtkObject* (*)()) */ +- public int /*long*/ get_row_header; ++ public long /*int*/ get_row_header; + /** @field cast=(AtkObject* (*)()) */ +- public int /*long*/ get_summary; ++ public long /*int*/ get_summary; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_caption; ++ public long /*int*/ set_caption; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_column_description; ++ public long /*int*/ set_column_description; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_column_header; ++ public long /*int*/ set_column_header; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_row_description; ++ public long /*int*/ set_row_description; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_row_header; ++ public long /*int*/ set_row_header; + /** @field cast=(void (*)()) */ +- public int /*long*/ set_summary; ++ public long /*int*/ set_summary; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_selected_columns; ++ public long /*int*/ get_selected_columns; + /** @field cast=(gint (*)()) */ +- public int /*long*/ get_selected_rows; ++ public long /*int*/ get_selected_rows; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ is_column_selected; ++ public long /*int*/ is_column_selected; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ is_row_selected; ++ public long /*int*/ is_row_selected; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ is_selected; ++ public long /*int*/ is_selected; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ add_row_selection; ++ public long /*int*/ add_row_selection; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ remove_row_selection; ++ public long /*int*/ remove_row_selection; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ add_column_selection; ++ public long /*int*/ add_column_selection; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ remove_column_selection; ++ public long /*int*/ remove_column_selection; + /** @field cast=(void (*)()) */ +- public int /*long*/ row_inserted; ++ public long /*int*/ row_inserted; + /** @field cast=(void (*)()) */ +- public int /*long*/ column_inserted; ++ public long /*int*/ column_inserted; + /** @field cast=(void (*)()) */ +- public int /*long*/ row_deleted; ++ public long /*int*/ row_deleted; + /** @field cast=(void (*)()) */ +- public int /*long*/ column_deleted; ++ public long /*int*/ column_deleted; + /** @field cast=(void (*)()) */ +- public int /*long*/ row_reordered; ++ public long /*int*/ row_reordered; + /** @field cast=(void (*)()) */ +- public int /*long*/ column_reordered; ++ public long /*int*/ column_reordered; + /** @field cast=(void (*)()) */ +- public int /*long*/ model_changed; ++ public long /*int*/ model_changed; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,47 +17,47 @@ + + 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; + /** @field cast=(void (*)()) */ +- public int /*long*/ get_range_extents; ++ public long /*int*/ get_range_extents; + /** @field cast=(AtkTextRange** (*)()) */ +- public int /*long*/ get_bounded_ranges; ++ public long /*int*/ get_bounded_ranges; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2011-06-13 20:53:32.000000000 +0000 +@@ -20,7 +20,7 @@ + public int start_offset; + public int end_offset; + /** @field cast=(gchar *) */ +- public int /*long*/ content; ++ public long /*int*/ content; + public static final int sizeof = ATK.AtkTextRange_sizeof (); + + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,11 +17,11 @@ + + public class AtkValueIface { + /** @field cast=(void (*)()) */ +- public int /*long*/ get_current_value; ++ public long /*int*/ get_current_value; + /** @field cast=(void (*)()) */ +- public int /*long*/ get_maximum_value; ++ public long /*int*/ get_maximum_value; + /** @field cast=(void (*)()) */ +- public int /*long*/ get_minimum_value; ++ public long /*int*/ get_minimum_value; + /** @field cast=(gboolean (*)()) */ +- public int /*long*/ set_current_value; ++ public long /*int*/ set_current_value; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,5 +17,5 @@ + + public class GtkAccessible { + /** @field cast=(GtkWidget *) */ +- public int /*long*/ widget; ++ public long /*int*/ widget; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/BidiUtil.java swt-gtk-3.7//org/eclipse/swt/internal/BidiUtil.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/BidiUtil.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/BidiUtil.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/cairo/Cairo.java swt-gtk-3.7//org/eclipse/swt/internal/cairo/Cairo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/cairo/Cairo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/cairo/Cairo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/cairo/cairo_path_t.java swt-gtk-3.7//org/eclipse/swt/internal/cairo/cairo_path_t.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/cairo/cairo_path_t.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/cairo/cairo_path_t.java 2011-06-13 20:53:32.000000000 +0000 +@@ -24,7 +24,7 @@ + public class cairo_path_t { + public int status; + /** @field cast=(cairo_path_data_t *) */ +- public int /*long*/ data; ++ public long /*int*/ data; + public int num_data; + public static final int sizeof = Cairo.cairo_path_t_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/Callback.java swt-gtk-3.7//org/eclipse/swt/internal/Callback.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/Callback.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/Callback.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/cde/CDE.java swt-gtk-3.7//org/eclipse/swt/internal/cde/CDE.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/cde/CDE.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/cde/CDE.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/cde/DtActionArg.java swt-gtk-3.7//org/eclipse/swt/internal/cde/DtActionArg.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/cde/DtActionArg.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/cde/DtActionArg.java 2011-06-13 20:53:32.000000000 +0000 +@@ -14,6 +14,6 @@ + public class DtActionArg { + public int argClass; + /** @field accessor=u.file.name,cast=(char *) */ +- public int /*long*/ name; ++ public long /*int*/ name; + public static final int sizeof = CDE.DtActionArg_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/C.java swt-gtk-3.7//org/eclipse/swt/internal/C.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/C.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/C.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/Converter.java swt-gtk-3.7//org/eclipse/swt/internal/Converter.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/Converter.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/Converter.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gnome/GNOME.java swt-gtk-3.7//org/eclipse/swt/internal/gnome/GNOME.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gnome/GNOME.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gnome/GNOME.java 2011-06-13 20:53:32.000000000 +0000 +@@ -39,8 +39,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); +@@ -52,8 +52,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); +@@ -62,8 +62,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); +@@ -71,8 +71,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); +@@ -81,8 +81,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); +@@ -100,8 +100,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); +@@ -114,8 +114,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); +@@ -123,8 +123,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(); +@@ -132,8 +132,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(); +@@ -142,8 +142,8 @@ + } + } + /** @param uri cast=(const char *) */ +-public static final native int /*long*/ _gnome_vfs_get_mime_type(int /*long*/ uri); +-public static final int /*long*/ gnome_vfs_get_mime_type(int /*long*/ uri) { ++public static final native long /*int*/ _gnome_vfs_get_mime_type(long /*int*/ uri); ++public static final long /*int*/ gnome_vfs_get_mime_type(long /*int*/ uri) { + lock.lock(); + try { + return _gnome_vfs_get_mime_type(uri); +@@ -162,8 +162,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); +@@ -175,8 +175,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); +@@ -185,8 +185,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); +@@ -209,8 +209,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); +@@ -219,8 +219,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); +@@ -229,8 +229,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); +@@ -239,8 +239,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); +@@ -249,8 +249,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); +@@ -259,8 +259,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); +@@ -272,8 +272,8 @@ + * @param mime_type cast=(const char *) + * @param base_mime_type cast=(const char *) + */ +-public static final native int /*long*/ _gnome_vfs_mime_type_get_equivalence(int /*long*/ mime_type, byte [] base_mime_type); +-public static final int /*long*/ gnome_vfs_mime_type_get_equivalence(int /*long*/ mime_type, byte [] base_mime_type) { ++public static final native long /*int*/ _gnome_vfs_mime_type_get_equivalence(long /*int*/ mime_type, byte [] base_mime_type); ++public static final long /*int*/ gnome_vfs_mime_type_get_equivalence(long /*int*/ mime_type, byte [] base_mime_type) { + lock.lock(); + try { + return _gnome_vfs_mime_type_get_equivalence(mime_type, base_mime_type); +@@ -285,8 +285,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); +@@ -299,5 +299,5 @@ + * @param src cast=(const void *) + * @param count cast=(size_t) + */ +-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count); ++public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java swt-gtk-3.7//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkDragContext.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkDragContext.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkDragContext.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkDragContext.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventAny.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventAny.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventAny.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventAny.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,7 +17,7 @@ + + public class GdkEventAny extends GdkEvent { + /** @field cast=(GdkWindow *) */ +- public int /*long*/ window; ++ public long /*int*/ window; + /** @field cast=(gint8) */ + public byte send_event; + public static final int sizeof = OS.GdkEventAny_sizeof(); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventButton.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventButton.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventButton.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventButton.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventCrossing.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventCrossing.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,11 +17,11 @@ + + public class GdkEventCrossing extends GdkEvent { + /** @field cast=(GdkWindow *) */ +- public int /*long*/ window; ++ public long /*int*/ window; + /** @field cast=(gint8) */ + public byte send_event; + /** @field cast=(GdkWindow *) */ +- public int /*long*/ subwindow; ++ public long /*int*/ subwindow; + public int time; + public double x; + public double y; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventExpose.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventExpose.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventExpose.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventExpose.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventFocus.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventFocus.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventFocus.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventFocus.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventKey.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventKey.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventKey.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventKey.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventMotion.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventMotion.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventMotion.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventMotion.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventProperty.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventProperty.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventProperty.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventProperty.java 2011-06-13 20:53:32.000000000 +0000 +@@ -16,11 +16,11 @@ + + public class GdkEventProperty extends GdkEvent { + /** @field cast=(GdkWindow *) */ +- public int /*long*/ window; ++ public long /*int*/ window; + /** @field cast=(gint8) */ + public byte send_event; + /** @field cast=(GdkAtom) */ +- public int /*long*/ atom; ++ public long /*int*/ atom; + /** @field cast=(guint32) */ + public int time; + /** @field cast=(guint) */ +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventScroll.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventScroll.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventScroll.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventScroll.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventVisibility.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventVisibility.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventWindowState.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventWindowState.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,7 +17,7 @@ + + public class GdkEventWindowState extends GdkEvent { + /** @field cast=(GdkWindow *) */ +- public int /*long*/ window; ++ public long /*int*/ window; + public byte send_event; + public int changed_mask; + public int new_window_state; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkGCValues.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkGCValues.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkGCValues.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkGCValues.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkImage.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkImage.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkImage.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkImage.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkWindowAttr.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkWindowAttr.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GInterfaceInfo.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GInterfaceInfo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GObjectClass.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GObjectClass.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GObjectClass.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GObjectClass.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkCombo.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkCombo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkCombo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkCombo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkFileSelection.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkFileSelection.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkFileSelection.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkFileSelection.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkFixed.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkFixed.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkFixed.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkFixed.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,5 +17,5 @@ + + public class GtkFixed { + /** @field cast=(GList *) */ +- public int /*long*/ children; ++ public long /*int*/ children; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkSelectionData.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkSelectionData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkSelectionData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkSelectionData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkTargetEntry.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkTargetEntry.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkTargetPair.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkTargetPair.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkTargetPair.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkTargetPair.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkWidgetClass.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkWidgetClass.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GTypeInfo.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GTypeInfo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GTypeInfo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GTypeInfo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GTypeQuery.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/GTypeQuery.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/GTypeQuery.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/GTypeQuery.java 2011-06-13 20:53:32.000000000 +0000 +@@ -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 -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/OS.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/OS.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/OS.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/OS.java 2011-06-13 20:53:32.000000000 +0000 +@@ -38,7 +38,7 @@ + } + + /** Constants */ +- public static final int /*long*/ AnyPropertyType = 0; ++ public static final long /*int*/ AnyPropertyType = 0; + public static final int ATK_RELATION_LABELLED_BY = 4; + public static final int G_FILE_TEST_IS_DIR = 1 << 2; + public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3; +@@ -634,12 +634,12 @@ + 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); + + + +@@ -647,78 +647,78 @@ + + + /** @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=(GtkRange *) */ +-public static final native int GTK_RANGE_SLIDER_START(int /*long*/ widget); ++public static final native int GTK_RANGE_SLIDER_START(long /*int*/ widget); + /** @param widget cast=(GtkRange *) */ +-public static final native int GTK_RANGE_SLIDER_END(int /*long*/ widget); ++public static final native int GTK_RANGE_SLIDER_END(long /*int*/ widget); + /** @param widget cast=(GtkRange *) */ +-public static final native boolean GTK_RANGE_HAS_STEPPER_A(int /*long*/ widget); ++public static final native boolean GTK_RANGE_HAS_STEPPER_A(long /*int*/ widget); + /** @param widget cast=(GtkRange *) */ +-public static final native boolean GTK_RANGE_HAS_STEPPER_B(int /*long*/ widget); ++public static final native boolean GTK_RANGE_HAS_STEPPER_B(long /*int*/ widget); + /** @param widget cast=(GtkRange *) */ +-public static final native boolean GTK_RANGE_HAS_STEPPER_C(int /*long*/ widget); ++public static final native boolean GTK_RANGE_HAS_STEPPER_C(long /*int*/ widget); + /** @param widget cast=(GtkRange *) */ +-public static final native boolean GTK_RANGE_HAS_STEPPER_D(int /*long*/ widget); ++public static final native boolean GTK_RANGE_HAS_STEPPER_D(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; +@@ -736,7 +736,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; +@@ -752,8 +752,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); +@@ -761,8 +761,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); +@@ -773,8 +773,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); +@@ -787,8 +787,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); +@@ -802,8 +802,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); +@@ -817,8 +817,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); +@@ -827,8 +827,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); +@@ -837,8 +837,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); +@@ -847,8 +847,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); +@@ -857,8 +857,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); +@@ -872,8 +872,8 @@ + * @param owner cast=(Window) + * @param time cast=(Time) + */ +-public static final native int /*long*/ _XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time); +-public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time) { ++public static final native long /*int*/ _XSetSelectionOwner(long /*int*/ display, long /*int*/ selection, long /*int*/ window, int time); ++public static final long /*int*/ XSetSelectionOwner(long /*int*/ display, long /*int*/ selection, long /*int*/ window, int time) { + lock.lock(); + try { + return _XSetSelectionOwner(display, selection, window, time); +@@ -885,8 +885,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); +@@ -907,8 +907,8 @@ + * @param bytes_after_return cast=(unsigned long *) + * @param prop_return cast=(unsigned char **) + */ +-public static final native int /*long*/ _XGetWindowProperty(int /*long*/ display, int /*long*/ window, int /*long*/ property, int offset, int length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int [] actual_format_return , int[] nitems_return, int[] bytes_after_return, int /*long*/ [] prop_return); +-public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*long*/ window, int /*long*/ property, int offset, int length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int [] actual_format_return, int[] nitems_return, int[] bytes_after_return, int /*long*/ [] prop_return) { ++public static final native long /*int*/ _XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return , int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return); ++public static final long /*int*/ XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return, int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return) { + lock.lock(); + try { + return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return); +@@ -923,8 +923,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); +@@ -943,8 +943,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); +@@ -960,8 +960,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); +@@ -973,8 +973,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); +@@ -987,8 +987,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); +@@ -1001,8 +1001,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); +@@ -1015,8 +1015,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); +@@ -1025,8 +1025,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); +@@ -1035,8 +1035,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); +@@ -1048,8 +1048,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); +@@ -1062,8 +1062,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); +@@ -1072,8 +1072,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); +@@ -1086,8 +1086,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); +@@ -1100,8 +1100,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); +@@ -1113,8 +1113,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); +@@ -1127,8 +1127,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); +@@ -1137,8 +1137,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); +@@ -1147,8 +1147,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); +@@ -1157,8 +1157,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); +@@ -1167,8 +1167,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); +@@ -1181,8 +1181,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); +@@ -1194,8 +1194,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); +@@ -1204,8 +1204,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); +@@ -1213,8 +1213,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); +@@ -1222,8 +1222,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); +@@ -1236,8 +1236,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); +@@ -1250,8 +1250,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); +@@ -1264,49 +1264,49 @@ + * @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(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); + + /** @method flags=const */ + public static final native int RTLD_GLOBAL(); +@@ -1326,8 +1326,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); +@@ -1336,8 +1336,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); +@@ -1349,8 +1349,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); +@@ -1359,8 +1359,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); +@@ -1369,8 +1369,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); +@@ -1379,8 +1379,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); +@@ -1389,8 +1389,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); +@@ -1399,8 +1399,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); +@@ -1409,8 +1409,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); +@@ -1422,14 +1422,14 @@ + /** Custom callbacks */ + + /** @method flags=no_gen */ +-public static final native int /*long*/ pangoLayoutNewProc_CALLBACK(int /*long*/ func); ++public static final native long /*int*/ pangoLayoutNewProc_CALLBACK(long /*int*/ func); + + + /** 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(); +@@ -1437,8 +1437,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(); +@@ -1447,8 +1447,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(); +@@ -1457,8 +1457,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(); +@@ -1466,8 +1466,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); +@@ -1475,8 +1475,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_SCROLLED_WINDOW(int /*long*/ obj); +-public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) { ++public static final native boolean _GTK_IS_SCROLLED_WINDOW(long /*int*/ obj); ++public static final boolean GTK_IS_SCROLLED_WINDOW(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_SCROLLED_WINDOW(obj); +@@ -1484,8 +1484,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); +@@ -1493,8 +1493,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); +@@ -1502,8 +1502,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); +@@ -1511,8 +1511,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); +@@ -1520,8 +1520,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); +@@ -1529,8 +1529,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); +@@ -1538,8 +1538,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); +@@ -1547,8 +1547,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); +@@ -1556,8 +1556,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); +@@ -1566,8 +1566,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(); +@@ -1576,8 +1576,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(); +@@ -1586,8 +1586,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(); +@@ -1596,8 +1596,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(); +@@ -1606,8 +1606,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(); +@@ -1616,8 +1616,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(); +@@ -1626,8 +1626,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(); +@@ -1636,8 +1636,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(); +@@ -1645,8 +1645,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); +@@ -1654,8 +1654,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); +@@ -1663,8 +1663,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); +@@ -1672,8 +1672,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); +@@ -1681,8 +1681,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); +@@ -1690,8 +1690,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); +@@ -1699,8 +1699,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); +@@ -1708,8 +1708,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); +@@ -1717,8 +1717,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); +@@ -1726,8 +1726,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); +@@ -1735,8 +1735,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); +@@ -1744,8 +1744,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); +@@ -1753,8 +1753,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); +@@ -1763,18 +1763,18 @@ + } + } + /** @method flags=const */ +-public static final native int /*long*/ G_TYPE_BOOLEAN(); ++public static final native long /*int*/ G_TYPE_BOOLEAN(); + /** @method flags=const */ +-public static final native int /*long*/ G_TYPE_DOUBLE(); ++public static final native long /*int*/ G_TYPE_DOUBLE(); + /** @method flags=const */ +-public static final native int /*long*/ G_TYPE_FLOAT(); ++public static final native long /*int*/ G_TYPE_FLOAT(); + /** @method flags=const */ +-public static final native int /*long*/ G_TYPE_INT(); ++public static final native long /*int*/ G_TYPE_INT(); + /** @method flags=const */ +-public static final native int /*long*/ G_TYPE_INT64(); +-public static final native int /*long*/ G_VALUE_TYPE(int /*long*/ value); +-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_TYPE_INT64(); ++public static final native long /*int*/ G_VALUE_TYPE(long /*int*/ value); ++public static final native long /*int*/ _G_OBJECT_TYPE (long /*int*/ instance); ++public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) { + lock.lock(); + try { + return _G_OBJECT_TYPE(instance); +@@ -1783,8 +1783,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(); +@@ -1802,8 +1802,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(); +@@ -1812,8 +1812,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(); +@@ -1822,8 +1822,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); +@@ -1832,8 +1832,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); +@@ -1845,8 +1845,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); +@@ -1855,8 +1855,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, int /*long*/ flags, int /*long*/ error); +-public static final int /*long*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, int /*long*/ flags, int /*long*/ error) { ++public static final native long /*int*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error); ++public static final long /*int*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error) { + lock.lock(); + try { + return _g_app_info_create_from_commandline(commandline, applName, flags, error); +@@ -1865,8 +1865,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_all(); +-public static final int /*long*/ g_app_info_get_all() { ++public static final native long /*int*/ _g_app_info_get_all(); ++public static final long /*int*/ g_app_info_get_all() { + lock.lock(); + try { + return _g_app_info_get_all(); +@@ -1875,8 +1875,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_executable(int /*long*/ appInfo); +-public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo) { ++public static final native long /*int*/ _g_app_info_get_executable(long /*int*/ appInfo); ++public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_get_executable(appInfo); +@@ -1885,8 +1885,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_icon(int /*long*/ appInfo); +-public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) { ++public static final native long /*int*/ _g_app_info_get_icon(long /*int*/ appInfo); ++public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_get_icon(appInfo); +@@ -1895,8 +1895,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_id(int /*long*/ appInfo); +-public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) { ++public static final native long /*int*/ _g_app_info_get_id(long /*int*/ appInfo); ++public static final long /*int*/ g_app_info_get_id(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_get_id(appInfo); +@@ -1905,8 +1905,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_name(int /*long*/ appInfo); +-public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) { ++public static final native long /*int*/ _g_app_info_get_name(long /*int*/ appInfo); ++public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_get_name(appInfo); +@@ -1915,8 +1915,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_app_info_launch(int /*long*/ appInfo, int /*long*/ list, int /*long*/ launchContext, int /*long*/ error); +-public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/ list, int /*long*/ launchContext, int /*long*/ error) { ++public static final native boolean _g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error); ++public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error) { + lock.lock(); + try { + return _g_app_info_launch(appInfo, list, launchContext, error); +@@ -1925,8 +1925,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs); +-public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) { ++public static final native long /*int*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs); ++public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) { + lock.lock(); + try { + return _g_app_info_get_default_for_type(mimeType, mustSupportURIs); +@@ -1935,8 +1935,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_app_info_launch_default_for_uri(int /*long*/ uri, int /*long*/ launchContext, int /*long*/ error); +-public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appInfo, int /*long*/ launchContext, int /*long*/ error) { ++public static final native boolean _g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error); ++public static final boolean g_app_info_launch_default_for_uri(long /*int*/ appInfo, long /*int*/ launchContext, long /*int*/ error) { + lock.lock(); + try { + return _g_app_info_launch_default_for_uri(appInfo, launchContext, error); +@@ -1945,8 +1945,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_app_info_should_show(int /*long*/ appInfo); +-public static final boolean g_app_info_should_show(int /*long*/ appInfo) { ++public static final native boolean _g_app_info_should_show(long /*int*/ appInfo); ++public static final boolean g_app_info_should_show(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_should_show(appInfo); +@@ -1955,8 +1955,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_app_info_supports_uris(int /*long*/ appInfo); +-public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) { ++public static final native boolean _g_app_info_supports_uris(long /*int*/ appInfo); ++public static final boolean g_app_info_supports_uris(long /*int*/ appInfo) { + lock.lock(); + try { + return _g_app_info_supports_uris(appInfo); +@@ -1965,8 +1965,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_data_input_stream_new(int /*long*/ input_stream); +-public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stream) { ++public static final native long /*int*/ _g_data_input_stream_new(long /*int*/ input_stream); ++public static final long /*int*/ g_data_input_stream_new(long /*int*/ input_stream) { + lock.lock(); + try { + return _g_data_input_stream_new(input_stream); +@@ -1975,8 +1975,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_data_input_stream_read_line(int /*long*/ stream, int[] count, int /*long*/ cancellable, int /*long*/ error); +-public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stream, int[] count, int /*long*/ cancellable, int /*long*/ error) { ++public static final native long /*int*/ _g_data_input_stream_read_line(long /*int*/ stream, int[] count, long /*int*/ cancellable, long /*int*/ error); ++public static final long /*int*/ g_data_input_stream_read_line(long /*int*/ stream, int[] count, long /*int*/ cancellable, long /*int*/ error) { + lock.lock(); + try { + return _g_data_input_stream_read_line(stream, count, cancellable, error); +@@ -1985,8 +1985,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_content_type_equals(int /*long*/ type1, byte[] type2); +-public static final boolean g_content_type_equals(int /*long*/ type1, byte[] type2) { ++public static final native boolean _g_content_type_equals(long /*int*/ type1, byte[] type2); ++public static final boolean g_content_type_equals(long /*int*/ type1, byte[] type2) { + lock.lock(); + try { + return _g_content_type_equals(type1, type2); +@@ -1995,8 +1995,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native boolean _g_content_type_is_a(int /*long*/ type, byte[] supertype); +-public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supertype) { ++public static final native boolean _g_content_type_is_a(long /*int*/ type, byte[] supertype); ++public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supertype) { + lock.lock(); + try { + return _g_content_type_is_a(type, supertype); +@@ -2005,8 +2005,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_content_type_get_mime_type(byte[] mime_type); +-public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type) { ++public static final native long /*int*/ _g_content_type_get_mime_type(byte[] mime_type); ++public static final long /*int*/ g_content_type_get_mime_type(byte[] mime_type) { + lock.lock(); + try { + return _g_content_type_get_mime_type(mime_type); +@@ -2015,8 +2015,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_content_types_get_registered(); +-public static final int /*long*/ g_content_types_get_registered() { ++public static final native long /*int*/ _g_content_types_get_registered(); ++public static final long /*int*/ g_content_types_get_registered() { + lock.lock(); + try { + return _g_content_types_get_registered(); +@@ -2025,8 +2025,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_desktop_app_info_new_from_filename(byte[] fileName); +-public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fileName) { ++public static final native long /*int*/ _g_desktop_app_info_new_from_filename(byte[] fileName); ++public static final long /*int*/ g_desktop_app_info_new_from_filename(byte[] fileName) { + lock.lock(); + try { + return _g_desktop_app_info_new_from_filename(fileName); +@@ -2035,8 +2035,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_info_get_content_type (int /*long*/ info); +-public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info) { ++public static final native long /*int*/ _g_file_info_get_content_type (long /*int*/ info); ++public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info) { + lock.lock(); + try { + return _g_file_info_get_content_type (info); +@@ -2045,8 +2045,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_get_path(int /*long*/ file); +-public static final int /*long*/ g_file_get_path (int /*long*/ file) { ++public static final native long /*int*/ _g_file_get_path(long /*int*/ file); ++public static final long /*int*/ g_file_get_path (long /*int*/ file) { + lock.lock(); + try { + return _g_file_get_path(file); +@@ -2055,8 +2055,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_get_uri(int /*long*/ file); +-public static final int /*long*/ g_file_get_uri (int /*long*/ file) { ++public static final native long /*int*/ _g_file_get_uri(long /*int*/ file); ++public static final long /*int*/ g_file_get_uri (long /*int*/ file) { + lock.lock(); + try { + return _g_file_get_uri(file); +@@ -2065,8 +2065,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _g_file_info_get_modification_time(int /*long*/ info, int /*long*/[] result); +-public static final void g_file_info_get_modification_time(int /*long*/ info, int /*long*/[] result) { ++public static final native void _g_file_info_get_modification_time(long /*int*/ info, long /*int*/[] result); ++public static final void g_file_info_get_modification_time(long /*int*/ info, long /*int*/[] result) { + lock.lock(); + try { + _g_file_info_get_modification_time(info, result); +@@ -2075,8 +2075,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_icon_get_file(int /*long*/ icon); +-public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) { ++public static final native long /*int*/ _g_file_icon_get_file(long /*int*/ icon); ++public static final long /*int*/ g_file_icon_get_file(long /*int*/ icon) { + lock.lock(); + try { + return _g_file_icon_get_file(icon); +@@ -2085,8 +2085,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_new_for_path(byte[] fileName); +-public static final int /*long*/ g_file_new_for_path(byte[] fileName) { ++public static final native long /*int*/ _g_file_new_for_path(byte[] fileName); ++public static final long /*int*/ g_file_new_for_path(byte[] fileName) { + lock.lock(); + try { + return _g_file_new_for_path(fileName); +@@ -2095,8 +2095,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName); +-public static final int /*long*/ g_file_new_for_uri(byte[] fileName) { ++public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName); ++public static final long /*int*/ g_file_new_for_uri(byte[] fileName) { + lock.lock(); + try { + return _g_file_new_for_uri(fileName); +@@ -2105,8 +2105,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_query_info (int /*long*/ file, byte[] attributes, int /*long*/ flags, int /*long*/ cancellable, int /*long*/ error); +-public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] attributes, int /*long*/ flags, int /*long*/ cancellable, int /*long*/ error) { ++public static final native long /*int*/ _g_file_query_info (long /*int*/ file, byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error); ++public static final long /*int*/ g_file_query_info (long /*int*/ file,byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error) { + lock.lock(); + try { + return _g_file_query_info (file, attributes, flags, cancellable, error); +@@ -2116,8 +2116,8 @@ + } + + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_file_read(int /*long*/ file, int /*long*/ cancellable, int /*long*/ error); +-public static final int /*long*/ g_file_read(int /*long*/ file, int /*long*/ cancellable, int /*long*/ error) { ++public static final native long /*int*/ _g_file_read(long /*int*/ file, long /*int*/ cancellable, long /*int*/ error); ++public static final long /*int*/ g_file_read(long /*int*/ file, long /*int*/ cancellable, long /*int*/ error) { + lock.lock(); + try { + return _g_file_read(file, cancellable, error); +@@ -2136,8 +2136,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_icon_to_string(int /*long*/ icon); +-public static final int /*long*/ g_icon_to_string (int /*long*/ icon) { ++public static final native long /*int*/ _g_icon_to_string(long /*int*/ icon); ++public static final long /*int*/ g_icon_to_string (long /*int*/ icon) { + lock.lock(); + try { + return _g_icon_to_string(icon); +@@ -2146,8 +2146,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _g_icon_new_for_string(byte[] str, int /*long*/ error[]); +-public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/ error[]) { ++public static final native long /*int*/ _g_icon_new_for_string(byte[] str, long /*int*/ error[]); ++public static final long /*int*/ g_icon_new_for_string (byte[] str, long /*int*/ error[]) { + lock.lock(); + try { + return _g_icon_new_for_string(str, error); +@@ -2162,8 +2162,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); +@@ -2175,8 +2175,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); +@@ -2189,8 +2189,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); +@@ -2199,8 +2199,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); +@@ -2209,8 +2209,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); +@@ -2219,8 +2219,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); +@@ -2232,8 +2232,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); +@@ -2241,8 +2241,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(); +@@ -2251,8 +2251,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); +@@ -2261,8 +2261,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); +@@ -2271,8 +2271,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); +@@ -2281,8 +2281,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); +@@ -2294,8 +2294,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); +@@ -2304,8 +2304,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); +@@ -2314,7 +2314,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) +@@ -2322,8 +2322,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); +@@ -2336,8 +2336,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); +@@ -2352,8 +2352,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); +@@ -2366,8 +2366,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); +@@ -2376,8 +2376,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); +@@ -2389,8 +2389,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); +@@ -2402,8 +2402,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); +@@ -2412,8 +2412,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); +@@ -2422,8 +2422,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); +@@ -2432,8 +2432,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); +@@ -2444,8 +2444,8 @@ + /** + * @param list cast=(GList *) + */ +-public static final native int /*long*/ _g_list_last(int /*long*/ list); +-public static final int /*long*/ g_list_last(int /*long*/ list) { ++public static final native long /*int*/ _g_list_last(long /*int*/ list); ++public static final long /*int*/ g_list_last(long /*int*/ list) { + lock.lock(); + try { + return _g_list_last(list); +@@ -2454,8 +2454,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); +@@ -2467,8 +2467,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); +@@ -2476,8 +2476,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); +@@ -2489,8 +2489,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); +@@ -2502,8 +2502,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); +@@ -2515,8 +2515,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); +@@ -2528,8 +2528,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); +@@ -2537,8 +2537,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); +@@ -2550,8 +2550,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); +@@ -2560,8 +2560,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); +@@ -2576,8 +2576,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); +@@ -2592,8 +2592,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); +@@ -2607,8 +2607,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); +@@ -2635,8 +2635,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); +@@ -2645,8 +2645,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); +@@ -2659,8 +2659,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); +@@ -2673,8 +2673,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, long[] value, int /*long*/ terminator); +-public static final void g_object_get(int /*long*/ object, byte[] first_property_name, long[] value, int /*long*/ terminator) { ++public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator); ++public static final void g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_get(object, first_property_name, value, terminator); +@@ -2686,8 +2686,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); +@@ -2699,8 +2699,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); +@@ -2712,8 +2712,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); +@@ -2722,8 +2722,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); +@@ -2736,8 +2736,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); +@@ -2750,8 +2750,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, byte[] data, int /*long*/ terminator); +-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, byte[] data, int /*long*/ terminator) { ++public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -2764,8 +2764,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); +@@ -2778,8 +2778,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); +@@ -2792,8 +2792,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); +@@ -2806,8 +2806,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); +@@ -2820,8 +2820,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); +@@ -2830,8 +2830,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); +@@ -2865,8 +2865,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); +@@ -2880,8 +2880,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); +@@ -2896,8 +2896,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); +@@ -2911,8 +2911,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); +@@ -2924,8 +2924,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); +@@ -2937,8 +2937,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); +@@ -2950,8 +2950,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, GdkRectangle data); +-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, GdkRectangle data) { ++public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data); ++public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data) { + lock.lock(); + try { + _g_signal_emit_by_name(instance, detailed_signal, data); +@@ -2963,8 +2963,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); +@@ -2976,8 +2976,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); +@@ -2989,8 +2989,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); +@@ -3005,8 +3005,8 @@ + * @param func cast=(gpointer) + * @param data cast=(gpointer) + */ +-public static final native int _g_signal_handler_find(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_handler_find(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_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data); ++public static final int g_signal_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { + lock.lock(); + try { + return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data); +@@ -3023,8 +3023,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); +@@ -3041,8 +3041,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); +@@ -3059,8 +3059,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); +@@ -3069,8 +3069,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); +@@ -3082,8 +3082,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); +@@ -3092,8 +3092,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); +@@ -3105,8 +3105,8 @@ + * @param list cast=(GSList *) + * @param data cast=(gpointer) + */ +-public static final native int /*long*/ _g_slist_append(int /*long*/ list, int /*long*/ data); +-public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/ data) { ++public static final native long /*int*/ _g_slist_append(long /*int*/ list, long /*int*/ data); ++public static final long /*int*/ g_slist_append(long /*int*/ list, long /*int*/ data) { + lock.lock(); + try { + return _g_slist_append(list, data); +@@ -3115,8 +3115,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); +@@ -3125,8 +3125,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); +@@ -3135,8 +3135,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); +@@ -3145,8 +3145,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); +@@ -3155,8 +3155,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); +@@ -3168,8 +3168,8 @@ + * @method flags=getter + * @param string cast=(GString *) + */ +-public static final native int _GString_len(int /*long*/ string); +-public static final int GString_len(int /*long*/ string) { ++public static final native int _GString_len(long /*int*/ string); ++public static final int GString_len(long /*int*/ string) { + lock.lock(); + try { + return _GString_len(string); +@@ -3181,8 +3181,8 @@ + * @method flags=getter + * @param string cast=(GString *) + */ +-public static final native int /*long*/ _GString_str(int /*long*/ string); +-public static final int /*long*/ GString_str(int /*long*/ string) { ++public static final native long /*int*/ _GString_str(long /*int*/ string); ++public static final long /*int*/ GString_str(long /*int*/ string) { + lock.lock(); + try { + return _GString_str(string); +@@ -3194,8 +3194,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); +@@ -3208,8 +3208,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); +@@ -3218,8 +3218,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); +@@ -3228,8 +3228,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); +@@ -3238,8 +3238,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); +@@ -3248,8 +3248,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); +@@ -3258,8 +3258,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); +@@ -3268,8 +3268,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); +@@ -3281,8 +3281,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); +@@ -3291,8 +3291,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); +@@ -3301,8 +3301,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); +@@ -3314,8 +3314,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); +@@ -3329,8 +3329,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); +@@ -3339,8 +3339,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); +@@ -3364,8 +3364,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); +@@ -3374,8 +3374,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); +@@ -3387,8 +3387,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); +@@ -3397,8 +3397,8 @@ + } + } + /** @param str cast=(const gchar *) */ +-public static final native int /*long*/ _g_utf16_offset_to_pointer(int /*long*/ str, int /*long*/ offset); +-public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int /*long*/ offset) { ++public static final native long /*int*/ _g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset); ++public static final long /*int*/ g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset) { + lock.lock(); + try { + return _g_utf16_offset_to_pointer(str, offset); +@@ -3410,8 +3410,8 @@ + * @param str cast=(const gchar *) + * @param pos cast=(const gchar *) + */ +-public static final native int /*long*/ _g_utf16_pointer_to_offset(int /*long*/ str, int /*long*/ pos); +-public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int /*long*/ pos) { ++public static final native long /*int*/ _g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos); ++public static final long /*int*/ g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos) { + lock.lock(); + try { + return _g_utf16_pointer_to_offset(str, pos); +@@ -3420,8 +3420,8 @@ + } + } + /** @param str cast=(const gchar *) */ +-public static final native int /*long*/ _g_utf16_strlen(int /*long*/ str, int /*long*/ max); +-public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ max) { ++public static final native long /*int*/ _g_utf16_strlen(long /*int*/ str, long /*int*/ max); ++public static final long /*int*/ g_utf16_strlen(long /*int*/ str, long /*int*/ max) { + lock.lock(); + try { + return _g_utf16_strlen(str, max); +@@ -3430,8 +3430,8 @@ + } + } + /** @param str cast=(const gchar *) */ +-public static final native int /*long*/ _g_utf8_offset_to_utf16_offset(int /*long*/ str, int /*long*/ offset); +-public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str, int /*long*/ offset) { ++public static final native long /*int*/ _g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset); ++public static final long /*int*/ g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset) { + lock.lock(); + try { + return _g_utf8_offset_to_utf16_offset(str, offset); +@@ -3440,8 +3440,8 @@ + } + } + /** @param str cast=(const gchar *) */ +-public static final native int /*long*/ _g_utf16_offset_to_utf8_offset(int /*long*/ str, int /*long*/ offset); +-public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str, int /*long*/ offset) { ++public static final native long /*int*/ _g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset); ++public static final long /*int*/ g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset) { + lock.lock(); + try { + return _g_utf16_offset_to_utf8_offset(str, offset); +@@ -3450,8 +3450,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); +@@ -3466,8 +3466,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); +@@ -3482,8 +3482,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); +@@ -3495,28 +3495,28 @@ + * @param value cast=(GValue *) + * @param type cast=(GType) + */ +-public static final native int /*long*/ g_value_init (int /*long*/ value, int /*long*/ type); ++public static final native long /*int*/ g_value_init (long /*int*/ value, long /*int*/ type); + /** @param value cast=(GValue *) */ +-public static final native int g_value_get_int (int /*long*/ value); ++public static final native int g_value_get_int (long /*int*/ value); + /** @param value cast=(GValue *) */ +-public static final native void g_value_set_int (int /*long*/ value, int v); ++public static final native void g_value_set_int (long /*int*/ value, int v); + /** @param value cast=(GValue *) */ +-public static final native double g_value_get_double (int /*long*/ value); ++public static final native double g_value_get_double (long /*int*/ value); + /** @param value cast=(GValue *) */ +-public static final native void g_value_set_double (int /*long*/ value, double v); ++public static final native void g_value_set_double (long /*int*/ value, double v); + /** @param value cast=(GValue *) */ +-public static final native float g_value_get_float (int /*long*/ value); ++public static final native float g_value_get_float (long /*int*/ value); + /** @param value cast=(GValue *) */ +-public static final native void g_value_set_float (int /*long*/ value, float v); ++public static final native void g_value_set_float (long /*int*/ value, float v); + /** @param value cast=(GValue *) */ +-public static final native long g_value_get_int64 (int /*long*/ value); ++public static final native long g_value_get_int64 (long /*int*/ value); + /** @param value cast=(GValue *) */ +-public static final native void g_value_set_int64 (int /*long*/ value, long v); ++public static final native void g_value_set_int64 (long /*int*/ value, long v); + /** @param value cast=(GValue *) */ +-public static final native void g_value_unset (int /*long*/ value); ++public static final native void g_value_unset (long /*int*/ value); + /** @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); +@@ -3525,8 +3525,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); +@@ -3535,8 +3535,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); +@@ -3559,8 +3559,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); +@@ -3569,8 +3569,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); +@@ -3579,8 +3579,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); +@@ -3589,8 +3589,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); +@@ -3602,8 +3602,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); +@@ -3617,8 +3617,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); +@@ -3631,8 +3631,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); +@@ -3640,8 +3640,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(); +@@ -3654,8 +3654,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); +@@ -3664,8 +3664,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); +@@ -3674,8 +3674,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); +@@ -3691,8 +3691,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); +@@ -3701,8 +3701,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); +@@ -3711,8 +3711,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(); +@@ -3721,8 +3721,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); +@@ -3735,8 +3735,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); +@@ -3755,8 +3755,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); +@@ -3775,8 +3775,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); +@@ -3789,8 +3789,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); +@@ -3805,8 +3805,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); +@@ -3823,8 +3823,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); +@@ -3840,8 +3840,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); +@@ -3855,8 +3855,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); +@@ -3879,8 +3879,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); +@@ -3892,8 +3892,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); +@@ -3908,8 +3908,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); +@@ -3926,8 +3926,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); +@@ -3936,8 +3936,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); +@@ -3953,8 +3953,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); +@@ -3967,8 +3967,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); +@@ -3977,8 +3977,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); +@@ -3987,8 +3987,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); +@@ -3997,8 +3997,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); +@@ -4006,8 +4006,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(); +@@ -4020,8 +4020,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); +@@ -4034,8 +4034,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); +@@ -4044,8 +4044,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); +@@ -4057,8 +4057,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); +@@ -4067,8 +4067,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); +@@ -4081,8 +4081,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); +@@ -4090,8 +4090,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); +@@ -4099,8 +4099,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(); +@@ -4109,8 +4109,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); +@@ -4146,8 +4146,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); +@@ -4159,8 +4159,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); +@@ -4169,8 +4169,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); +@@ -4182,8 +4182,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); +@@ -4195,8 +4195,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); +@@ -4209,8 +4209,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); +@@ -4222,8 +4222,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); +@@ -4235,8 +4235,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); +@@ -4250,8 +4250,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); +@@ -4263,8 +4263,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); +@@ -4276,8 +4276,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); +@@ -4289,8 +4289,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); +@@ -4302,8 +4302,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); +@@ -4318,8 +4318,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); +@@ -4331,8 +4331,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); +@@ -4344,8 +4344,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); +@@ -4357,8 +4357,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); +@@ -4367,8 +4367,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); +@@ -4381,8 +4381,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); +@@ -4399,8 +4399,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(); +@@ -4416,8 +4416,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); +@@ -4443,8 +4443,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_pango_attr_embossed_new(boolean embossed); +-public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) { ++public static final native long /*int*/ _gdk_pango_attr_embossed_new(boolean embossed); ++public static final long /*int*/ gdk_pango_attr_embossed_new(boolean embossed) { + lock.lock(); + try { + return _gdk_pango_attr_embossed_new(embossed); +@@ -4452,8 +4452,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(); +@@ -4465,8 +4465,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); +@@ -4475,8 +4475,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); +@@ -4488,8 +4488,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); +@@ -4502,8 +4502,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); +@@ -4512,8 +4512,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); +@@ -4522,8 +4522,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); +@@ -4532,8 +4532,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); +@@ -4542,8 +4542,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); +@@ -4552,8 +4552,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); +@@ -4561,8 +4561,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(); +@@ -4574,8 +4574,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); +@@ -4584,8 +4584,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); +@@ -4599,8 +4599,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); +@@ -4612,8 +4612,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); +@@ -4625,8 +4625,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); +@@ -4640,8 +4640,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); +@@ -4655,8 +4655,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); +@@ -4669,8 +4669,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); +@@ -4688,8 +4688,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); +@@ -4705,8 +4705,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); +@@ -4718,8 +4718,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); +@@ -4733,8 +4733,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); +@@ -4750,8 +4750,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); +@@ -4787,8 +4787,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); +@@ -4797,8 +4797,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); +@@ -4807,8 +4807,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); +@@ -4820,8 +4820,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); +@@ -4834,8 +4834,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); +@@ -4847,8 +4847,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); +@@ -4856,8 +4856,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(); +@@ -4870,8 +4870,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); +@@ -4884,8 +4884,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); +@@ -4897,8 +4897,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); +@@ -4907,8 +4907,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); +@@ -4920,8 +4920,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); +@@ -4933,8 +4933,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); +@@ -4946,8 +4946,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); +@@ -4959,8 +4959,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); +@@ -4978,8 +4978,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(); +@@ -4993,8 +4993,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); +@@ -5007,8 +5007,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); +@@ -5021,8 +5021,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); +@@ -5034,8 +5034,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); +@@ -5047,8 +5047,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); +@@ -5100,8 +5100,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); +@@ -5110,8 +5110,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); +@@ -5124,8 +5124,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); +@@ -5139,13 +5139,13 @@ + /** + * @method flags=dynamic + */ +-public static final native void gdk_threads_set_lock_functions(int /*long*/ enter_fn, int /*long*/ leave_fn); ++public static final native void gdk_threads_set_lock_functions(long /*int*/ enter_fn, long /*int*/ leave_fn); + /** + * @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); +@@ -5163,8 +5163,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(); +@@ -5176,8 +5176,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); +@@ -5189,8 +5189,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); +@@ -5199,8 +5199,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); +@@ -5209,8 +5209,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); +@@ -5219,8 +5219,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); +@@ -5229,8 +5229,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); +@@ -5239,8 +5239,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); +@@ -5249,8 +5249,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); +@@ -5259,8 +5259,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); +@@ -5272,8 +5272,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); +@@ -5287,8 +5287,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); +@@ -5301,8 +5301,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); +@@ -5311,8 +5311,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); +@@ -5326,8 +5326,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); +@@ -5340,8 +5340,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); +@@ -5353,8 +5353,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); +@@ -5363,8 +5363,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); +@@ -5377,8 +5377,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); +@@ -5391,8 +5391,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); +@@ -5401,8 +5401,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); +@@ -5411,8 +5411,8 @@ + } + } + /** @param window cast=(GdkWindow *) */ +-public static final native boolean _gdk_window_is_viewable (int /*long*/ window); +-public static final boolean gdk_window_is_viewable (int /*long*/ window) { ++public static final native boolean _gdk_window_is_viewable (long /*int*/ window); ++public static final boolean gdk_window_is_viewable (long /*int*/ window) { + lock.lock(); + try { + return _gdk_window_is_viewable (window); +@@ -5421,8 +5421,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); +@@ -5431,8 +5431,8 @@ + } + } + /** @param window cast=(GdkWindow *) */ +-public static final native void _gdk_window_move_resize(int /*long*/ window, int x, int y, int width, int height); +-public static final void gdk_window_move_resize(int /*long*/ window, int x, int y, int width, int height) { ++public static final native void _gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height); ++public static final void gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height) { + lock.lock(); + try { + _gdk_window_move_resize(window, x, y, width, height); +@@ -5444,8 +5444,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); +@@ -5454,8 +5454,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); +@@ -5476,8 +5476,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); +@@ -5486,8 +5486,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); +@@ -5496,8 +5496,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); +@@ -5511,8 +5511,8 @@ + * @param sibling cast=(GdkWindow *) + * @param above cast=(gboolean) + */ +-public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above); +-public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) { ++public static final native void _gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above); ++public static final void gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above) { + lock.lock(); + try { + _gdk_window_restack(window, sibling, above); +@@ -5521,8 +5521,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); +@@ -5535,8 +5535,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); +@@ -5549,8 +5549,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); +@@ -5562,8 +5562,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); +@@ -5585,8 +5585,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); +@@ -5595,8 +5595,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); +@@ -5610,8 +5610,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); +@@ -5623,8 +5623,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); +@@ -5637,8 +5637,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); +@@ -5650,8 +5650,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); +@@ -5663,8 +5663,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); +@@ -5676,8 +5676,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); +@@ -5686,8 +5686,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); +@@ -5696,8 +5696,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); +@@ -5706,8 +5706,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); +@@ -5729,8 +5729,8 @@ + * @param accelerator_key cast=(guint *) + * @param accelerator_mods cast=(GdkModifierType *) + */ +-public static final native void _gtk_accelerator_parse(int /*long*/ accelerator, int [] accelerator_key, int [] accelerator_mods); +-public static final void gtk_accelerator_parse(int /*long*/ accelerator, int [] accelerator_key, int [] accelerator_mods) { ++public static final native void _gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods); ++public static final void gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods) { + lock.lock(); + try { + _gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods); +@@ -5738,8 +5738,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(); +@@ -5752,8 +5752,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); +@@ -5765,8 +5765,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); +@@ -5775,8 +5775,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); +@@ -5791,8 +5791,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); +@@ -5804,8 +5804,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); +@@ -5814,8 +5814,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); +@@ -5827,8 +5827,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); +@@ -5841,8 +5841,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); +@@ -5851,8 +5851,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); +@@ -5861,8 +5861,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); +@@ -5871,8 +5871,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); +@@ -5884,8 +5884,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); +@@ -5894,8 +5894,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); +@@ -5904,8 +5904,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); +@@ -5913,8 +5913,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(); +@@ -5926,8 +5926,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); +@@ -5936,8 +5936,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(); +@@ -5951,8 +5951,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); +@@ -5965,8 +5965,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); +@@ -5979,8 +5979,8 @@ + * @param calendar cast=(GtkCalendar *) + * @param day cast=(guint) + */ +-public static final native void _gtk_calendar_mark_day(int /*long*/ calendar, int day); +-public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) { ++public static final native void _gtk_calendar_mark_day(long /*int*/ calendar, int day); ++public static final void gtk_calendar_mark_day(long /*int*/ calendar, int day) { + lock.lock(); + try { + _gtk_calendar_mark_day(calendar, day); +@@ -5993,8 +5993,8 @@ + * @param calendar cast=(GtkCalendar *) + * @param day cast=(guint) + */ +-public static final native void _gtk_calendar_clear_marks(int /*long*/ calendar); +-public static final void gtk_calendar_clear_marks(int /*long*/ calendar) { ++public static final native void _gtk_calendar_clear_marks(long /*int*/ calendar); ++public static final void gtk_calendar_clear_marks(long /*int*/ calendar) { + lock.lock(); + try { + _gtk_calendar_clear_marks(calendar); +@@ -6007,8 +6007,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); +@@ -6021,8 +6021,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); +@@ -6037,8 +6037,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); +@@ -6047,8 +6047,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); +@@ -6057,8 +6057,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); +@@ -6067,8 +6067,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); +@@ -6085,8 +6085,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); +@@ -6094,8 +6094,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(); +@@ -6103,8 +6103,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(); +@@ -6112,8 +6112,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(); +@@ -6121,8 +6121,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(); +@@ -6131,8 +6131,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); +@@ -6141,8 +6141,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); +@@ -6154,8 +6154,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); +@@ -6163,8 +6163,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); +@@ -6173,8 +6173,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); +@@ -6183,8 +6183,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); +@@ -6200,8 +6200,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); +@@ -6217,8 +6217,8 @@ + * @param clear_func cast=(GtkClipboardClearFunc) + * @param user_data cast=(GObject *) + */ +-public static final native boolean _gtk_clipboard_set_with_owner(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_owner(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_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data); ++public static final boolean gtk_clipboard_set_with_owner(long /*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_owner(clipboard, target, n_targets, get_func, clear_func, user_data); +@@ -6232,8 +6232,8 @@ + * @param targets cast=(const GtkTargetEntry *) + * @param n_targets cast=(gint) + */ +-public static final native void _gtk_clipboard_set_can_store(int /*long*/ clipboard, int /*long*/ targets, int n_targets); +-public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int /*long*/ targets, int n_targets) { ++public static final native void _gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets); ++public static final void gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets) { + lock.lock(); + try { + _gtk_clipboard_set_can_store(clipboard, targets, n_targets); +@@ -6245,8 +6245,8 @@ + * @method flags=dynamic + * @param clipboard cast=(GtkClipboard *) + */ +-public static final native void _gtk_clipboard_store(int /*long*/ clipboard); +-public static final void gtk_clipboard_store(int /*long*/ clipboard) { ++public static final native void _gtk_clipboard_store(long /*int*/ clipboard); ++public static final void gtk_clipboard_store(long /*int*/ clipboard) { + lock.lock(); + try { + _gtk_clipboard_store(clipboard); +@@ -6258,8 +6258,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); +@@ -6268,8 +6268,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); +@@ -6281,8 +6281,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); +@@ -6294,8 +6294,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); +@@ -6304,8 +6304,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); +@@ -6314,8 +6314,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); +@@ -6323,8 +6323,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(); +@@ -6336,8 +6336,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); +@@ -6346,8 +6346,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); +@@ -6359,8 +6359,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); +@@ -6369,8 +6369,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(); +@@ -6379,8 +6379,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(); +@@ -6389,8 +6389,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); +@@ -6399,8 +6399,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); +@@ -6409,8 +6409,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); +@@ -6419,8 +6419,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); +@@ -6429,8 +6429,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); +@@ -6439,8 +6439,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); +@@ -6449,8 +6449,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); +@@ -6462,8 +6462,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); +@@ -6476,8 +6476,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); +@@ -6486,8 +6486,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); +@@ -6496,8 +6496,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); +@@ -6509,8 +6509,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); +@@ -6519,8 +6519,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); +@@ -6532,8 +6532,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); +@@ -6546,8 +6546,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); +@@ -6556,8 +6556,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); +@@ -6572,8 +6572,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); +@@ -6588,8 +6588,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); +@@ -6602,8 +6602,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); +@@ -6618,8 +6618,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); +@@ -6628,8 +6628,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); +@@ -6643,8 +6643,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); +@@ -6658,8 +6658,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); +@@ -6671,8 +6671,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); +@@ -6680,8 +6680,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(); +@@ -6690,8 +6690,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); +@@ -6700,8 +6700,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); +@@ -6710,8 +6710,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); +@@ -6724,8 +6724,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); +@@ -6738,8 +6738,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); +@@ -6748,8 +6748,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); +@@ -6758,8 +6758,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); +@@ -6772,8 +6772,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); +@@ -6787,8 +6787,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); +@@ -6797,8 +6797,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); +@@ -6811,8 +6811,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); +@@ -6824,8 +6824,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); +@@ -6837,8 +6837,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); +@@ -6847,8 +6847,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); +@@ -6857,8 +6857,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); +@@ -6867,8 +6867,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); +@@ -6877,8 +6877,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); +@@ -6887,8 +6887,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); +@@ -6897,8 +6897,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); +@@ -6907,8 +6907,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); +@@ -6917,8 +6917,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); +@@ -6927,8 +6927,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); +@@ -6936,8 +6936,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(); +@@ -6949,8 +6949,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); +@@ -6963,8 +6963,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); +@@ -6976,8 +6976,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); +@@ -6986,8 +6986,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _gtk_entry_set_icon_from_stock(int /*long*/ entry, int icon, byte[] stock); +-public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int icon, byte[] stock) { ++public static final native void _gtk_entry_set_icon_from_stock(long /*int*/ entry, int icon, byte[] stock); ++public static final void gtk_entry_set_icon_from_stock(long /*int*/ entry, int icon, byte[] stock) { + lock.lock(); + try { + _gtk_entry_set_icon_from_stock(entry, icon, stock); +@@ -6996,8 +6996,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _gtk_entry_set_icon_sensitive(int /*long*/ entry, int icon_pos, boolean sensitive); +-public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int icon_pos, boolean sensitive) { ++public static final native void _gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive); ++public static final void gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive) { + lock.lock(); + try { + _gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive); +@@ -7009,8 +7009,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); +@@ -7022,8 +7022,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); +@@ -7035,8 +7035,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); +@@ -7048,8 +7048,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); +@@ -7067,8 +7067,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); +@@ -7077,8 +7077,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); +@@ -7090,8 +7090,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); +@@ -7100,8 +7100,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); +@@ -7113,8 +7113,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); +@@ -7123,8 +7123,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); +@@ -7133,8 +7133,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); +@@ -7143,8 +7143,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); +@@ -7153,8 +7153,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); +@@ -7163,8 +7163,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); +@@ -7173,8 +7173,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); +@@ -7183,8 +7183,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); +@@ -7193,8 +7193,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); +@@ -7203,8 +7203,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); +@@ -7213,8 +7213,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); +@@ -7223,8 +7223,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); +@@ -7233,8 +7233,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); +@@ -7243,8 +7243,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); +@@ -7253,8 +7253,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); +@@ -7263,8 +7263,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); +@@ -7273,8 +7273,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); +@@ -7283,8 +7283,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); +@@ -7293,8 +7293,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); +@@ -7303,8 +7303,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); +@@ -7313,8 +7313,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); +@@ -7323,8 +7323,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(); +@@ -7333,8 +7333,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); +@@ -7343,8 +7343,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); +@@ -7353,8 +7353,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); +@@ -7363,8 +7363,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); +@@ -7373,8 +7373,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); +@@ -7383,8 +7383,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); +@@ -7396,8 +7396,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); +@@ -7409,8 +7409,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); +@@ -7424,8 +7424,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); +@@ -7433,8 +7433,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(); +@@ -7446,8 +7446,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); +@@ -7456,8 +7456,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); +@@ -7466,8 +7466,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); +@@ -7479,8 +7479,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); +@@ -7489,8 +7489,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); +@@ -7499,8 +7499,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); +@@ -7512,8 +7512,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); +@@ -7525,8 +7525,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); +@@ -7538,8 +7538,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); +@@ -7547,8 +7547,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(); +@@ -7575,8 +7575,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(); +@@ -7585,8 +7585,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); +@@ -7595,8 +7595,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); +@@ -7604,8 +7604,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(); +@@ -7614,8 +7614,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); +@@ -7627,8 +7627,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); +@@ -7637,8 +7637,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); +@@ -7647,8 +7647,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); +@@ -7656,8 +7656,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(); +@@ -7665,8 +7665,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_status_icon_position_menu_func(); +-public static final int /*long*/ gtk_status_icon_position_menu_func() { ++public static final native long /*int*/ _gtk_status_icon_position_menu_func(); ++public static final long /*int*/ gtk_status_icon_position_menu_func() { + lock.lock(); + try { + return _gtk_status_icon_position_menu_func(); +@@ -7677,8 +7677,8 @@ + /** + * @method flags=dynamic + */ +-public static final native void _gtk_icon_info_free(int /*long*/ icon_info); +-public static final void gtk_icon_info_free(int /*long*/ icon_info) { ++public static final native void _gtk_icon_info_free(long /*int*/ icon_info); ++public static final void gtk_icon_info_free(long /*int*/ icon_info) { + lock.lock(); + try { + _gtk_icon_info_free(icon_info); +@@ -7687,8 +7687,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); +@@ -7697,8 +7697,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); +@@ -7706,8 +7706,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(); +@@ -7719,8 +7719,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); +@@ -7737,8 +7737,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); +@@ -7749,8 +7749,8 @@ + /** + * @method flags=dynamic + */ +-public static final native int /*long*/ _gtk_icon_theme_get_default(); +-public static final int /*long*/ gtk_icon_theme_get_default() { ++public static final native long /*int*/ _gtk_icon_theme_get_default(); ++public static final long /*int*/ gtk_icon_theme_get_default() { + lock.lock(); + try { + return _gtk_icon_theme_get_default (); +@@ -7761,8 +7761,8 @@ + /** + * @method flags=dynamic + */ +-public static final native int /*long*/ _gtk_icon_theme_lookup_by_gicon(int /*long*/ icon_theme, int /*long*/ icon, int size, int flags); +-public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ icon_theme, int /*long*/ icon, int size, int flags) { ++public static final native long /*int*/ _gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags); ++public static final long /*int*/ gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags) { + lock.lock(); + try { + return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags); +@@ -7773,8 +7773,8 @@ + /** + * @method flags=dynamic + */ +-public static final native int /*long*/ _gtk_icon_info_load_icon(int /*long*/ icon_info, int /*long*/ error[]); +-public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info, int /*long*/ error[]) { ++public static final native long /*int*/ _gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]); ++public static final long /*int*/ gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]) { + lock.lock(); + try { + return _gtk_icon_info_load_icon(icon_info, error); +@@ -7786,8 +7786,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); +@@ -7796,8 +7796,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); +@@ -7806,8 +7806,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); +@@ -7821,8 +7821,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); +@@ -7830,8 +7830,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(); +@@ -7840,8 +7840,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); +@@ -7853,8 +7853,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); +@@ -7866,8 +7866,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); +@@ -7879,8 +7879,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); +@@ -7888,8 +7888,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(); +@@ -7898,8 +7898,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); +@@ -7911,8 +7911,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); +@@ -7920,8 +7920,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(); +@@ -7930,8 +7930,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); +@@ -7943,8 +7943,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); +@@ -7956,8 +7956,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); +@@ -7970,8 +7970,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); +@@ -7983,8 +7983,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); +@@ -7993,8 +7993,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); +@@ -8003,8 +8003,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); +@@ -8013,8 +8013,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); +@@ -8023,8 +8023,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); +@@ -8036,8 +8036,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); +@@ -8049,8 +8049,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); +@@ -8062,8 +8062,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); +@@ -8072,8 +8072,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); +@@ -8085,8 +8085,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); +@@ -8098,8 +8098,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); +@@ -8111,8 +8111,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); +@@ -8124,8 +8124,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); +@@ -8134,8 +8134,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); +@@ -8147,8 +8147,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); +@@ -8157,8 +8157,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); +@@ -8170,8 +8170,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); +@@ -8180,8 +8180,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); +@@ -8190,8 +8190,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); +@@ -8200,8 +8200,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); +@@ -8213,8 +8213,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); +@@ -8223,8 +8223,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); +@@ -8237,8 +8237,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); +@@ -8250,8 +8250,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); +@@ -8263,8 +8263,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); +@@ -8276,8 +8276,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); +@@ -8289,8 +8289,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); +@@ -8302,8 +8302,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); +@@ -8316,8 +8316,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); +@@ -8329,8 +8329,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); +@@ -8387,8 +8387,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); +@@ -8396,8 +8396,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(); +@@ -8406,8 +8406,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); +@@ -8416,8 +8416,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); +@@ -8426,8 +8426,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); +@@ -8439,8 +8439,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); +@@ -8448,8 +8448,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(); +@@ -8458,8 +8458,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); +@@ -8476,8 +8476,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); +@@ -8486,8 +8486,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); +@@ -8500,8 +8500,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); +@@ -8513,8 +8513,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); +@@ -8527,8 +8527,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); +@@ -8543,8 +8543,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); +@@ -8557,8 +8557,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); +@@ -8567,8 +8567,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); +@@ -8577,8 +8577,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); +@@ -8592,8 +8592,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); +@@ -8601,8 +8601,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(); +@@ -8611,8 +8611,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); +@@ -8621,8 +8621,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); +@@ -8634,8 +8634,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); +@@ -8647,8 +8647,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); +@@ -8660,8 +8660,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); +@@ -8673,8 +8673,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); +@@ -8686,8 +8686,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); +@@ -8696,8 +8696,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); +@@ -8706,8 +8706,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 (); +@@ -8716,8 +8716,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); +@@ -8726,8 +8726,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); +@@ -8736,8 +8736,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); +@@ -8746,8 +8746,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); +@@ -8756,8 +8756,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); +@@ -8766,8 +8766,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); +@@ -8776,8 +8776,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); +@@ -8786,8 +8786,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); +@@ -8796,8 +8796,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); +@@ -8806,8 +8806,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); +@@ -8816,8 +8816,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); +@@ -8826,8 +8826,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); +@@ -8836,8 +8836,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); +@@ -8846,8 +8846,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); +@@ -8856,8 +8856,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); +@@ -8866,8 +8866,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); +@@ -8882,8 +8882,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); +@@ -8897,8 +8897,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); +@@ -8913,8 +8913,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); +@@ -8928,8 +8928,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); +@@ -8943,8 +8943,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); +@@ -8958,8 +8958,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); +@@ -8973,8 +8973,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); +@@ -8989,8 +8989,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); +@@ -9004,8 +9004,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); +@@ -9019,8 +9019,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); +@@ -9034,8 +9034,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); +@@ -9049,8 +9049,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); +@@ -9064,8 +9064,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); +@@ -9080,8 +9080,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); +@@ -9095,8 +9095,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); +@@ -9110,8 +9110,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); +@@ -9125,8 +9125,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); +@@ -9135,8 +9135,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); +@@ -9145,8 +9145,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); +@@ -9155,8 +9155,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); +@@ -9165,8 +9165,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); +@@ -9175,8 +9175,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); +@@ -9185,8 +9185,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); +@@ -9195,8 +9195,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); +@@ -9205,8 +9205,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); +@@ -9215,8 +9215,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); +@@ -9225,8 +9225,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); +@@ -9235,8 +9235,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); +@@ -9244,8 +9244,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); +@@ -9254,8 +9254,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); +@@ -9264,8 +9264,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); +@@ -9274,8 +9274,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); +@@ -9289,8 +9289,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); +@@ -9302,8 +9302,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); +@@ -9312,8 +9312,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); +@@ -9322,8 +9322,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); +@@ -9332,8 +9332,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); +@@ -9342,8 +9342,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); +@@ -9356,8 +9356,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); +@@ -9369,8 +9369,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); +@@ -9383,8 +9383,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); +@@ -9393,8 +9393,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(); +@@ -9406,8 +9406,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); +@@ -9419,8 +9419,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); +@@ -9433,8 +9433,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); +@@ -9443,8 +9443,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); +@@ -9453,8 +9453,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); +@@ -9463,8 +9463,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); +@@ -9473,8 +9473,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); +@@ -9483,8 +9483,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); +@@ -9496,8 +9496,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); +@@ -9506,8 +9506,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int _gtk_print_settings_get_duplex(int /*long*/ settings); +-public static final int gtk_print_settings_get_duplex(int /*long*/ settings) { ++public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings); ++public static final int gtk_print_settings_get_duplex(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_duplex(settings); +@@ -9516,8 +9516,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _gtk_print_settings_set_duplex(int /*long*/ settings, int duplex); +-public static final void gtk_print_settings_set_duplex(int /*long*/ settings, int duplex) { ++public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex); ++public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) { + lock.lock(); + try { + _gtk_print_settings_set_duplex(settings, duplex); +@@ -9526,8 +9526,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); +@@ -9539,8 +9539,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); +@@ -9549,8 +9549,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); +@@ -9559,8 +9559,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); +@@ -9572,8 +9572,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); +@@ -9585,8 +9585,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); +@@ -9595,8 +9595,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); +@@ -9605,8 +9605,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); +@@ -9615,8 +9615,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); +@@ -9629,8 +9629,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); +@@ -9639,8 +9639,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _gtk_print_unix_dialog_set_embed_page_setup(int /*long*/ dialog, boolean embed); +-public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/ dialog, boolean embed) { ++public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed); ++public static final void gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed) { + lock.lock(); + try { + _gtk_print_unix_dialog_set_embed_page_setup(dialog, embed); +@@ -9649,8 +9649,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); +@@ -9659,8 +9659,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); +@@ -9672,8 +9672,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); +@@ -9682,8 +9682,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); +@@ -9692,8 +9692,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); +@@ -9702,8 +9702,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); +@@ -9712,8 +9712,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); +@@ -9722,8 +9722,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); +@@ -9731,8 +9731,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(); +@@ -9741,8 +9741,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); +@@ -9754,8 +9754,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); +@@ -9767,8 +9767,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); +@@ -9777,8 +9777,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); +@@ -9787,8 +9787,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); +@@ -9797,8 +9797,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); +@@ -9807,8 +9807,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); +@@ -9820,8 +9820,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); +@@ -9830,8 +9830,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); +@@ -9840,8 +9840,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); +@@ -9850,8 +9850,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); +@@ -9860,8 +9860,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); +@@ -9870,8 +9870,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); +@@ -9890,8 +9890,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); +@@ -9900,8 +9900,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); +@@ -9913,8 +9913,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); +@@ -9926,8 +9926,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); +@@ -9936,8 +9936,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); +@@ -9949,8 +9949,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); +@@ -9962,8 +9962,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); +@@ -9975,8 +9975,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); +@@ -9988,8 +9988,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); +@@ -10001,8 +10001,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); +@@ -10011,8 +10011,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); +@@ -10025,8 +10025,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); +@@ -10035,8 +10035,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); +@@ -10045,8 +10045,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); +@@ -10058,8 +10058,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); +@@ -10071,8 +10071,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); +@@ -10085,8 +10085,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); +@@ -10098,8 +10098,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); +@@ -10107,8 +10107,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(); +@@ -10117,8 +10117,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); +@@ -10133,8 +10133,8 @@ + * @param data cast=(const guchar *) + * @param length cast=(gint) + */ +-public static final native void _gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length); +-public static final void gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length) { ++public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length); ++public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) { + lock.lock(); + try { + _gtk_selection_data_set(selection_data, type, format, data, length); +@@ -10142,8 +10142,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_separator_menu_item_new(); +-public static final int /*long*/ gtk_separator_menu_item_new() { ++public static final native long /*int*/ _gtk_separator_menu_item_new(); ++public static final long /*int*/ gtk_separator_menu_item_new() { + lock.lock(); + try { + return _gtk_separator_menu_item_new(); +@@ -10151,8 +10151,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_set_locale(); +-public static final int /*long*/ gtk_set_locale() { ++public static final native long /*int*/ _gtk_set_locale(); ++public static final long /*int*/ gtk_set_locale() { + lock.lock(); + try { + return _gtk_set_locale(); +@@ -10161,8 +10161,8 @@ + } + } + /** @param socket cast=(GtkSocket *) */ +-public static final native int /*long*/ _gtk_socket_get_id(int /*long*/ socket); +-public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) { ++public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket); ++public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) { + lock.lock(); + try { + return _gtk_socket_get_id(socket); +@@ -10170,8 +10170,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_socket_new(); +-public static final int /*long*/ gtk_socket_new() { ++public static final native long /*int*/ _gtk_socket_new(); ++public static final long /*int*/ gtk_socket_new() { + lock.lock(); + try { + return _gtk_socket_new(); +@@ -10180,8 +10180,8 @@ + } + } + /** @param adjustment cast=(GtkAdjustment *) */ +-public static final native int /*long*/ _gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits); +-public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits) { ++public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits); ++public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) { + lock.lock(); + try { + return _gtk_spin_button_new(adjustment, climb_rate, digits); +@@ -10193,8 +10193,8 @@ + * @param spin_button cast=(GtkSpinButton*) + * @param adjustment cast=(GtkAdjustment *) + **/ +-public static final native void _gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits); +-public static final void gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits) { ++public static final native void _gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits); ++public static final void gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits) { + lock.lock(); + try { + _gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits); +@@ -10203,8 +10203,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native int /*long*/ _gtk_spin_button_get_adjustment(int /*long*/ spin_button); +-public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spin_button) { ++public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button); ++public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) { + lock.lock(); + try { + return _gtk_spin_button_get_adjustment(spin_button); +@@ -10214,8 +10214,8 @@ + } + + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native int _gtk_spin_button_get_digits(int /*long*/ spin_button); +-public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) { ++public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button); ++public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) { + lock.lock(); + try { + return _gtk_spin_button_get_digits(spin_button); +@@ -10224,8 +10224,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_set_digits(int /*long*/ spin_button, int digits); +-public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, int digits) { ++public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits); ++public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) { + lock.lock(); + try { + _gtk_spin_button_set_digits(spin_button, digits); +@@ -10234,8 +10234,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page); +-public static final void gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page) { ++public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page); ++public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) { + lock.lock(); + try { + _gtk_spin_button_set_increments(spin_button, step, page); +@@ -10244,8 +10244,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min); +-public static final void gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min) { ++public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min); ++public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) { + lock.lock(); + try { + _gtk_spin_button_set_range(spin_button, max, min); +@@ -10254,8 +10254,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_set_value(int /*long*/ spin_button, double value); +-public static final void gtk_spin_button_set_value(int /*long*/ spin_button, double value) { ++public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value); ++public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) { + lock.lock(); + try { + _gtk_spin_button_set_value(spin_button, value); +@@ -10264,8 +10264,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap); +-public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap) { ++public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap); ++public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) { + lock.lock(); + try { + _gtk_spin_button_set_wrap(spin_button, wrap); +@@ -10274,8 +10274,8 @@ + } + } + /** @param spin_button cast=(GtkSpinButton*) */ +-public static final native void _gtk_spin_button_update(int /*long*/ spin_button); +-public static final void gtk_spin_button_update(int /*long*/ spin_button) { ++public static final native void _gtk_spin_button_update(long /*int*/ spin_button); ++public static final void gtk_spin_button_update(long /*int*/ spin_button) { + lock.lock(); + try { + _gtk_spin_button_update(spin_button); +@@ -10286,8 +10286,8 @@ + /** + * @method flags=dynamic + */ +-public static final native boolean _gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation); +-public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation) { ++public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation); ++public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) { + lock.lock(); + try { + return _gtk_status_icon_get_geometry(handle, screen, area, orientation); +@@ -10298,8 +10298,8 @@ + /** + * @method flags=dynamic + */ +-public static final native boolean _gtk_status_icon_get_visible(int /*long*/ handle); +-public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) { ++public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle); ++public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) { + lock.lock(); + try { + return _gtk_status_icon_get_visible(handle); +@@ -10308,8 +10308,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _gtk_status_icon_new(); +-public static final int /*long*/ gtk_status_icon_new() { ++public static final native long /*int*/ _gtk_status_icon_new(); ++public static final long /*int*/ gtk_status_icon_new() { + lock.lock(); + try { + return _gtk_status_icon_new(); +@@ -10320,8 +10320,8 @@ + /** + * @method flags=dynamic + */ +-public static final native void _gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf); +-public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf) { ++public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf); ++public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) { + lock.lock(); + try { + _gtk_status_icon_set_from_pixbuf(handle, pixbuf); +@@ -10332,8 +10332,8 @@ + /** + * @method flags=dynamic + */ +-public static final native void _gtk_status_icon_set_visible(int /*long*/ handle, boolean visible); +-public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolean visible) { ++public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible); ++public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) { + lock.lock(); + try { + _gtk_status_icon_set_visible(handle, visible); +@@ -10344,8 +10344,8 @@ + /** + * @method flags=dynamic + */ +-public static final native void _gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text); +-public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text) { ++public static final native void _gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text); ++public static final void gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text) { + lock.lock(); + try { + _gtk_status_icon_set_tooltip(handle, tip_text); +@@ -10357,8 +10357,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_base(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_base(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_base(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_base(style, index, color); +@@ -10370,8 +10370,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_black(int /*long*/ style, GdkColor color); +-public static final void gtk_style_get_black(int /*long*/ style, GdkColor color) { ++public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color); ++public static final void gtk_style_get_black(long /*int*/ style, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_black(style, color); +@@ -10383,8 +10383,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_bg(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_bg(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_bg(style, index, color); +@@ -10396,8 +10396,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_dark(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_dark(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_dark(style, index, color); +@@ -10409,8 +10409,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_fg(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_fg(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_fg(style, index, color); +@@ -10422,8 +10422,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **),flags=no_in + */ +-public static final native void _gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_fg_gc(style, index, gc); +@@ -10435,8 +10435,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **),flags=no_in + */ +-public static final native void _gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_bg_gc(style, index, gc); +@@ -10448,8 +10448,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **) + */ +-public static final native void _gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_light_gc(style, index, gc); +@@ -10461,8 +10461,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **),flags=no_in + */ +-public static final native void _gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_dark_gc(style, index, gc); +@@ -10474,8 +10474,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **) + */ +-public static final native void _gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_mid_gc(style, index, gc); +@@ -10487,8 +10487,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **) + */ +-public static final native void _gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_text_gc(style, index, gc); +@@ -10500,8 +10500,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **) + */ +-public static final native void _gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc); +-public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc) { ++public static final native void _gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc); ++public static final void gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_text_aa_gc(style, index, gc); +@@ -10513,8 +10513,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **),flags=no_in + */ +-public static final native void _gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc); +-public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc) { ++public static final native void _gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc); ++public static final void gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_black_gc(style, gc); +@@ -10526,8 +10526,8 @@ + * @param style cast=(GtkStyle *) + * @param gc cast=(GdkGC **) + */ +-public static final native void _gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc); +-public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc) { ++public static final native void _gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc); ++public static final void gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc) { + lock.lock(); + try { + _gtk_style_get_white_gc(style, gc); +@@ -10536,8 +10536,8 @@ + } + } + /** @param style cast=(GtkStyle *) */ +-public static final native int /*long*/ _gtk_style_get_font_desc(int /*long*/ style); +-public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) { ++public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style); ++public static final long /*int*/ gtk_style_get_font_desc(long /*int*/ style) { + lock.lock(); + try { + return _gtk_style_get_font_desc(style); +@@ -10549,8 +10549,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_light(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_light(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_light(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_light(style, index, color); +@@ -10562,8 +10562,8 @@ + * @param style cast=(GtkStyle *) + * @param color flags=no_in + */ +-public static final native void _gtk_style_get_text(int /*long*/ style, int index, GdkColor color); +-public static final void gtk_style_get_text(int /*long*/ style, int index, GdkColor color) { ++public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color); ++public static final void gtk_style_get_text(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_style_get_text(style, index, color); +@@ -10572,8 +10572,8 @@ + } + } + /** @param style cast=(GtkStyle *) */ +-public static final native int _gtk_style_get_xthickness(int /*long*/ style); +-public static final int gtk_style_get_xthickness(int /*long*/ style) { ++public static final native int _gtk_style_get_xthickness(long /*int*/ style); ++public static final int gtk_style_get_xthickness(long /*int*/ style) { + lock.lock(); + try { + return _gtk_style_get_xthickness(style); +@@ -10582,8 +10582,8 @@ + } + } + /** @param style cast=(GtkStyle *) */ +-public static final native int _gtk_style_get_ythickness(int /*long*/ style); +-public static final int gtk_style_get_ythickness(int /*long*/ style) { ++public static final native int _gtk_style_get_ythickness(long /*int*/ style); ++public static final int gtk_style_get_ythickness(long /*int*/ style) { + lock.lock(); + try { + return _gtk_style_get_ythickness(style); +@@ -10597,8 +10597,8 @@ + * @param widget cast=(GtkWidget *) + * @param detail cast=(const gchar *) + */ +-public static final native int /*long*/ _gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail); +-public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail) { ++public static final native long /*int*/ _gtk_style_render_icon(long /*int*/ style, long /*int*/ source, int direction, int state, int size, long /*int*/ widget, byte[] detail); ++public static final long /*int*/ gtk_style_render_icon(long /*int*/ style, long /*int*/ source, int direction, int state, int size, long /*int*/ widget, byte[] detail) { + lock.lock(); + try { + return _gtk_style_render_icon(style, source, direction, state, size, widget, detail); +@@ -10610,8 +10610,8 @@ + * @param targets cast=(const GtkTargetEntry *) + * @param ntargets cast=(guint) + */ +-public static final native int /*long*/ _gtk_target_list_new(int /*long*/ targets, int ntargets); +-public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int ntargets) { ++public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets); ++public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) { + lock.lock(); + try { + return _gtk_target_list_new(targets, ntargets); +@@ -10620,8 +10620,8 @@ + } + } + /** @param list cast=(GtkTargetList *) */ +-public static final native void _gtk_target_list_unref(int /*long*/ list); +-public static final void gtk_target_list_unref(int /*long*/ list) { ++public static final native void _gtk_target_list_unref(long /*int*/ list); ++public static final void gtk_target_list_unref(long /*int*/ list) { + lock.lock(); + try { + _gtk_target_list_unref(list); +@@ -10633,8 +10633,8 @@ + * @param buffer cast=(GtkTextBuffer *) + * @param clipboard cast=(GtkClipboard *) + */ +-public static final native void _gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard); +-public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard) { ++public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard); ++public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) { + lock.lock(); + try { + _gtk_text_buffer_copy_clipboard(buffer, clipboard); +@@ -10647,8 +10647,8 @@ + * @param clipboard cast=(GtkClipboard *) + * @param default_editable cast=(gboolean) + */ +-public static final native void _gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable); +-public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable) { ++public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable); ++public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) { + lock.lock(); + try { + _gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable); +@@ -10661,8 +10661,8 @@ + * @param start cast=(GtkTextIter *) + * @param end cast=(GtkTextIter *) + */ +-public static final native void _gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end); +-public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end) { ++public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end); ++public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) { + lock.lock(); + try { + _gtk_text_buffer_delete(buffer, start, end); +@@ -10675,8 +10675,8 @@ + * @param start cast=(GtkTextIter *) + * @param end cast=(GtkTextIter *) + */ +-public static final native void _gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end); +-public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end) { ++public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end); ++public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) { + lock.lock(); + try { + _gtk_text_buffer_get_bounds(buffer, start, end); +@@ -10685,8 +10685,8 @@ + } + } + /** @param buffer cast=(GtkTextBuffer *) */ +-public static final native int _gtk_text_buffer_get_char_count(int /*long*/ buffer); +-public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) { ++public static final native int _gtk_text_buffer_get_char_count(long /*int*/ buffer); ++public static final int gtk_text_buffer_get_char_count(long /*int*/ buffer) { + lock.lock(); + try { + return _gtk_text_buffer_get_char_count(buffer); +@@ -10698,8 +10698,8 @@ + * @param buffer cast=(GtkTextBuffer *) + * @param iter cast=(GtkTextIter *) + */ +-public static final native void _gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter); +-public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter) { ++public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter); ++public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) { + lock.lock(); + try { + _gtk_text_buffer_get_end_iter(buffer, iter); +@@ -10708,8 +10708,8 @@ + } + } + /** @param buffer cast=(GtkTextBuffer *) */ +-public static final native int /*long*/ _gtk_text_buffer_get_insert(int /*long*/ buffer); +-public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer) { ++public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer); ++public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) { + lock.lock(); + try { + return _gtk_text_buffer_get_insert(buffer); +@@ -10722,8 +10722,8 @@ + * @param iter cast=(GtkTextIter *) + * @param line_number cast=(gint) + */ +-public static final native void _gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number); +-public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number) { ++public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number); ++public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) { + lock.lock(); + try { + _gtk_text_buffer_get_iter_at_line(buffer, iter, line_number); +@@ -10736,8 +10736,8 @@ + * @param iter cast=(GtkTextIter *) + * @param mark cast=(GtkTextMark *) + */ +-public static final native void _gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark); +-public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark) { ++public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark); ++public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) { + lock.lock(); + try { + _gtk_text_buffer_get_iter_at_mark(buffer, iter, mark); +@@ -10750,8 +10750,8 @@ + * @param iter cast=(GtkTextIter *) + * @param char_offset cast=(gint) + */ +-public static final native void _gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset); +-public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset) { ++public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset); ++public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) { + lock.lock(); + try { + _gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset); +@@ -10760,8 +10760,8 @@ + } + } + /** @param buffer cast=(GtkTextBuffer *) */ +-public static final native int _gtk_text_buffer_get_line_count(int /*long*/ buffer); +-public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) { ++public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer); ++public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) { + lock.lock(); + try { + return _gtk_text_buffer_get_line_count(buffer); +@@ -10770,8 +10770,8 @@ + } + } + /** @param buffer cast=(GtkTextBuffer *) */ +-public static final native int /*long*/ _gtk_text_buffer_get_selection_bound(int /*long*/ buffer); +-public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*/ buffer) { ++public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer); ++public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) { + lock.lock(); + try { + return _gtk_text_buffer_get_selection_bound(buffer); +@@ -10784,8 +10784,8 @@ + * @param start cast=(GtkTextIter *) + * @param end cast=(GtkTextIter *) + */ +-public static final native boolean _gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end); +-public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end) { ++public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end); ++public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) { + lock.lock(); + try { + return _gtk_text_buffer_get_selection_bounds(buffer, start, end); +@@ -10799,8 +10799,8 @@ + * @param end cast=(GtkTextIter *) + * @param include_hidden_chars cast=(gboolean) + */ +-public static final native int /*long*/ _gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars); +-public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) { ++public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars); ++public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) { + lock.lock(); + try { + return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars); +@@ -10814,8 +10814,8 @@ + * @param text cast=(const gchar *) + * @param len cast=(gint) + */ +-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len); +-public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len) { ++public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len); ++public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) { + lock.lock(); + try { + _gtk_text_buffer_insert(buffer, iter, text, len); +@@ -10829,8 +10829,8 @@ + * @param text cast=(const gchar *) + * @param len cast=(gint) + */ +-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len); +-public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len) { ++public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len); ++public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) { + lock.lock(); + try { + _gtk_text_buffer_insert(buffer, iter, text, len); +@@ -10843,8 +10843,8 @@ + * @param mark cast=(GtkTextMark *) + * @param where cast=(const GtkTextIter *) + */ +-public static final native void _gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where); +-public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where) { ++public static final native void _gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where); ++public static final void gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where) { + lock.lock(); + try { + _gtk_text_buffer_move_mark(buffer, mark, where); +@@ -10858,8 +10858,8 @@ + * @param override_location cast=(GtkTextIter *) + * @param default_editable cast=(gboolean) + */ +-public static final native void _gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable); +-public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable) { ++public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable); ++public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) { + lock.lock(); + try { + _gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable); +@@ -10871,8 +10871,8 @@ + * @param buffer cast=(GtkTextBuffer *) + * @param where cast=(const GtkTextIter *) + */ +-public static final native void _gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where); +-public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where) { ++public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where); ++public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) { + lock.lock(); + try { + _gtk_text_buffer_place_cursor(buffer, where); +@@ -10885,8 +10885,8 @@ + * @param text cast=(const gchar *) + * @param len cast=(gint) + */ +-public static final native void _gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len); +-public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len) { ++public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len); ++public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) { + lock.lock(); + try { + _gtk_text_buffer_set_text(buffer, text, len); +@@ -10922,8 +10922,8 @@ + * @param window_x cast=(gint *) + * @param window_y cast=(gint *) + */ +-public static final native void _gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); +-public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { ++public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y); ++public static final void gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) { + lock.lock(); + try { + _gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y); +@@ -10932,8 +10932,8 @@ + } + } + /** @param text_view cast=(GtkTextView *) */ +-public static final native int /*long*/ _gtk_text_view_get_buffer(int /*long*/ text_view); +-public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view) { ++public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view); ++public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) { + lock.lock(); + try { + return _gtk_text_view_get_buffer(text_view); +@@ -10942,8 +10942,8 @@ + } + } + /** @param text_view cast=(GtkTextView *) */ +-public static final native boolean _gtk_text_view_get_editable(int /*long*/ text_view); +-public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) { ++public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view); ++public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) { + lock.lock(); + try { + return _gtk_text_view_get_editable(text_view); +@@ -10957,8 +10957,8 @@ + * @param x cast=(gint) + * @param y cast=(gint) + */ +-public static final native void _gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y); +-public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y) { ++public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y); ++public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) { + lock.lock(); + try { + _gtk_text_view_get_iter_at_location(text_view, iter, x, y); +@@ -10971,8 +10971,8 @@ + * @param iter cast=(const GtkTextIter *) + * @param location cast=(GdkRectangle *),flags=no_in + */ +-public static final native void _gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location); +-public static final void gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location) { ++public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location); ++public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) { + lock.lock(); + try { + _gtk_text_view_get_iter_location(text_view, iter, location); +@@ -10986,8 +10986,8 @@ + * @param y cast=(gint) + * @param line_top cast=(gint *) + */ +-public static final native void _gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top); +-public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top) { ++public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top); ++public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) { + lock.lock(); + try { + _gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top); +@@ -10999,8 +10999,8 @@ + * @param text_view cast=(GtkTextView *) + * @param visible_rect cast=(GdkRectangle *),flags=no_in + */ +-public static final native void _gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect); +-public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect) { ++public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect); ++public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) { + lock.lock(); + try { + _gtk_text_view_get_visible_rect(text_view, visible_rect); +@@ -11012,8 +11012,8 @@ + * @param text_view cast=(GtkTextView *) + * @param win cast=(GtkTextWindowType) + */ +-public static final native int /*long*/ _gtk_text_view_get_window(int /*long*/ text_view, int win); +-public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view, int win) { ++public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win); ++public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) { + lock.lock(); + try { + return _gtk_text_view_get_window(text_view, win); +@@ -11021,8 +11021,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_text_view_new(); +-public static final int /*long*/ gtk_text_view_new() { ++public static final native long /*int*/ _gtk_text_view_new(); ++public static final long /*int*/ gtk_text_view_new() { + lock.lock(); + try { + return _gtk_text_view_new(); +@@ -11034,8 +11034,8 @@ + * @param text_view cast=(GtkTextView *) + * @param mark cast=(GtkTextMark *) + */ +-public static final native void _gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark); +-public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark) { ++public static final native void _gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark); ++public static final void gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark) { + lock.lock(); + try { + _gtk_text_view_scroll_mark_onscreen(text_view, mark); +@@ -11051,8 +11051,8 @@ + * @param xalign cast=(gdouble) + * @param yalign cast=(gdouble) + */ +-public static final native boolean _gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign); +-public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) { ++public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign); ++public static final boolean gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) { + lock.lock(); + try { + return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign); +@@ -11064,8 +11064,8 @@ + * @param text_view cast=(GtkTextView *) + * @param setting cast=(gboolean) + */ +-public static final native void _gtk_text_view_set_editable(int /*long*/ text_view, boolean setting); +-public static final void gtk_text_view_set_editable(int /*long*/ text_view, boolean setting) { ++public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting); ++public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) { + lock.lock(); + try { + _gtk_text_view_set_editable(text_view, setting); +@@ -11074,8 +11074,8 @@ + } + } + /** @param text_view cast=(GtkTextView *) */ +-public static final native void _gtk_text_view_set_justification(int /*long*/ text_view, int justification); +-public static final void gtk_text_view_set_justification(int /*long*/ text_view, int justification) { ++public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification); ++public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) { + lock.lock(); + try { + _gtk_text_view_set_justification(text_view, justification); +@@ -11087,8 +11087,8 @@ + * @param text_view cast=(GtkTextView *) + * @param tabs cast=(PangoTabArray *) + */ +-public static final native void _gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs); +-public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs) { ++public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs); ++public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) { + lock.lock(); + try { + _gtk_text_view_set_tabs(text_view, tabs); +@@ -11097,8 +11097,8 @@ + } + } + /** @param text_view cast=(GtkTextView *) */ +-public static final native void _gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode); +-public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode) { ++public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode); ++public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) { + lock.lock(); + try { + _gtk_text_view_set_wrap_mode(text_view, wrap_mode); +@@ -11114,8 +11114,8 @@ + * @param buffer_x cast=(gint *) + * @param buffer_y cast=(gint *) + */ +-public static final native void _gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y); +-public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) { ++public static final native void _gtk_text_view_window_to_buffer_coords(long /*int*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y); ++public static final void gtk_text_view_window_to_buffer_coords(long /*int*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) { + lock.lock(); + try { + _gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y); +@@ -11128,8 +11128,8 @@ + * @param function cast=(GtkFunction) + * @param data cast=(gpointer) + */ +-public static final native int _gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data); +-public static final int gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data) { ++public static final native int _gtk_timeout_add(int interval, long /*int*/ function, long /*int*/ data); ++public static final int gtk_timeout_add(int interval, long /*int*/ function, long /*int*/ data) { + lock.lock(); + try { + return _gtk_timeout_add(interval, function, data); +@@ -11148,8 +11148,8 @@ + } + } + /** @param toggle_button cast=(GtkToggleButton *) */ +-public static final native boolean _gtk_toggle_button_get_active(int /*long*/ toggle_button); +-public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_button) { ++public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button); ++public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) { + lock.lock(); + try { + return _gtk_toggle_button_get_active(toggle_button); +@@ -11157,8 +11157,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_toggle_button_new(); +-public static final int /*long*/ gtk_toggle_button_new() { ++public static final native long /*int*/ _gtk_toggle_button_new(); ++public static final long /*int*/ gtk_toggle_button_new() { + lock.lock(); + try { + return _gtk_toggle_button_new(); +@@ -11167,8 +11167,8 @@ + } + } + /** @param toggle_button cast=(GtkToggleButton *) */ +-public static final native boolean _gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button); +-public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button) { ++public static final native boolean _gtk_toggle_button_get_inconsistent(long /*int*/ toggle_button); ++public static final boolean gtk_toggle_button_get_inconsistent(long /*int*/ toggle_button) { + lock.lock(); + try { + return _gtk_toggle_button_get_inconsistent(toggle_button); +@@ -11180,8 +11180,8 @@ + * @param toggle_button cast=(GtkToggleButton *) + * @param is_active cast=(gboolean) + */ +-public static final native void _gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active); +-public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active) { ++public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active); ++public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) { + lock.lock(); + try { + _gtk_toggle_button_set_active(toggle_button, is_active); +@@ -11193,8 +11193,8 @@ + * @param toggle_button cast=(GtkToggleButton *) + * @param setting cast=(gboolean) + */ +-public static final native void _gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting); +-public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting) { ++public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting); ++public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) { + lock.lock(); + try { + _gtk_toggle_button_set_inconsistent(toggle_button, setting); +@@ -11206,8 +11206,8 @@ + * @param toggle_button cast=(GtkToggleButton *) + * @param draw_indicator cast=(gboolean) + */ +-public static final native void _gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator); +-public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator) { ++public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator); ++public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) { + lock.lock(); + try { + _gtk_toggle_button_set_mode(toggle_button, draw_indicator); +@@ -11222,8 +11222,8 @@ + * @param tooltip_private_text cast=(const char *) + * @param position cast=(gint) + */ +-public static final native void _gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position); +-public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) { ++public static final native void _gtk_toolbar_insert_widget(long /*int*/ toolbar, long /*int*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position); ++public static final void gtk_toolbar_insert_widget(long /*int*/ toolbar, long /*int*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) { + lock.lock(); + try { + _gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position); +@@ -11231,8 +11231,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_toolbar_new(); +-public static final int /*long*/ gtk_toolbar_new() { ++public static final native long /*int*/ _gtk_toolbar_new(); ++public static final long /*int*/ gtk_toolbar_new() { + lock.lock(); + try { + return _gtk_toolbar_new(); +@@ -11244,8 +11244,8 @@ + * @param toolbar cast=(GtkToolbar *) + * @param orientation cast=(GtkOrientation) + */ +-public static final native void _gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation); +-public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation) { ++public static final native void _gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation); ++public static final void gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation) { + lock.lock(); + try { + _gtk_toolbar_set_orientation(toolbar, orientation); +@@ -11254,8 +11254,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget); +-public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_tooltips_data_get(long /*int*/ widget); ++public static final long /*int*/ gtk_tooltips_data_get(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_tooltips_data_get(widget); +@@ -11264,8 +11264,8 @@ + } + } + /** @param tooltips cast=(GtkTooltips *) */ +-public static final native void _gtk_tooltips_disable(int /*long*/ tooltips); +-public static final void gtk_tooltips_disable(int /*long*/ tooltips) { ++public static final native void _gtk_tooltips_disable(long /*int*/ tooltips); ++public static final void gtk_tooltips_disable(long /*int*/ tooltips) { + lock.lock(); + try { + _gtk_tooltips_disable(tooltips); +@@ -11274,8 +11274,8 @@ + } + } + /** @param tooltips cast=(GtkTooltips *) */ +-public static final native void _gtk_tooltips_enable(int /*long*/ tooltips); +-public static final void gtk_tooltips_enable(int /*long*/ tooltips) { ++public static final native void _gtk_tooltips_enable(long /*int*/ tooltips); ++public static final void gtk_tooltips_enable(long /*int*/ tooltips) { + lock.lock(); + try { + _gtk_tooltips_enable(tooltips); +@@ -11283,8 +11283,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_tooltips_new(); +-public static final int /*long*/ gtk_tooltips_new() { ++public static final native long /*int*/ _gtk_tooltips_new(); ++public static final long /*int*/ gtk_tooltips_new() { + lock.lock(); + try { + return _gtk_tooltips_new(); +@@ -11293,8 +11293,8 @@ + } + } + /** @param tooltips cast=(GtkTooltips *) */ +-public static final native void _gtk_tooltips_force_window(int /*long*/ tooltips); +-public static final void gtk_tooltips_force_window(int /*long*/ tooltips) { ++public static final native void _gtk_tooltips_force_window(long /*int*/ tooltips); ++public static final void gtk_tooltips_force_window(long /*int*/ tooltips) { + lock.lock(); + try { + _gtk_tooltips_force_window(tooltips); +@@ -11308,8 +11308,8 @@ + * @param tip_text cast=(const gchar *) + * @param tip_private cast=(const gchar *) + */ +-public static final native void _gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private); +-public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private) { ++public static final native void _gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private); ++public static final void gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private) { + lock.lock(); + try { + _gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private); +@@ -11321,8 +11321,8 @@ + * @param tree_model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator); +-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator) { ++public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, long /*int*/ terminator); ++public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_model_get(tree_model, iter, column, value, terminator); +@@ -11334,8 +11334,8 @@ + * @param tree_model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator); +-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator) { ++public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, long /*int*/ terminator); ++public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_model_get(tree_model, iter, column, value, terminator); +@@ -11348,8 +11348,8 @@ + * @param iter cast=(GtkTreeIter *) + * @param path cast=(GtkTreePath *) + */ +-public static final native boolean _gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path); +-public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path) { ++public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path); ++public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_model_get_iter(tree_model, iter, path); +@@ -11361,8 +11361,8 @@ + * @param tree_model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native boolean _gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter); +-public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter) { ++public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter); ++public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) { + lock.lock(); + try { + return _gtk_tree_model_get_iter_first(tree_model, iter); +@@ -11371,8 +11371,8 @@ + } + } + /** @param tree_model cast=(GtkTreeModel *) */ +-public static final native int _gtk_tree_model_get_n_columns(int /*long*/ tree_model); +-public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) { ++public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model); ++public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) { + lock.lock(); + try { + return _gtk_tree_model_get_n_columns(tree_model); +@@ -11384,8 +11384,8 @@ + * @param tree_model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native int /*long*/ _gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter); +-public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter) { ++public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter); ++public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) { + lock.lock(); + try { + return _gtk_tree_model_get_path(tree_model, iter); +@@ -11393,8 +11393,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_tree_model_get_type(); +-public static final int /*long*/ gtk_tree_model_get_type() { ++public static final native long /*int*/ _gtk_tree_model_get_type(); ++public static final long /*int*/ gtk_tree_model_get_type() { + lock.lock(); + try { + return _gtk_tree_model_get_type(); +@@ -11407,8 +11407,8 @@ + * @param iter cast=(GtkTreeIter *) + * @param parent cast=(GtkTreeIter *) + */ +-public static final native boolean _gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent); +-public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent) { ++public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent); ++public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) { + lock.lock(); + try { + return _gtk_tree_model_iter_children(model, iter, parent); +@@ -11420,8 +11420,8 @@ + * @param model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native int _gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter); +-public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter) { ++public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter); ++public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) { + lock.lock(); + try { + return _gtk_tree_model_iter_n_children(model, iter); +@@ -11433,8 +11433,8 @@ + * @param model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native boolean _gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter); +-public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter) { ++public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter); ++public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) { + lock.lock(); + try { + return _gtk_tree_model_iter_next(model, iter); +@@ -11447,8 +11447,8 @@ + * @param iter cast=(GtkTreeIter *) + * @param parent cast=(GtkTreeIter *) + */ +-public static final native boolean _gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n); +-public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n) { ++public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n); ++public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) { + lock.lock(); + try { + return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n); +@@ -11457,8 +11457,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native void _gtk_tree_path_append_index(int /*long*/ path, int index); +-public static final void gtk_tree_path_append_index(int /*long*/ path, int index) { ++public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index); ++public static final void gtk_tree_path_append_index(long /*int*/ path, int index) { + lock.lock(); + try { + _gtk_tree_path_append_index(path, index); +@@ -11470,8 +11470,8 @@ + * @param a cast=(const GtkTreePath *) + * @param b cast=(const GtkTreePath *) + */ +-public static final native int /*long*/ _gtk_tree_path_compare(int /*long*/ a, int /*long*/ b); +-public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*long*/ b) { ++public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b); ++public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) { + lock.lock(); + try { + return _gtk_tree_path_compare(a, b); +@@ -11480,8 +11480,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native void _gtk_tree_path_down(int /*long*/ path); +-public static final void gtk_tree_path_down(int /*long*/ path) { ++public static final native void _gtk_tree_path_down(long /*int*/ path); ++public static final void gtk_tree_path_down(long /*int*/ path) { + lock.lock(); + try { + _gtk_tree_path_down(path); +@@ -11490,8 +11490,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native void _gtk_tree_path_free(int /*long*/ path); +-public static final void gtk_tree_path_free(int /*long*/ path) { ++public static final native void _gtk_tree_path_free(long /*int*/ path); ++public static final void gtk_tree_path_free(long /*int*/ path) { + lock.lock(); + try { + _gtk_tree_path_free(path); +@@ -11500,8 +11500,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native int _gtk_tree_path_get_depth(int /*long*/ path); +-public static final int gtk_tree_path_get_depth(int /*long*/ path) { ++public static final native int _gtk_tree_path_get_depth(long /*int*/ path); ++public static final int gtk_tree_path_get_depth(long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_path_get_depth(path); +@@ -11510,8 +11510,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native int /*long*/ _gtk_tree_path_get_indices(int /*long*/ path); +-public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) { ++public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path); ++public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_path_get_indices(path); +@@ -11519,8 +11519,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_tree_path_new(); +-public static final int /*long*/ gtk_tree_path_new() { ++public static final native long /*int*/ _gtk_tree_path_new(); ++public static final long /*int*/ gtk_tree_path_new() { + lock.lock(); + try { + return _gtk_tree_path_new(); +@@ -11528,8 +11528,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_tree_path_new_first(); +-public static final int /*long*/ gtk_tree_path_new_first() { ++public static final native long /*int*/ _gtk_tree_path_new_first(); ++public static final long /*int*/ gtk_tree_path_new_first() { + lock.lock(); + try { + return _gtk_tree_path_new_first(); +@@ -11538,8 +11538,8 @@ + } + } + /** @param path cast=(const gchar *) */ +-public static final native int /*long*/ _gtk_tree_path_new_from_string(byte[] path); +-public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) { ++public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path); ++public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) { + lock.lock(); + try { + return _gtk_tree_path_new_from_string(path); +@@ -11548,8 +11548,8 @@ + } + } + /** @param path cast=(const gchar *) */ +-public static final native int /*long*/ _gtk_tree_path_new_from_string(int /*long*/ path); +-public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path) { ++public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path); ++public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_path_new_from_string(path); +@@ -11558,8 +11558,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native void _gtk_tree_path_next(int /*long*/ path); +-public static final void gtk_tree_path_next(int /*long*/ path) { ++public static final native void _gtk_tree_path_next(long /*int*/ path); ++public static final void gtk_tree_path_next(long /*int*/ path) { + lock.lock(); + try { + _gtk_tree_path_next(path); +@@ -11568,8 +11568,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native boolean _gtk_tree_path_prev(int /*long*/ path); +-public static final boolean gtk_tree_path_prev(int /*long*/ path) { ++public static final native boolean _gtk_tree_path_prev(long /*int*/ path); ++public static final boolean gtk_tree_path_prev(long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_path_prev(path); +@@ -11578,8 +11578,8 @@ + } + } + /** @param path cast=(GtkTreePath *) */ +-public static final native boolean _gtk_tree_path_up(int /*long*/ path); +-public static final boolean gtk_tree_path_up(int /*long*/ path) { ++public static final native boolean _gtk_tree_path_up(long /*int*/ path); ++public static final boolean gtk_tree_path_up(long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_path_up(path); +@@ -11591,8 +11591,8 @@ + * @method flags=dynamic + * @param selection cast=(GtkTreeSelection *) + */ +-public static final native int _gtk_tree_selection_count_selected_rows(int /*long*/ selection); +-public static final int gtk_tree_selection_count_selected_rows(int /*long*/ selection) { ++public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection); ++public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) { + lock.lock(); + try { + return _gtk_tree_selection_count_selected_rows(selection); +@@ -11605,8 +11605,8 @@ + * @param model cast=(GtkTreeModel **) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native boolean _gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter); +-public static final boolean gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter) { ++public static final native boolean _gtk_tree_selection_get_selected(long /*int*/ selection, long /*int*/[] model, long /*int*/ iter); ++public static final boolean gtk_tree_selection_get_selected(long /*int*/ selection, long /*int*/[] model, long /*int*/ iter) { + lock.lock(); + try { + return _gtk_tree_selection_get_selected(selection, model, iter); +@@ -11619,8 +11619,8 @@ + * @param selection cast=(GtkTreeSelection *) + * @param model cast=(GtkTreeModel **) + */ +-public static final native int /*long*/ _gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model); +-public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model) { ++public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model); ++public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) { + lock.lock(); + try { + return _gtk_tree_selection_get_selected_rows(selection, model); +@@ -11632,8 +11632,8 @@ + * @param selection cast=(GtkTreeSelection *) + * @param path cast=(GtkTreePath *) + */ +-public static final native boolean _gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path); +-public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path) { ++public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path); ++public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_selection_path_is_selected(selection, path); +@@ -11642,8 +11642,8 @@ + } + } + /** @param selection cast=(GtkTreeSelection *) */ +-public static final native void _gtk_tree_selection_select_all(int /*long*/ selection); +-public static final void gtk_tree_selection_select_all(int /*long*/ selection) { ++public static final native void _gtk_tree_selection_select_all(long /*int*/ selection); ++public static final void gtk_tree_selection_select_all(long /*int*/ selection) { + lock.lock(); + try { + _gtk_tree_selection_select_all(selection); +@@ -11655,8 +11655,8 @@ + * @param selection cast=(GtkTreeSelection *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter); +-public static final void gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter) { ++public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter); ++public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) { + lock.lock(); + try { + _gtk_tree_selection_select_iter(selection, iter); +@@ -11669,8 +11669,8 @@ + * @param func cast=(GtkTreeSelectionForeachFunc) + * @param data cast=(gpointer) + */ +-public static final native void _gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data); +-public static final void gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data) { ++public static final native void _gtk_tree_selection_selected_foreach(long /*int*/ selection, long /*int*/ func, long /*int*/ data); ++public static final void gtk_tree_selection_selected_foreach(long /*int*/ selection, long /*int*/ func, long /*int*/ data) { + lock.lock(); + try { + _gtk_tree_selection_selected_foreach(selection, func, data); +@@ -11682,8 +11682,8 @@ + * @param selection cast=(GtkTreeSelection *) + * @param mode cast=(GtkSelectionMode) + */ +-public static final native void _gtk_tree_selection_set_mode(int /*long*/ selection, int mode); +-public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int mode) { ++public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode); ++public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) { + lock.lock(); + try { + _gtk_tree_selection_set_mode(selection, mode); +@@ -11692,8 +11692,8 @@ + } + } + /** @param selection cast=(GtkTreeSelection *) */ +-public static final native void _gtk_tree_selection_unselect_all(int /*long*/ selection); +-public static final void gtk_tree_selection_unselect_all(int /*long*/ selection) { ++public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection); ++public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) { + lock.lock(); + try { + _gtk_tree_selection_unselect_all(selection); +@@ -11705,8 +11705,8 @@ + * @param selection cast=(GtkTreeSelection *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter); +-public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter) { ++public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter); ++public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) { + lock.lock(); + try { + _gtk_tree_selection_unselect_iter(selection, iter); +@@ -11719,8 +11719,8 @@ + * @param iter cast=(GtkTreeIter *) + * @param parent cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent); +-public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent) { ++public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent); ++public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) { + lock.lock(); + try { + _gtk_tree_store_append(store, iter, parent); +@@ -11729,8 +11729,8 @@ + } + } + /** @param store cast=(GtkTreeStore *) */ +-public static final native void _gtk_tree_store_clear(int /*long*/ store); +-public static final void gtk_tree_store_clear(int /*long*/ store) { ++public static final native void _gtk_tree_store_clear(long /*int*/ store); ++public static final void gtk_tree_store_clear(long /*int*/ store) { + lock.lock(); + try { + _gtk_tree_store_clear(store); +@@ -11744,8 +11744,8 @@ + * @param parent cast=(GtkTreeIter *) + * @param position cast=(gint) + */ +-public static final native void _gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position); +-public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position) { ++public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position); ++public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) { + lock.lock(); + try { + _gtk_tree_store_insert(store, iter, parent, position); +@@ -11754,8 +11754,8 @@ + } + } + /** @param types cast=(GType *) */ +-public static final native int /*long*/ _gtk_tree_store_newv(int numColumns, int /*long*/[] types); +-public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*/[] types) { ++public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types); ++public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) { + lock.lock(); + try { + return _gtk_tree_store_newv(numColumns, types); +@@ -11767,8 +11767,8 @@ + * @param store cast=(GtkTreeStore *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter); +-public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter) { ++public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter); ++public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) { + lock.lock(); + try { + _gtk_tree_store_remove(store, iter); +@@ -11780,8 +11780,8 @@ + * @param store cast=(GtkTreeStore *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator); +-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) { ++public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator); ++public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_store_set(store, iter, column, value, terminator); +@@ -11793,8 +11793,8 @@ + * @param store cast=(GtkTreeStore *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator); +-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) { ++public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator); ++public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_store_set(store, iter, column, value, terminator); +@@ -11806,8 +11806,8 @@ + * @param store cast=(GtkTreeStore *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator); +-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) { ++public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator); ++public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_store_set(store, iter, column, value, terminator); +@@ -11820,8 +11820,8 @@ + * @param iter cast=(GtkTreeIter *) + * @param value flags=no_out + */ +-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator); +-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) { ++public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator); ++public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_store_set(store, iter, column, value, terminator); +@@ -11833,8 +11833,8 @@ + * @param store cast=(GtkTreeStore *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator); +-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) { ++public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator); ++public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_tree_store_set(store, iter, column, value, terminator); +@@ -11846,8 +11846,8 @@ + * @param view cast=(GtkTreeView *) + * @param path cast=(GtkTreePath *) + */ +-public static final native int /*long*/ _gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path); +-public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path) { ++public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path); ++public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_view_create_row_drag_icon(view, path); +@@ -11859,8 +11859,8 @@ + * @param view cast=(GtkTreeView *) + * @param path cast=(GtkTreePath *) + */ +-public static final native boolean _gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path); +-public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path) { ++public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path); ++public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_view_collapse_row(view, path); +@@ -11874,8 +11874,8 @@ + * @param attribute cast=(const gchar *) + * @param column cast=(gint) + */ +-public static final native void _gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column); +-public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column) { ++public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column); ++public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) { + lock.lock(); + try { + _gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column); +@@ -11890,8 +11890,8 @@ + * @param start_pos cast=(gint *) + * @param width cast=(gint *) + */ +-public static final native boolean _gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width); +-public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width) { ++public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width); ++public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) { + lock.lock(); + try { + return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width); +@@ -11907,8 +11907,8 @@ + * @param width cast=(gint *) + * @param height cast=(gint *) + */ +-public static final native void _gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height); +-public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) { ++public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height); ++public static final void gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) { + lock.lock(); + try { + _gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height); +@@ -11921,8 +11921,8 @@ + * @param tree_model cast=(GtkTreeModel *) + * @param iter cast=(GtkTreeIter *) + */ +-public static final native void _gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded); +-public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded) { ++public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded); ++public static final void gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded) { + lock.lock(); + try { + _gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded); +@@ -11931,8 +11931,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native void _gtk_tree_view_column_clear(int /*long*/ tree_column); +-public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) { ++public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column); ++public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) { + lock.lock(); + try { + _gtk_tree_view_column_clear(tree_column); +@@ -11941,8 +11941,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column); +-public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) { ++public static final native long /*int*/ _gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column); ++public static final long /*int*/ gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_cell_renderers(tree_column); +@@ -11951,8 +11951,8 @@ + } + } + /** @param column cast=(GtkTreeViewColumn *) */ +-public static final native int _gtk_tree_view_column_get_fixed_width(int /*long*/ column); +-public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column) { ++public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column); ++public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_fixed_width(column); +@@ -11961,8 +11961,8 @@ + } + } + /** @param column cast=(GtkTreeViewColumn *) */ +-public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column); +-public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) { ++public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column); ++public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_reorderable(column); +@@ -11971,8 +11971,8 @@ + } + } + /** @param column cast=(GtkTreeViewColumn *) */ +-public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column); +-public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) { ++public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column); ++public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_resizable(column); +@@ -11981,8 +11981,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native int _gtk_tree_view_column_get_sizing(int /*long*/ tree_column); +-public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column) { ++public static final native int _gtk_tree_view_column_get_sizing(long /*int*/ tree_column); ++public static final int gtk_tree_view_column_get_sizing(long /*int*/ tree_column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_sizing(tree_column); +@@ -11991,8 +11991,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native int _gtk_tree_view_column_get_spacing(int /*long*/ tree_column); +-public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_column) { ++public static final native int _gtk_tree_view_column_get_spacing(long /*int*/ tree_column); ++public static final int gtk_tree_view_column_get_spacing(long /*int*/ tree_column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_spacing(tree_column); +@@ -12001,8 +12001,8 @@ + } + } + /** @param column cast=(GtkTreeViewColumn *) */ +-public static final native boolean _gtk_tree_view_column_get_visible(int /*long*/ column); +-public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column) { ++public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column); ++public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_visible(column); +@@ -12011,8 +12011,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native boolean _gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column); +-public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column) { ++public static final native boolean _gtk_tree_view_column_get_sort_indicator(long /*int*/ tree_column); ++public static final boolean gtk_tree_view_column_get_sort_indicator(long /*int*/ tree_column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_sort_indicator(tree_column); +@@ -12021,8 +12021,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native int _gtk_tree_view_column_get_sort_order(int /*long*/ tree_column); +-public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_column) { ++public static final native int _gtk_tree_view_column_get_sort_order(long /*int*/ tree_column); ++public static final int gtk_tree_view_column_get_sort_order(long /*int*/ tree_column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_sort_order(tree_column); +@@ -12031,8 +12031,8 @@ + } + } + /** @param column cast=(GtkTreeViewColumn *) */ +-public static final native int _gtk_tree_view_column_get_width(int /*long*/ column); +-public static final int gtk_tree_view_column_get_width(int /*long*/ column) { ++public static final native int _gtk_tree_view_column_get_width(long /*int*/ column); ++public static final int gtk_tree_view_column_get_width(long /*int*/ column) { + lock.lock(); + try { + return _gtk_tree_view_column_get_width(column); +@@ -12040,8 +12040,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_tree_view_column_new(); +-public static final int /*long*/ gtk_tree_view_column_new() { ++public static final native long /*int*/ _gtk_tree_view_column_new(); ++public static final long /*int*/ gtk_tree_view_column_new() { + lock.lock(); + try { + return _gtk_tree_view_column_new(); +@@ -12054,8 +12054,8 @@ + * @param cell_renderer cast=(GtkCellRenderer *) + * @param expand cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand); +-public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) { ++public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand); ++public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) { + lock.lock(); + try { + _gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand); +@@ -12068,8 +12068,8 @@ + * @param cell_renderer cast=(GtkCellRenderer *) + * @param expand cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand); +-public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) { ++public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand); ++public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) { + lock.lock(); + try { + _gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand); +@@ -12078,8 +12078,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native void _gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign); +-public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign) { ++public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign); ++public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) { + lock.lock(); + try { + _gtk_tree_view_column_set_alignment(tree_column, xalign); +@@ -12094,8 +12094,8 @@ + * @param func_data cast=(gpointer) + * @param destroy cast=(GtkDestroyNotify) + */ +-public static final native void _gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy); +-public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy) { ++public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy); ++public static final void gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy) { + lock.lock(); + try { + _gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy); +@@ -12107,8 +12107,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param clickable cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable); +-public static final void gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable) { ++public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable); ++public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) { + lock.lock(); + try { + _gtk_tree_view_column_set_clickable(column, clickable); +@@ -12120,8 +12120,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param fixed_width cast=(gint) + */ +-public static final native void _gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width); +-public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width) { ++public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width); ++public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) { + lock.lock(); + try { + _gtk_tree_view_column_set_fixed_width(column, fixed_width); +@@ -12133,8 +12133,8 @@ + * @param tree_column cast=(GtkTreeViewColumn *) + * @param min_width cast=(gint) + */ +-public static final native void _gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width); +-public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width) { ++public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width); ++public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) { + lock.lock(); + try { + _gtk_tree_view_column_set_min_width(tree_column, min_width); +@@ -12146,8 +12146,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param reorderable cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable); +-public static final void gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable) { ++public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable); ++public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) { + lock.lock(); + try { + _gtk_tree_view_column_set_reorderable(column, reorderable); +@@ -12159,8 +12159,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param resizable cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable); +-public static final void gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable) { ++public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable); ++public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) { + lock.lock(); + try { + _gtk_tree_view_column_set_resizable(column, resizable); +@@ -12172,8 +12172,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param type cast=(GtkTreeViewColumnSizing) + */ +-public static final native void _gtk_tree_view_column_set_sizing(int /*long*/ column, int type); +-public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, int type) { ++public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type); ++public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) { + lock.lock(); + try { + _gtk_tree_view_column_set_sizing(column, type); +@@ -12185,8 +12185,8 @@ + * @param tree_column cast=(GtkTreeViewColumn *) + * @param setting cast=(gboolean) + */ +-public static final native void _gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting); +-public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting) { ++public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting); ++public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) { + lock.lock(); + try { + _gtk_tree_view_column_set_sort_indicator(tree_column, setting); +@@ -12198,8 +12198,8 @@ + * @param tree_column cast=(GtkTreeViewColumn *) + * @param order cast=(GtkSortType) + */ +-public static final native void _gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order); +-public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order) { ++public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order); ++public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) { + lock.lock(); + try { + _gtk_tree_view_column_set_sort_order(tree_column, order); +@@ -12211,8 +12211,8 @@ + * @param tree_column cast=(GtkTreeViewColumn *) + * @param title cast=(const gchar *) + */ +-public static final native void _gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title); +-public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title) { ++public static final native void _gtk_tree_view_column_set_title(long /*int*/ tree_column, byte[] title); ++public static final void gtk_tree_view_column_set_title(long /*int*/ tree_column, byte[] title) { + lock.lock(); + try { + _gtk_tree_view_column_set_title(tree_column, title); +@@ -12221,8 +12221,8 @@ + } + } + /** @param tree_column cast=(GtkTreeViewColumn *) */ +-public static final native void _gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible); +-public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible) { ++public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible); ++public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) { + lock.lock(); + try { + _gtk_tree_view_column_set_visible(tree_column, visible); +@@ -12234,8 +12234,8 @@ + * @param tree_column cast=(GtkTreeViewColumn *) + * @param widget cast=(GtkWidget *) + */ +-public static final native void _gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget); +-public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget) { ++public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget); ++public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) { + lock.lock(); + try { + _gtk_tree_view_column_set_widget(tree_column, widget); +@@ -12247,8 +12247,8 @@ + * @param view cast=(GtkTreeView *) + * @param path cast=(GtkTreePath *) + */ +-public static final native void _gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos); +-public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos) { ++public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos); ++public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) { + lock.lock(); + try { + _gtk_tree_view_set_drag_dest_row(view, path, pos); +@@ -12257,8 +12257,8 @@ + } + } + /** @param view cast=(GtkTreeView *) */ +-public static final native void _gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search); +-public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search) { ++public static final native void _gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search); ++public static final void gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search) { + lock.lock(); + try { + _gtk_tree_view_set_enable_search(view, enable_search); +@@ -12271,8 +12271,8 @@ + * @param path cast=(GtkTreePath *) + * @param open_all cast=(gboolean) + */ +-public static final native boolean _gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all); +-public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all) { ++public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all); ++public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) { + lock.lock(); + try { + return _gtk_tree_view_expand_row(view, path, open_all); +@@ -12286,8 +12286,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param rect cast=(GdkRectangle *) + */ +-public static final native void _gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect); +-public static final void gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) { ++public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect); ++public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) { + lock.lock(); + try { + _gtk_tree_view_get_background_area(tree_view, path, column, rect); +@@ -12296,8 +12296,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native int /*long*/ _gtk_tree_view_get_bin_window(int /*long*/ tree_view); +-public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_view) { ++public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view); ++public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_bin_window(tree_view); +@@ -12311,8 +12311,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param rect cast=(GdkRectangle *),flags=no_in + */ +-public static final native void _gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect); +-public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) { ++public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect); ++public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) { + lock.lock(); + try { + _gtk_tree_view_get_cell_area(tree_view, path, column, rect); +@@ -12321,8 +12321,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native int /*long*/_gtk_tree_view_get_expander_column(int /*long*/ tree_view); +-public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ tree_view) { ++public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view); ++public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_expander_column(tree_view); +@@ -12334,8 +12334,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param n cast=(gint) + */ +-public static final native int /*long*/ _gtk_tree_view_get_column(int /*long*/ tree_view, int n); +-public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view, int n) { ++public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n); ++public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) { + lock.lock(); + try { + return _gtk_tree_view_get_column(tree_view, n); +@@ -12344,8 +12344,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native int /*long*/ _gtk_tree_view_get_columns(int /*long*/ tree_view); +-public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_view) { ++public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view); ++public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_columns(tree_view); +@@ -12358,8 +12358,8 @@ + * @param path cast=(GtkTreePath **) + * @param focus_column cast=(GtkTreeViewColumn **) + */ +-public static final native void _gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column); +-public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column) { ++public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column); ++public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) { + lock.lock(); + try { + _gtk_tree_view_get_cursor(tree_view, path, focus_column); +@@ -12368,8 +12368,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native boolean _gtk_tree_view_get_headers_visible(int /*long*/ tree_view); +-public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view) { ++public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view); ++public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_headers_visible(tree_view); +@@ -12386,8 +12386,8 @@ + * @param cell_x cast=(gint *) + * @param cell_y cast=(gint *) + */ +-public static final native boolean _gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y); +-public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y) { ++public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y); ++public static final boolean gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) { + lock.lock(); + try { + return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y); +@@ -12396,8 +12396,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native boolean _gtk_tree_view_get_rules_hint(int /*long*/ tree_view); +-public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view) { ++public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view); ++public static final boolean gtk_tree_view_get_rules_hint(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_rules_hint(tree_view); +@@ -12406,8 +12406,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native int /*long*/ _gtk_tree_view_get_selection(int /*long*/ tree_view); +-public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view) { ++public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view); ++public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) { + lock.lock(); + try { + return _gtk_tree_view_get_selection(tree_view); +@@ -12419,8 +12419,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param visible_rect flags=no_in + */ +-public static final native void _gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect); +-public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect) { ++public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect); ++public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) { + lock.lock(); + try { + _gtk_tree_view_get_visible_rect(tree_view, visible_rect); +@@ -12433,8 +12433,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param position cast=(gint) + */ +-public static final native int _gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position); +-public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position) { ++public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position); ++public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) { + lock.lock(); + try { + return _gtk_tree_view_insert_column(tree_view, column, position); +@@ -12447,8 +12447,8 @@ + * @param column cast=(GtkTreeViewColumn *) + * @param base_column cast=(GtkTreeViewColumn *) + */ +-public static final native void _gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/ base_column); +-public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/base_column) { ++public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column); ++public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) { + lock.lock(); + try { + _gtk_tree_view_move_column_after(tree_view, column, base_column); +@@ -12457,8 +12457,8 @@ + } + } + /** @param model cast=(GtkTreeModel *) */ +-public static final native int /*long*/ _gtk_tree_view_new_with_model(int /*long*/ model); +-public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model) { ++public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model); ++public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) { + lock.lock(); + try { + return _gtk_tree_view_new_with_model(model); +@@ -12470,8 +12470,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param column cast=(GtkTreeViewColumn *) + */ +-public static final native void _gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column); +-public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column) { ++public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column); ++public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) { + lock.lock(); + try { + _gtk_tree_view_remove_column(tree_view, column); +@@ -12483,8 +12483,8 @@ + * @param view cast=(GtkTreeView *) + * @param path cast=(GtkTreePath *) + */ +-public static final native boolean _gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path); +-public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path) { ++public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path); ++public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) { + lock.lock(); + try { + return _gtk_tree_view_row_expanded(view, path); +@@ -12500,8 +12500,8 @@ + * @param row_aligh cast=(gfloat) + * @param column_align cast=(gfloat) + */ +-public static final native void _gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align); +-public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align) { ++public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align); ++public static final void gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align) { + lock.lock(); + try { + _gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align); +@@ -12514,8 +12514,8 @@ + * @param tree_x cast=(gint) + * @param tree_y cast=(gint) + */ +-public static final native void _gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y); +-public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y) { ++public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y); ++public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) { + lock.lock(); + try { + _gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y); +@@ -12528,8 +12528,8 @@ + * @param path cast=(GtkTreePath *) + * @param focus_column cast=(GtkTreeViewColumn *) + */ +-public static final native void _gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing); +-public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing) { ++public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing); ++public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) { + lock.lock(); + try { + _gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing); +@@ -12541,8 +12541,8 @@ + * @method flags=dynamic + * @param tree_view cast=(GtkTreeView*) + */ +-public static final native void _gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines); +-public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines) { ++public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines); ++public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) { + lock.lock(); + try { + _gtk_tree_view_set_grid_lines(tree_view, grid_lines); +@@ -12554,8 +12554,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param visible cast=(gboolean) + */ +-public static final native void _gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible); +-public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible) { ++public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible); ++public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) { + lock.lock(); + try { + _gtk_tree_view_set_headers_visible(tree_view, visible); +@@ -12567,8 +12567,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param model cast=(GtkTreeModel *) + */ +-public static final native void _gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model); +-public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model) { ++public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model); ++public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) { + lock.lock(); + try { + _gtk_tree_view_set_model(tree_view, model); +@@ -12577,8 +12577,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native void _gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting); +-public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting) { ++public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting); ++public static final void gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting) { + lock.lock(); + try { + _gtk_tree_view_set_rules_hint(tree_view, setting); +@@ -12590,8 +12590,8 @@ + * @param tree_view cast=(GtkTreeView *) + * @param column cast=(gint) + */ +-public static final native void _gtk_tree_view_set_search_column(int /*long*/ tree_view, int column); +-public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view, int column) { ++public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column); ++public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) { + lock.lock(); + try { + _gtk_tree_view_set_search_column(tree_view, column); +@@ -12606,8 +12606,8 @@ + * @param wx cast=(gint *) + * @param wy cast=(gint *) + */ +-public static final native void _gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy); +-public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy) { ++public static final native void _gtk_tree_view_tree_to_widget_coords(long /*int*/ tree_view, int tx, int ty, int[] wx, int[] wy); ++public static final void gtk_tree_view_tree_to_widget_coords(long /*int*/ tree_view, int tx, int ty, int[] wx, int[] wy) { + lock.lock(); + try { + _gtk_tree_view_tree_to_widget_coords(tree_view, tx, ty, wx, wy); +@@ -12616,8 +12616,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native void _gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view); +-public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view) { ++public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view); ++public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) { + lock.lock(); + try { + _gtk_tree_view_unset_rows_drag_dest(tree_view); +@@ -12626,8 +12626,8 @@ + } + } + /** @param tree_view cast=(GtkTreeView *) */ +-public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty); +-public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) { ++public static final native void _gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty); ++public static final void gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty) { + lock.lock(); + try { + _gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty); +@@ -12639,8 +12639,8 @@ + * @param homogeneous cast=(gboolean) + * @param spacing cast=(gint) + */ +-public static final native int /*long*/ _gtk_vbox_new(boolean homogeneous, int spacing); +-public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing) { ++public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing); ++public static final long /*int*/ gtk_vbox_new(boolean homogeneous, int spacing) { + lock.lock(); + try { + return _gtk_vbox_new(homogeneous, spacing); +@@ -12649,8 +12649,8 @@ + } + } + /** @param viewport cast=(GtkViewport *) */ +-public static final native int _gtk_viewport_get_shadow_type(int /*long*/ viewport); +-public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) { ++public static final native int _gtk_viewport_get_shadow_type(long /*int*/ viewport); ++public static final int gtk_viewport_get_shadow_type(long /*int*/ viewport) { + lock.lock(); + try { + return _gtk_viewport_get_shadow_type(viewport); +@@ -12662,8 +12662,8 @@ + * @param viewport cast=(GtkViewport *) + * @param type cast=(GtkShadowType) + */ +-public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type); +-public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) { ++public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type); ++public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) { + lock.lock(); + try { + _gtk_viewport_set_shadow_type(viewport, type); +@@ -12672,8 +12672,8 @@ + } + } + /** @param adjustment cast=(GtkAdjustment *) */ +-public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment); +-public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) { ++public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment); ++public static final long /*int*/ gtk_vscale_new(long /*int*/ adjustment) { + lock.lock(); + try { + return _gtk_vscale_new(adjustment); +@@ -12682,8 +12682,8 @@ + } + } + /** @param adjustment cast=(GtkAdjustment *) */ +-public static final native int /*long*/ _gtk_vscrollbar_new(int /*long*/ adjustment); +-public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) { ++public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment); ++public static final long /*int*/ gtk_vscrollbar_new(long /*int*/ adjustment) { + lock.lock(); + try { + return _gtk_vscrollbar_new(adjustment); +@@ -12691,8 +12691,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_vseparator_new(); +-public static final int /*long*/ gtk_vseparator_new() { ++public static final native long /*int*/ _gtk_vseparator_new(); ++public static final long /*int*/ gtk_vseparator_new() { + lock.lock(); + try { + return _gtk_vseparator_new(); +@@ -12707,8 +12707,8 @@ + * @param accel_key cast=(guint) + * @param accel_mods cast=(GdkModifierType) + */ +-public static final native void _gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags); +-public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags) { ++public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags); ++public static final void gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags) { + lock.lock(); + try { + _gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags); +@@ -12720,8 +12720,8 @@ + * @param widget cast=(GtkWidget *) + * @param events cast=(gint) + */ +-public static final native void _gtk_widget_add_events(int /*long*/ widget, int events); +-public static final void gtk_widget_add_events(int /*long*/ widget, int events) { ++public static final native void _gtk_widget_add_events(long /*int*/ widget, int events); ++public static final void gtk_widget_add_events(long /*int*/ widget, int events) { + lock.lock(); + try { + _gtk_widget_add_events(widget, events); +@@ -12730,8 +12730,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native boolean _gtk_widget_child_focus(int /*long*/ widget, int direction); +-public static final boolean gtk_widget_child_focus(int /*long*/ widget, int direction) { ++public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction); ++public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) { + lock.lock(); + try { + return _gtk_widget_child_focus(widget, direction); +@@ -12743,8 +12743,8 @@ + * @param widget cast=(GtkWidget *) + * @param text cast=(const gchar *) + */ +-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text); +-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text) { ++public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text); ++public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) { + lock.lock(); + try { + return _gtk_widget_create_pango_layout(widget, text); +@@ -12756,8 +12756,8 @@ + * @param widget cast=(GtkWidget *) + * @param text cast=(const gchar *) + */ +-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text); +-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text) { ++public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text); ++public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) { + lock.lock(); + try { + return _gtk_widget_create_pango_layout(widget, text); +@@ -12766,8 +12766,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_destroy(int /*long*/ widget); +-public static final void gtk_widget_destroy(int /*long*/ widget) { ++public static final native void _gtk_widget_destroy(long /*int*/ widget); ++public static final void gtk_widget_destroy(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_destroy(widget); +@@ -12779,8 +12779,8 @@ + * @param widget cast=(GtkWidget *) + * @param event cast=(GdkEvent *) + */ +-public static final native boolean _gtk_widget_event(int /*long*/ widget, int /*long*/ event); +-public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ event) { ++public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event); ++public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) { + lock.lock(); + try { + return _gtk_widget_event(widget, event); +@@ -12789,8 +12789,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_accessible (int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_accessible(widget); +@@ -12799,8 +12799,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget); +-public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) { ++public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget); ++public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_child_visible(widget); +@@ -12817,8 +12817,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_widget_get_default_style(); +-public static final int /*long*/ gtk_widget_get_default_style() { ++public static final native long /*int*/ _gtk_widget_get_default_style(); ++public static final long /*int*/ gtk_widget_get_default_style() { + lock.lock(); + try { + return _gtk_widget_get_default_style(); +@@ -12827,8 +12827,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int _gtk_widget_get_direction(int /*long*/ widget); +-public static final int gtk_widget_get_direction(int /*long*/ widget) { ++public static final native int _gtk_widget_get_direction(long /*int*/ widget); ++public static final int gtk_widget_get_direction(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_direction(widget); +@@ -12837,8 +12837,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int _gtk_widget_get_events(int /*long*/ widget); +-public static final int gtk_widget_get_events(int /*long*/ widget) { ++public static final native int _gtk_widget_get_events(long /*int*/ widget); ++public static final int gtk_widget_get_events(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_events(widget); +@@ -12847,8 +12847,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_modifier_style(int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_modifier_style(widget); +@@ -12857,8 +12857,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_pango_context(int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_pango_context(widget); +@@ -12867,8 +12867,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_parent(int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_parent(widget); +@@ -12877,8 +12877,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_parent_window(int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_parent_window(long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_parent_window(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_parent_window(widget); +@@ -12887,8 +12887,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_style(int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_style(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_style(widget); +@@ -12901,8 +12901,8 @@ + * @param width cast=(gint *) + * @param height cast=(gint *) + */ +-public static final native void _gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height); +-public static final void gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height) { ++public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height); ++public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) { + lock.lock(); + try { + _gtk_widget_get_size_request(widget, width, height); +@@ -12911,8 +12911,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native int /*long*/ _gtk_widget_get_toplevel (int /*long*/ widget); +-public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) { ++public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget); ++public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_get_toplevel(widget); +@@ -12921,8 +12921,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_grab_focus(int /*long*/ widget); +-public static final void gtk_widget_grab_focus(int /*long*/ widget) { ++public static final native void _gtk_widget_grab_focus(long /*int*/ widget); ++public static final void gtk_widget_grab_focus(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_grab_focus(widget); +@@ -12931,8 +12931,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_hide(int /*long*/ widget); +-public static final void gtk_widget_hide(int /*long*/ widget) { ++public static final native void _gtk_widget_hide(long /*int*/ widget); ++public static final void gtk_widget_hide(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_hide(widget); +@@ -12944,8 +12944,8 @@ + * @method flags=dynamic + * @param widget cast=(GtkWidget *) + */ +-public static final native boolean _gtk_widget_is_composited(int /*long*/ widget); +-public static final boolean gtk_widget_is_composited(int /*long*/ widget) { ++public static final native boolean _gtk_widget_is_composited(long /*int*/ widget); ++public static final boolean gtk_widget_is_composited(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_is_composited(widget); +@@ -12954,8 +12954,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native boolean _gtk_widget_is_focus(int /*long*/ widget); +-public static final boolean gtk_widget_is_focus(int /*long*/ widget) { ++public static final native boolean _gtk_widget_is_focus(long /*int*/ widget); ++public static final boolean gtk_widget_is_focus(long /*int*/ widget) { + lock.lock(); + try { + return _gtk_widget_is_focus(widget); +@@ -12964,8 +12964,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_map(int /*long*/ widget); +-public static final void gtk_widget_map(int /*long*/ widget) { ++public static final native void _gtk_widget_map(long /*int*/ widget); ++public static final void gtk_widget_map(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_map(widget); +@@ -12977,8 +12977,8 @@ + * @param widget cast=(GtkWidget *) + * @param group_cycling cast=(gboolean) + */ +-public static final native boolean _gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling); +-public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling) { ++public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling); ++public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) { + lock.lock(); + try { + return _gtk_widget_mnemonic_activate(widget, group_cycling); +@@ -12991,8 +12991,8 @@ + * @param state cast=(GtkStateType) + * @param color cast=(GdkColor *),flags=no_out + */ +-public static final native void _gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color); +-public static final void gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color) { ++public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color); ++public static final void gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color) { + lock.lock(); + try { + _gtk_widget_modify_base(widget, state, color); +@@ -13005,8 +13005,8 @@ + * @param state cast=(GtkStateType) + * @param color cast=(GdkColor *),flags=no_out + */ +-public static final native void _gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color); +-public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color) { ++public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color); ++public static final void gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color) { + lock.lock(); + try { + _gtk_widget_modify_bg(widget, state, color); +@@ -13019,8 +13019,8 @@ + * @param state cast=(GtkStateType) + * @param color cast=(GdkColor *),flags=no_out + */ +-public static final native void _gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color); +-public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color) { ++public static final native void _gtk_widget_modify_fg(long /*int*/ widget, int state, GdkColor color); ++public static final void gtk_widget_modify_fg(long /*int*/ widget, int state, GdkColor color) { + lock.lock(); + try { + _gtk_widget_modify_fg(widget, state, color); +@@ -13032,8 +13032,8 @@ + * @param widget cast=(GtkWidget *) + * @param pango_font_descr cast=(PangoFontDescription *) + */ +-public static final native void _gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr); +-public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr) { ++public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr); ++public static final void gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr) { + lock.lock(); + try { + _gtk_widget_modify_font(widget, pango_font_descr); +@@ -13045,8 +13045,8 @@ + * @param widget cast=(GtkWidget *) + * @param style cast=(GtkRcStyle *) + */ +-public static final native void _gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style); +-public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style) { ++public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style); ++public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) { + lock.lock(); + try { + _gtk_widget_modify_style(widget, style); +@@ -13059,8 +13059,8 @@ + * @param state cast=(GtkStateType) + * @param color cast=(GdkColor *),flags=no_out + */ +-public static final native void _gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color); +-public static final void gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color) { ++public static final native void _gtk_widget_modify_text(long /*int*/ widget, int state, GdkColor color); ++public static final void gtk_widget_modify_text(long /*int*/ widget, int state, GdkColor color) { + lock.lock(); + try { + _gtk_widget_modify_text(widget, state, color); +@@ -13069,8 +13069,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_queue_resize(int /*long*/ widget); +-public static final void gtk_widget_queue_resize(int /*long*/ widget) { ++public static final native void _gtk_widget_queue_resize(long /*int*/ widget); ++public static final void gtk_widget_queue_resize(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_queue_resize(widget); +@@ -13079,8 +13079,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_realize(int /*long*/ widget); +-public static final void gtk_widget_realize(int /*long*/ widget) { ++public static final native void _gtk_widget_realize(long /*int*/ widget); ++public static final void gtk_widget_realize(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_realize(widget); +@@ -13094,8 +13094,8 @@ + * @param accel_key cast=(guint) + * @param accel_mods cast=(GdkModifierType) + */ +-public static final native void _gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods); +-public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods) { ++public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods); ++public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) { + lock.lock(); + try { + _gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods); +@@ -13107,8 +13107,8 @@ + * @param widget cast=(GtkWidget *) + * @param new_parent cast=(GtkWidget *) + */ +-public static final native void _gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent); +-public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent) { ++public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent); ++public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) { + lock.lock(); + try { + _gtk_widget_reparent(widget, new_parent); +@@ -13120,8 +13120,8 @@ + * @param widget cast=(GtkWidget *) + * @param event cast=(GdkEvent *) + */ +-public static final native int _gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event); +-public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event) { ++public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event); ++public static final int gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event) { + lock.lock(); + try { + return _gtk_widget_send_expose(widget, event); +@@ -13130,8 +13130,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable); +-public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable) { ++public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable); ++public static final void gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable) { + lock.lock(); + try { + _gtk_widget_set_app_paintable(widget, app_paintable); +@@ -13153,8 +13153,8 @@ + * @param widget cast=(GtkWidget *) + * @param dir cast=(GtkTextDirection) + */ +-public static final native void _gtk_widget_set_direction(int /*long*/ widget, int dir); +-public static final void gtk_widget_set_direction(int /*long*/ widget, int dir) { ++public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir); ++public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) { + lock.lock(); + try { + _gtk_widget_set_direction(widget, dir); +@@ -13166,8 +13166,8 @@ + * @param widget cast=(GtkWidget *) + * @param double_buffered cast=(gboolean) + */ +-public static final native void _gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered); +-public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered) { ++public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered); ++public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) { + lock.lock(); + try { + _gtk_widget_set_double_buffered(widget, double_buffered); +@@ -13179,8 +13179,8 @@ + * @param widget cast=(GtkWidget *) + * @param name cast=(const char *) + */ +-public static final native void _gtk_widget_set_name(int /*long*/ widget, byte[] name); +-public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) { ++public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name); ++public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) { + lock.lock(); + try { + _gtk_widget_set_name(widget, name); +@@ -13192,8 +13192,8 @@ + * @param widget cast=(GtkWidget *) + * @param redraw cast=(gboolean) + */ +-public static final native void _gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw); +-public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw) { ++public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw); ++public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) { + lock.lock(); + try { + _gtk_widget_set_redraw_on_allocate(widget, redraw); +@@ -13205,8 +13205,8 @@ + * @param widget cast=(GtkWidget *) + * @param sensitive cast=(gboolean) + */ +-public static final native void _gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive); +-public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive) { ++public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive); ++public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) { + lock.lock(); + try { + _gtk_widget_set_sensitive(widget, sensitive); +@@ -13219,8 +13219,8 @@ + * @param width cast=(gint) + * @param height cast=(gint) + */ +-public static final native void _gtk_widget_set_size_request(int /*long*/ widget, int width, int height); +-public static final void gtk_widget_set_size_request(int /*long*/ widget, int width, int height) { ++public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height); ++public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) { + lock.lock(); + try { + _gtk_widget_set_size_request(widget, width, height); +@@ -13232,8 +13232,8 @@ + * @param widget cast=(GtkWidget *) + * @param state cast=(GtkStateType) + */ +-public static final native void _gtk_widget_set_state(int /*long*/ widget, int state); +-public static final void gtk_widget_set_state(int /*long*/ widget, int state) { ++public static final native void _gtk_widget_set_state(long /*int*/ widget, int state); ++public static final void gtk_widget_set_state(long /*int*/ widget, int state) { + lock.lock(); + try { + _gtk_widget_set_state(widget, state); +@@ -13245,8 +13245,8 @@ + * @param widget cast=(GtkWidget *) + * @param style cast=(GtkStyle *) + */ +-public static final native void _gtk_widget_set_style(int /*long*/ widget, int /*long*/ style); +-public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/ style) { ++public static final native void _gtk_widget_set_style(long /*int*/ widget, long /*int*/ style); ++public static final void gtk_widget_set_style(long /*int*/ widget, long /*int*/ style) { + lock.lock(); + try { + _gtk_widget_set_style(widget, style); +@@ -13260,8 +13260,8 @@ + * @param offset_x cast=(gint) + * @param offset_y cast=(gint) + */ +-public static final native void _gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y); +-public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y) { ++public static final native void _gtk_widget_shape_combine_mask(long /*int*/ widget, long /*int*/ shape_mask, int offset_x, int offset_y); ++public static final void gtk_widget_shape_combine_mask(long /*int*/ widget, long /*int*/ shape_mask, int offset_x, int offset_y) { + lock.lock(); + try { + _gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y); +@@ -13270,8 +13270,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_show(int /*long*/ widget); +-public static final void gtk_widget_show(int /*long*/ widget) { ++public static final native void _gtk_widget_show(long /*int*/ widget); ++public static final void gtk_widget_show(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_show(widget); +@@ -13280,8 +13280,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_show_now(int /*long*/ widget); +-public static final void gtk_widget_show_now(int /*long*/ widget) { ++public static final native void _gtk_widget_show_now(long /*int*/ widget); ++public static final void gtk_widget_show_now(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_show_now(widget); +@@ -13293,8 +13293,8 @@ + * @param widget cast=(GtkWidget *) + * @param allocation cast=(GtkAllocation *),flags=no_out + */ +-public static final native void _gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation); +-public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation) { ++public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation); ++public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) { + lock.lock(); + try { + _gtk_widget_size_allocate(widget, allocation); +@@ -13306,8 +13306,8 @@ + * @param widget cast=(GtkWidget *) + * @param requisition cast=(GtkRequisition *),flags=no_in + */ +-public static final native void _gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition); +-public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition) { ++public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition); ++public static final void gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition) { + lock.lock(); + try { + _gtk_widget_size_request(widget, requisition); +@@ -13320,8 +13320,8 @@ + * @param property_name cast=(const gchar *) + * @param terminator cast=(const gchar *),flags=sentinel + */ +-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator); +-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator) { ++public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator); ++public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_widget_style_get(widget, property_name, value, terminator); +@@ -13334,8 +13334,8 @@ + * @param property_name cast=(const gchar *) + * @param terminator cast=(const gchar *),flags=sentinel + */ +-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator); +-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator) { ++public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator); ++public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_widget_style_get(widget, property_name, value, terminator); +@@ -13347,8 +13347,8 @@ + * @param src_widget cast=(GtkWidget *) + * @param dest_widget cast=(GtkWidget *) + */ +-public static final native boolean _gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y); +-public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) { ++public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y); ++public static final boolean gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) { + lock.lock(); + try { + return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y); +@@ -13357,8 +13357,8 @@ + } + } + /** @param widget cast=(GtkWidget *) */ +-public static final native void _gtk_widget_unrealize(int /*long*/ widget); +-public static final void gtk_widget_unrealize(int /*long*/ widget) { ++public static final native void _gtk_widget_unrealize(long /*int*/ widget); ++public static final void gtk_widget_unrealize(long /*int*/ widget) { + lock.lock(); + try { + _gtk_widget_unrealize(widget); +@@ -13367,8 +13367,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native boolean _gtk_window_activate_default(int /*long*/ window); +-public static final boolean gtk_window_activate_default(int /*long*/ window) { ++public static final native boolean _gtk_window_activate_default(long /*int*/ window); ++public static final boolean gtk_window_activate_default(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_activate_default(window); +@@ -13380,8 +13380,8 @@ + * @param window cast=(GtkWindow *) + * @param accel_group cast=(GtkAccelGroup *) + */ +-public static final native void _gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group); +-public static final void gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group) { ++public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group); ++public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) { + lock.lock(); + try { + _gtk_window_add_accel_group(window, accel_group); +@@ -13390,8 +13390,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_deiconify(int /*long*/ handle); +-public static final void gtk_window_deiconify(int /*long*/ handle) { ++public static final native void _gtk_window_deiconify(long /*int*/ handle); ++public static final void gtk_window_deiconify(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_deiconify(handle); +@@ -13400,8 +13400,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native int /*long*/ _gtk_window_get_focus(int /*long*/ window); +-public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) { ++public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window); ++public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_focus(window); +@@ -13413,8 +13413,8 @@ + * @method flags=dynamic + * @param window cast=(GtkWindow *) + */ +-public static final native int /*long*/ _gtk_window_get_group(int /*long*/ window); +-public static final int /*long*/ gtk_window_get_group(int /*long*/ window) { ++public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window); ++public static final long /*int*/ gtk_window_get_group(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_group(window); +@@ -13423,8 +13423,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native int /*long*/ _gtk_window_get_icon_list(int /*long*/ window); +-public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) { ++public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window); ++public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_icon_list(window); +@@ -13433,8 +13433,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native boolean _gtk_window_get_modal(int /*long*/ window); +-public static final boolean gtk_window_get_modal(int /*long*/ window) { ++public static final native boolean _gtk_window_get_modal(long /*int*/ window); ++public static final boolean gtk_window_get_modal(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_modal(window); +@@ -13443,8 +13443,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native int _gtk_window_get_mnemonic_modifier(int /*long*/ window); +-public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) { ++public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window); ++public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_mnemonic_modifier(window); +@@ -13456,8 +13456,8 @@ + * @method flags=dynamic + * @param window cast=(GtkWindow *) + */ +-public static final native double _gtk_window_get_opacity (int /*long*/ window); +-public static final double gtk_window_get_opacity (int /*long*/ window) { ++public static final native double _gtk_window_get_opacity (long /*int*/ window); ++public static final double gtk_window_get_opacity (long /*int*/ window) { + lock.lock(); + try { + return _gtk_window_get_opacity (window); +@@ -13470,8 +13470,8 @@ + * @param x cast=(gint *) + * @param y cast=(gint *) + */ +-public static final native void _gtk_window_get_position(int /*long*/ handle, int[] x, int[] y); +-public static final void gtk_window_get_position(int /*long*/ handle, int[] x, int[] y) { ++public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y); ++public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) { + lock.lock(); + try { + _gtk_window_get_position(handle, x, y); +@@ -13484,8 +13484,8 @@ + * @param x cast=(gint *) + * @param y cast=(gint *) + */ +-public static final native void _gtk_window_get_size(int /*long*/ handle, int[] x, int[] y); +-public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[] y) { ++public static final native void _gtk_window_get_size(long /*int*/ handle, int[] x, int[] y); ++public static final void gtk_window_get_size(long /*int*/ handle, int[] x, int[] y) { + lock.lock(); + try { + _gtk_window_get_size(handle, x, y); +@@ -13497,8 +13497,8 @@ + * @param group cast=(GtkWindowGroup*) + * @param window cast=(GtkWindow*) + */ +-public static final native void _gtk_window_group_add_window(int /*long*/ group, int /*long*/ window); +-public static final void gtk_window_group_add_window(int /*long*/ group, int /*long*/ window) { ++public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window); ++public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) { + lock.lock(); + try { + _gtk_window_group_add_window(group, window); +@@ -13510,8 +13510,8 @@ + * @param group cast=(GtkWindowGroup*) + * @param window cast=(GtkWindow*) + */ +-public static final native void _gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window); +-public static final void gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window) { ++public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window); ++public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) { + lock.lock(); + try { + _gtk_window_group_remove_window(group, window); +@@ -13519,8 +13519,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_window_group_new(); +-public static final int /*long*/ gtk_window_group_new() { ++public static final native long /*int*/ _gtk_window_group_new(); ++public static final long /*int*/ gtk_window_group_new() { + lock.lock(); + try { + return _gtk_window_group_new(); +@@ -13529,8 +13529,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native boolean _gtk_window_is_active(int /*long*/ handle); +-public static final boolean gtk_window_is_active(int /*long*/ handle) { ++public static final native boolean _gtk_window_is_active(long /*int*/ handle); ++public static final boolean gtk_window_is_active(long /*int*/ handle) { + lock.lock(); + try { + return _gtk_window_is_active(handle); +@@ -13539,8 +13539,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_iconify(int /*long*/ handle); +-public static final void gtk_window_iconify(int /*long*/ handle) { ++public static final native void _gtk_window_iconify(long /*int*/ handle); ++public static final void gtk_window_iconify(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_iconify(handle); +@@ -13548,8 +13548,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_window_list_toplevels (); +-public static final int /*long*/ gtk_window_list_toplevels () { ++public static final native long /*int*/ _gtk_window_list_toplevels (); ++public static final long /*int*/ gtk_window_list_toplevels () { + lock.lock(); + try { + return _gtk_window_list_toplevels (); +@@ -13558,8 +13558,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_maximize(int /*long*/ handle); +-public static final void gtk_window_maximize(int /*long*/ handle) { ++public static final native void _gtk_window_maximize(long /*int*/ handle); ++public static final void gtk_window_maximize(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_maximize(handle); +@@ -13568,8 +13568,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_fullscreen(int /*long*/ handle); +-public static final void gtk_window_fullscreen(int /*long*/ handle) { ++public static final native void _gtk_window_fullscreen(long /*int*/ handle); ++public static final void gtk_window_fullscreen(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_fullscreen(handle); +@@ -13578,8 +13578,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_unfullscreen(int /*long*/ handle); +-public static final void gtk_window_unfullscreen(int /*long*/ handle) { ++public static final native void _gtk_window_unfullscreen(long /*int*/ handle); ++public static final void gtk_window_unfullscreen(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_unfullscreen(handle); +@@ -13592,8 +13592,8 @@ + * @param x cast=(gint) + * @param y cast=(gint) + */ +-public static final native void _gtk_window_move(int /*long*/ handle, int x, int y); +-public static final void gtk_window_move(int /*long*/ handle, int x, int y) { ++public static final native void _gtk_window_move(long /*int*/ handle, int x, int y); ++public static final void gtk_window_move(long /*int*/ handle, int x, int y) { + lock.lock(); + try { + _gtk_window_move(handle, x, y); +@@ -13602,8 +13602,8 @@ + } + } + /** @param type cast=(GtkWindowType) */ +-public static final native int /*long*/ _gtk_window_new(int type); +-public static final int /*long*/ gtk_window_new(int type) { ++public static final native long /*int*/ _gtk_window_new(int type); ++public static final long /*int*/ gtk_window_new(int type) { + lock.lock(); + try { + return _gtk_window_new(type); +@@ -13612,8 +13612,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native void _gtk_window_present(int /*long*/ window); +-public static final void gtk_window_present(int /*long*/ window) { ++public static final native void _gtk_window_present(long /*int*/ window); ++public static final void gtk_window_present(long /*int*/ window) { + lock.lock(); + try { + _gtk_window_present(window); +@@ -13625,8 +13625,8 @@ + * @param window cast=(GtkWindow *) + * @param accel_group cast=(GtkAccelGroup *) + */ +-public static final native void _gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group); +-public static final void gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group) { ++public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group); ++public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) { + lock.lock(); + try { + _gtk_window_remove_accel_group(window, accel_group); +@@ -13639,8 +13639,8 @@ + * @param x cast=(gint) + * @param y cast=(gint) + */ +-public static final native void _gtk_window_resize(int /*long*/ handle, int x, int y); +-public static final void gtk_window_resize(int /*long*/ handle, int x, int y) { ++public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y); ++public static final void gtk_window_resize(long /*int*/ handle, int x, int y) { + lock.lock(); + try { + _gtk_window_resize(handle, x, y); +@@ -13652,8 +13652,8 @@ + * @param window cast=(GtkWindow *) + * @param widget cast=(GtkWidget *) + */ +-public static final native void _gtk_window_set_default(int /*long*/ window, int /*long*/ widget); +-public static final void gtk_window_set_default(int /*long*/ window, int /*long*/ widget) { ++public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget); ++public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) { + lock.lock(); + try { + _gtk_window_set_default(window, widget); +@@ -13665,8 +13665,8 @@ + * @param window cast=(GtkWindow *) + * @param setting cast=(gboolean) + */ +-public static final native void _gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting); +-public static final void gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting) { ++public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting); ++public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) { + lock.lock(); + try { + _gtk_window_set_destroy_with_parent(window, setting); +@@ -13679,8 +13679,8 @@ + * @param window cast=(GtkWindow *) + * @param setting cast=(gboolean) + */ +-public static final native void _gtk_window_set_keep_below(int /*long*/ window, boolean setting); +-public static final void gtk_window_set_keep_below(int /*long*/ window, boolean setting) { ++public static final native void _gtk_window_set_keep_below(long /*int*/ window, boolean setting); ++public static final void gtk_window_set_keep_below(long /*int*/ window, boolean setting) { + lock.lock(); + try { + _gtk_window_set_keep_below(window, setting); +@@ -13693,8 +13693,8 @@ + * @param geometry_widget cast=(GtkWidget *) + * @param geometry flags=no_out + */ +-public static final native void _gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask); +-public static final void gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask) { ++public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask); ++public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) { + lock.lock(); + try { + _gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask); +@@ -13706,8 +13706,8 @@ + * @param window cast=(GtkWindow *) + * @param list cast=(GList *) + */ +-public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list); +-public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) { ++public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list); ++public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) { + lock.lock(); + try { + _gtk_window_set_icon_list(window, list); +@@ -13719,8 +13719,8 @@ + * @param window cast=(GtkWindow *) + * @param modal cast=(gboolean) + */ +-public static final native void _gtk_window_set_modal(int /*long*/ window, boolean modal); +-public static final void gtk_window_set_modal(int /*long*/ window, boolean modal) { ++public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal); ++public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) { + lock.lock(); + try { + _gtk_window_set_modal(window, modal); +@@ -13732,8 +13732,8 @@ + * @method flags=dynamic + * @param window cast=(GtkWindow *) + */ +-public static final native void _gtk_window_set_opacity(int /*long*/ window, double opacity); +-public static final void gtk_window_set_opacity(int /*long*/ window, double opacity) { ++public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity); ++public static final void gtk_window_set_opacity(long /*int*/ window, double opacity) { + lock.lock(); + try { + _gtk_window_set_opacity(window, opacity); +@@ -13746,8 +13746,8 @@ + * @param widget cast=(GtkWidget *) + * @param tip_text cast=(const gchar *) + */ +-public static final native void _gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text); +-public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text) { ++public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text); ++public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) { + lock.lock(); + try { + _gtk_widget_set_tooltip_text(widget, tip_text); +@@ -13759,8 +13759,8 @@ + * @param widget cast=(GtkWidget *) + * @param parent_window cast=(GdkWindow *) + */ +-public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window); +-public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) { ++public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window); ++public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) { + lock.lock(); + try { + _gtk_widget_set_parent_window(widget, parent_window); +@@ -13772,8 +13772,8 @@ + * @param window cast=(GtkWindow *) + * @param resizable cast=(gboolean) + */ +-public static final native void _gtk_window_set_resizable(int /*long*/ window, boolean resizable); +-public static final void gtk_window_set_resizable(int /*long*/ window, boolean resizable) { ++public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable); ++public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) { + lock.lock(); + try { + _gtk_window_set_resizable(window, resizable); +@@ -13785,8 +13785,8 @@ + * @param window cast=(GtkWindow *) + * @param title cast=(const gchar *) + */ +-public static final native void _gtk_window_set_title(int /*long*/ window, byte[] title); +-public static final void gtk_window_set_title(int /*long*/ window, byte[] title) { ++public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title); ++public static final void gtk_window_set_title(long /*int*/ window, byte[] title) { + lock.lock(); + try { + _gtk_window_set_title(window, title); +@@ -13799,8 +13799,8 @@ + * @param window cast=(GtkWindow *) + * @param skips_taskbar cast=(gboolean) + */ +-public static final native void _gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar); +-public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar) { ++public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar); ++public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) { + lock.lock(); + try { + _gtk_window_set_skip_taskbar_hint(window, skips_taskbar); +@@ -13809,8 +13809,8 @@ + } + } + /** @param window cast=(GtkWindow *) */ +-public static final native void _gtk_window_set_type_hint(int /*long*/ window, int hint); +-public static final void gtk_window_set_type_hint(int /*long*/ window, int hint) { ++public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint); ++public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) { + lock.lock(); + try { + _gtk_window_set_type_hint(window, hint); +@@ -13822,8 +13822,8 @@ + * @param window cast=(GtkWindow *) + * @param parent cast=(GtkWindow *) + */ +-public static final native void _gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent); +-public static final void gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent) { ++public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent); ++public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) { + lock.lock(); + try { + _gtk_window_set_transient_for(window, parent); +@@ -13832,8 +13832,8 @@ + } + } + /** @param handle cast=(GtkWindow *) */ +-public static final native void _gtk_window_unmaximize(int /*long*/ handle); +-public static final void gtk_window_unmaximize(int /*long*/ handle) { ++public static final native void _gtk_window_unmaximize(long /*int*/ handle); ++public static final void gtk_window_unmaximize(long /*int*/ handle) { + lock.lock(); + try { + _gtk_window_unmaximize(handle); +@@ -13846,261 +13846,261 @@ + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GInterfaceInfo src, int size); ++public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *),flags=no_out + */ +-public static final native void memmove(int /*long*/ dest, GObjectClass src); ++public static final native void memmove(long /*int*/ dest, GObjectClass src); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GTypeInfo src, int size); ++public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GtkTargetEntry src, int /*long*/ size); ++public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + */ +-public static final native void memmove(int /*long*/ dest, GtkAdjustment src); ++public static final native void memmove(long /*int*/ dest, GtkAdjustment src); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GdkEventButton src, int /*long*/ size); ++public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GdkEventExpose src, int /*long*/ size); ++public static final native void memmove(long /*int*/ dest, GdkEventExpose src, long /*int*/ size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, GdkEventMotion src, int /*long*/ size); ++public static final native void memmove(long /*int*/ dest, GdkEventMotion src, long /*int*/ size); + /** @param src flags=no_out */ +-public static final native void memmove(int /*long*/ dest, GtkWidgetClass src); ++public static final native void memmove(long /*int*/ dest, GtkWidgetClass src); + /** + * @param dest cast=(void *) + * @param src cast=(const void *),flags=no_out + * @param size cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, PangoAttribute src, int /*long*/ size); ++public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GObjectClass dest, int /*long*/ src); ++public static final native void memmove(GObjectClass dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GTypeQuery dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GtkColorSelectionDialog dest, int /*long*/ src); ++public static final native void memmove(GtkColorSelectionDialog dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GtkFileSelection dest, int /*long*/ src); ++public static final native void memmove(GtkFileSelection dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GdkEventProperty dest, int /*long*/ src); ++public static final native void memmove(GdkEventProperty dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GtkSelectionData dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GtkSelectionData dest, long /*int*/ src, long /*int*/ size); + /** @param dest flags=no_in */ +-public static final native void memmove(GtkWidgetClass dest, int /*long*/ src); ++public static final native void memmove(GtkWidgetClass dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GtkTargetPair dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GtkTargetPair dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GtkCombo dest, int /*long*/ src); ++public static final native void memmove(GtkCombo dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GtkAdjustment dest, int /*long*/ src); ++public static final native void memmove(GtkAdjustment dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GtkBorder dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkColor dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkColor dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEvent dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEvent dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventAny dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventAny dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventButton dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventCrossing dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventExpose dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventFocus dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventKey dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventMotion dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventScroll dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventScroll dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventVisibility dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkEventVisibility dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkEventWindowState dest, int /*long*/ src, int /*long*/ size); +-public static final native void memmove(int /*long*/ dest, GtkCellRendererClass src); +-public static final native void memmove(GtkCellRendererClass dest, int /*long*/ src); ++public static final native void memmove(GdkEventWindowState dest, long /*int*/ src, long /*int*/ size); ++public static final native void memmove(long /*int*/ dest, GtkCellRendererClass src); ++public static final native void memmove(GtkCellRendererClass dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GtkFixed dest, int /*long*/ src); ++public static final native void memmove(GtkFixed dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *),flags=no_out + */ +-public static final native void memmove(int /*long*/ dest, GtkFixed src); ++public static final native void memmove(long /*int*/ dest, GtkFixed src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GdkVisual dest, int /*long*/ src); ++public static final native void memmove(GdkVisual dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + */ +-public static final native void memmove(GdkImage dest, int /*long*/ src); ++public static final native void memmove(GdkImage dest, long /*int*/ src); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(GdkRectangle dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoAttribute dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoAttrColor dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoAttrInt dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoItem dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoLayoutLine dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size); ++public static final native void memmove(PangoLayoutRun dest, long /*int*/ src, long /*int*/ size); + /** + * @param dest cast=(void *),flags=no_in + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size); +-public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue); +-public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) { ++public static final native void memmove(PangoLogAttr dest, long /*int*/ src, long /*int*/ size); ++public static final native long /*int*/ _pango_attr_background_new (short red, short green, short blue); ++public static final long /*int*/ pango_attr_background_new (short red, short green, short blue) { + lock.lock(); + try { + return _pango_attr_background_new(red, green, blue); +@@ -14109,8 +14109,8 @@ + } + } + /** @param desc cast=(const PangoFontDescription *) */ +-public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc); +-public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) { ++public static final native long /*int*/ _pango_attr_font_desc_new(long /*int*/ desc); ++public static final long /*int*/ pango_attr_font_desc_new(long /*int*/ desc) { + lock.lock(); + try { + return _pango_attr_font_desc_new(desc); +@@ -14118,8 +14118,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_foreground_new (short red, short green, short blue); +-public static final int /*long*/ pango_attr_foreground_new (short red, short green, short blue) { ++public static final native long /*int*/ _pango_attr_foreground_new (short red, short green, short blue); ++public static final long /*int*/ pango_attr_foreground_new (short red, short green, short blue) { + lock.lock(); + try { + return _pango_attr_foreground_new(red, green, blue); +@@ -14127,8 +14127,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_rise_new(int rise); +-public static final int /*long*/ pango_attr_rise_new(int rise) { ++public static final native long /*int*/ _pango_attr_rise_new(int rise); ++public static final long /*int*/ pango_attr_rise_new(int rise) { + lock.lock(); + try { + return _pango_attr_rise_new(rise); +@@ -14140,8 +14140,8 @@ + * @param ink_rect flags=no_out + * @param logical_rect flags=no_out + */ +-public static final native int /*long*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect); +-public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) { ++public static final native long /*int*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect); ++public static final long /*int*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) { + lock.lock(); + try { + return _pango_attr_shape_new(ink_rect, logical_rect); +@@ -14153,8 +14153,8 @@ + * @param list cast=(PangoAttrList *) + * @param attr cast=(PangoAttribute *) + */ +-public static final native void _pango_attr_list_insert(int /*long*/ list, int /*long*/ attr); +-public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/ attr) { ++public static final native void _pango_attr_list_insert(long /*int*/ list, long /*int*/ attr); ++public static final void pango_attr_list_insert(long /*int*/ list, long /*int*/ attr) { + lock.lock(); + try { + _pango_attr_list_insert(list, attr); +@@ -14166,8 +14166,8 @@ + * @param list cast=(PangoAttrList *) + * @param attr cast=(PangoAttribute *) + */ +-public static final native void _pango_attr_list_change(int /*long*/ list, int /*long*/ attr); +-public static final void pango_attr_list_change(int /*long*/ list, int /*long*/ attr) { ++public static final native void _pango_attr_list_change(long /*int*/ list, long /*int*/ attr); ++public static final void pango_attr_list_change(long /*int*/ list, long /*int*/ attr) { + lock.lock(); + try { + _pango_attr_list_change(list, attr); +@@ -14176,8 +14176,8 @@ + } + } + /** @param list cast=(PangoAttrList *) */ +-public static final native int /*long*/ _pango_attr_list_get_iterator(int /*long*/ list); +-public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list) { ++public static final native long /*int*/ _pango_attr_list_get_iterator(long /*int*/ list); ++public static final long /*int*/ pango_attr_list_get_iterator(long /*int*/ list) { + lock.lock(); + try { + return _pango_attr_list_get_iterator(list); +@@ -14186,8 +14186,8 @@ + } + } + /** @param iterator cast=(PangoAttrIterator *) */ +-public static final native boolean _pango_attr_iterator_next(int /*long*/ iterator); +-public static final boolean pango_attr_iterator_next(int /*long*/ iterator) { ++public static final native boolean _pango_attr_iterator_next(long /*int*/ iterator); ++public static final boolean pango_attr_iterator_next(long /*int*/ iterator) { + lock.lock(); + try { + return _pango_attr_iterator_next(iterator); +@@ -14196,8 +14196,8 @@ + } + } + /** @param iterator cast=(PangoAttrIterator *) */ +-public static final native void _pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end); +-public static final void pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end) { ++public static final native void _pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end); ++public static final void pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end) { + lock.lock(); + try { + _pango_attr_iterator_range(iterator, start, end); +@@ -14209,8 +14209,8 @@ + * @param iterator cast=(PangoAttrIterator *) + * @param type cast=(PangoAttrType) + */ +-public static final native int /*long*/ _pango_attr_iterator_get(int /*long*/ iterator, int type); +-public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator, int type) { ++public static final native long /*int*/ _pango_attr_iterator_get(long /*int*/ iterator, int type); ++public static final long /*int*/ pango_attr_iterator_get(long /*int*/ iterator, int type) { + lock.lock(); + try { + return _pango_attr_iterator_get(iterator, type); +@@ -14219,8 +14219,8 @@ + } + } + /** @param iterator cast=(PangoAttrIterator *) */ +-public static final native int /*long*/ _pango_attr_iterator_get_attrs(int /*long*/ iterator); +-public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iterator) { ++public static final native long /*int*/ _pango_attr_iterator_get_attrs(long /*int*/ iterator); ++public static final long /*int*/ pango_attr_iterator_get_attrs(long /*int*/ iterator) { + lock.lock(); + try { + return _pango_attr_iterator_get_attrs(iterator); +@@ -14230,8 +14230,8 @@ + } + + /** @param iterator cast=(PangoAttrIterator *) */ +-public static final native void _pango_attr_iterator_destroy(int /*long*/ iterator); +-public static final void pango_attr_iterator_destroy(int /*long*/ iterator) { ++public static final native void _pango_attr_iterator_destroy(long /*int*/ iterator); ++public static final void pango_attr_iterator_destroy(long /*int*/ iterator) { + lock.lock(); + try { + _pango_attr_iterator_destroy(iterator); +@@ -14239,8 +14239,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_list_new(); +-public static final int /*long*/ pango_attr_list_new() { ++public static final native long /*int*/ _pango_attr_list_new(); ++public static final long /*int*/ pango_attr_list_new() { + lock.lock(); + try { + return _pango_attr_list_new(); +@@ -14249,8 +14249,8 @@ + } + } + /** @param list cast=(PangoAttrList *) */ +-public static final native void _pango_attr_list_unref(int /*long*/ list); +-public static final void pango_attr_list_unref(int /*long*/ list) { ++public static final native void _pango_attr_list_unref(long /*int*/ list); ++public static final void pango_attr_list_unref(long /*int*/ list) { + lock.lock(); + try { + _pango_attr_list_unref(list); +@@ -14259,8 +14259,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_attr_strikethrough_color_new(short red, short green, short blue); +-public static final int /*long*/ pango_attr_strikethrough_color_new(short red, short green, short blue) { ++public static final native long /*int*/ _pango_attr_strikethrough_color_new(short red, short green, short blue); ++public static final long /*int*/ pango_attr_strikethrough_color_new(short red, short green, short blue) { + lock.lock(); + try { + return _pango_attr_strikethrough_color_new(red, green, blue); +@@ -14268,8 +14268,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_strikethrough_new(boolean strikethrough); +-public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethrough) { ++public static final native long /*int*/ _pango_attr_strikethrough_new(boolean strikethrough); ++public static final long /*int*/ pango_attr_strikethrough_new(boolean strikethrough) { + lock.lock(); + try { + return _pango_attr_strikethrough_new(strikethrough); +@@ -14278,8 +14278,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_attr_underline_color_new(short red, short green, short blue); +-public static final int /*long*/ pango_attr_underline_color_new(short red, short green, short blue) { ++public static final native long /*int*/ _pango_attr_underline_color_new(short red, short green, short blue); ++public static final long /*int*/ pango_attr_underline_color_new(short red, short green, short blue) { + lock.lock(); + try { + return _pango_attr_underline_color_new(red, green, blue); +@@ -14287,8 +14287,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_underline_new(int underline); +-public static final int /*long*/ pango_attr_underline_new(int underline) { ++public static final native long /*int*/ _pango_attr_underline_new(int underline); ++public static final long /*int*/ pango_attr_underline_new(int underline) { + lock.lock(); + try { + return _pango_attr_underline_new(underline); +@@ -14296,8 +14296,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_attr_weight_new(int weight); +-public static final int /*long*/ pango_attr_weight_new(int weight) { ++public static final native long /*int*/ _pango_attr_weight_new(int weight); ++public static final long /*int*/ pango_attr_weight_new(int weight) { + lock.lock(); + try { + return _pango_attr_weight_new(weight); +@@ -14306,8 +14306,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_cairo_font_map_get_default(); +-public static final int /*long*/ pango_cairo_font_map_get_default() { ++public static final native long /*int*/ _pango_cairo_font_map_get_default(); ++public static final long /*int*/ pango_cairo_font_map_get_default() { + lock.lock(); + try { + return _pango_cairo_font_map_get_default(); +@@ -14316,8 +14316,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_cairo_font_map_new(); +-public static final int /*long*/ pango_cairo_font_map_new() { ++public static final native long /*int*/ _pango_cairo_font_map_new(); ++public static final long /*int*/ pango_cairo_font_map_new() { + lock.lock(); + try { + return _pango_cairo_font_map_new(); +@@ -14326,8 +14326,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_cairo_font_map_create_context(int /*long*/ fontmap); +-public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*/ fontmap) { ++public static final native long /*int*/ _pango_cairo_font_map_create_context(long /*int*/ fontmap); ++public static final long /*int*/ pango_cairo_font_map_create_context(long /*int*/ fontmap) { + lock.lock(); + try { + return _pango_cairo_font_map_create_context(fontmap); +@@ -14336,8 +14336,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int /*long*/ _pango_cairo_create_layout(int /*long*/ cairo); +-public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) { ++public static final native long /*int*/ _pango_cairo_create_layout(long /*int*/ cairo); ++public static final long /*int*/ pango_cairo_create_layout(long /*int*/ cairo) { + lock.lock(); + try { + return _pango_cairo_create_layout(cairo); +@@ -14349,8 +14349,8 @@ + * @method flags=dynamic + * @param context cast=(PangoContext *) + */ +-public static final native int /*long*/ _pango_cairo_context_get_font_options(int /*long*/ context); +-public static final int /*long*/ pango_cairo_context_get_font_options(int /*long*/ context) { ++public static final native long /*int*/ _pango_cairo_context_get_font_options(long /*int*/ context); ++public static final long /*int*/ pango_cairo_context_get_font_options(long /*int*/ context) { + lock.lock(); + try { + return _pango_cairo_context_get_font_options(context); +@@ -14362,8 +14362,8 @@ + * @method flags=dynamic + * @param context cast=(PangoContext *) + */ +-public static final native void _pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options); +-public static final void pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options) { ++public static final native void _pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options); ++public static final void pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options) { + lock.lock(); + try { + _pango_cairo_context_set_font_options(context, options); +@@ -14372,8 +14372,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi); +-public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi) { ++public static final native void _pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi); ++public static final void pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi) { + lock.lock(); + try { + _pango_cairo_font_map_set_resolution(fontmap, dpi); +@@ -14382,8 +14382,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout); +-public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout) { ++public static final native void _pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout); ++public static final void pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout) { + lock.lock(); + try { + _pango_cairo_layout_path(cairo, layout); +@@ -14392,8 +14392,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout); +-public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout) { ++public static final native void _pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout); ++public static final void pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout) { + lock.lock(); + try { + _pango_cairo_show_layout(cairo, layout); +@@ -14402,8 +14402,8 @@ + } + } + /** @param context cast=(PangoContext *) */ +-public static final native int _pango_context_get_base_dir(int /*long*/ context); +-public static final int pango_context_get_base_dir(int /*long*/ context) { ++public static final native int _pango_context_get_base_dir(long /*int*/ context); ++public static final int pango_context_get_base_dir(long /*int*/ context) { + lock.lock(); + try { + return _pango_context_get_base_dir(context); +@@ -14412,8 +14412,8 @@ + } + } + /** @param context cast=(PangoContext *) */ +-public static final native int /*long*/ _pango_context_get_language(int /*long*/ context); +-public static final int /*long*/ pango_context_get_language(int /*long*/ context) { ++public static final native long /*int*/ _pango_context_get_language(long /*int*/ context); ++public static final long /*int*/ pango_context_get_language(long /*int*/ context) { + lock.lock(); + try { + return _pango_context_get_language(context); +@@ -14426,8 +14426,8 @@ + * @param desc cast=(const PangoFontDescription *) + * @param language cast=(PangoLanguage *) + */ +-public static final native int /*long*/ _pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language); +-public static final int /*long*/ pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language) { ++public static final native long /*int*/ _pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language); ++public static final long /*int*/ pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language) { + lock.lock(); + try { + return _pango_context_get_metrics(context, desc, language); +@@ -14440,8 +14440,8 @@ + * @param families cast=(PangoFontFamily ***) + * @param n_families cast=(int *) + */ +-public static final native void _pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families); +-public static final void pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families) { ++public static final native void _pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families); ++public static final void pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families) { + lock.lock(); + try { + _pango_context_list_families(context, families, n_families); +@@ -14450,8 +14450,8 @@ + } + } + /** @param context cast=(PangoContext *) */ +-public static final native void _pango_context_set_base_dir(int /*long*/ context, int direction); +-public static final void pango_context_set_base_dir(int /*long*/ context, int direction) { ++public static final native void _pango_context_set_base_dir(long /*int*/ context, int direction); ++public static final void pango_context_set_base_dir(long /*int*/ context, int direction) { + lock.lock(); + try { + _pango_context_set_base_dir(context, direction); +@@ -14463,8 +14463,8 @@ + * @param context cast=(PangoContext *) + * @param language cast=(PangoLanguage *) + */ +-public static final native void _pango_context_set_language(int /*long*/ context, int /*long*/ language); +-public static final void pango_context_set_language(int /*long*/ context, int /*long*/ language) { ++public static final native void _pango_context_set_language(long /*int*/ context, long /*int*/ language); ++public static final void pango_context_set_language(long /*int*/ context, long /*int*/ language) { + lock.lock(); + try { + _pango_context_set_language(context, language); +@@ -14473,8 +14473,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int /*long*/ _pango_font_description_copy(int /*long*/ desc); +-public static final int /*long*/ pango_font_description_copy(int /*long*/ desc) { ++public static final native long /*int*/ _pango_font_description_copy(long /*int*/ desc); ++public static final long /*int*/ pango_font_description_copy(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_copy(desc); +@@ -14483,8 +14483,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native void _pango_font_description_free(int /*long*/ desc); +-public static final void pango_font_description_free(int /*long*/ desc) { ++public static final native void _pango_font_description_free(long /*int*/ desc); ++public static final void pango_font_description_free(long /*int*/ desc) { + lock.lock(); + try { + _pango_font_description_free(desc); +@@ -14493,8 +14493,8 @@ + } + } + /** @param str cast=(const char *),flags=no_out critical */ +-public static final native int /*long*/ _pango_font_description_from_string(byte[] str); +-public static final int /*long*/ pango_font_description_from_string(byte[] str) { ++public static final native long /*int*/ _pango_font_description_from_string(byte[] str); ++public static final long /*int*/ pango_font_description_from_string(byte[] str) { + lock.lock(); + try { + return _pango_font_description_from_string(str); +@@ -14503,8 +14503,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int /*long*/ _pango_font_description_get_family(int /*long*/ desc); +-public static final int /*long*/ pango_font_description_get_family(int /*long*/ desc) { ++public static final native long /*int*/ _pango_font_description_get_family(long /*int*/ desc); ++public static final long /*int*/ pango_font_description_get_family(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_family(desc); +@@ -14513,8 +14513,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int _pango_font_description_get_size(int /*long*/ desc); +-public static final int pango_font_description_get_size(int /*long*/ desc) { ++public static final native int _pango_font_description_get_size(long /*int*/ desc); ++public static final int pango_font_description_get_size(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_size(desc); +@@ -14523,8 +14523,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int _pango_font_description_get_stretch(int /*long*/ desc); +-public static final int pango_font_description_get_stretch(int /*long*/ desc) { ++public static final native int _pango_font_description_get_stretch(long /*int*/ desc); ++public static final int pango_font_description_get_stretch(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_stretch(desc); +@@ -14533,8 +14533,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int _pango_font_description_get_variant(int /*long*/ desc); +-public static final int pango_font_description_get_variant(int /*long*/ desc) { ++public static final native int _pango_font_description_get_variant(long /*int*/ desc); ++public static final int pango_font_description_get_variant(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_variant(desc); +@@ -14543,8 +14543,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int _pango_font_description_get_style(int /*long*/ desc); +-public static final int pango_font_description_get_style(int /*long*/ desc) { ++public static final native int _pango_font_description_get_style(long /*int*/ desc); ++public static final int pango_font_description_get_style(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_style(desc); +@@ -14553,8 +14553,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int _pango_font_description_get_weight(int /*long*/ desc); +-public static final int pango_font_description_get_weight(int /*long*/ desc) { ++public static final native int _pango_font_description_get_weight(long /*int*/ desc); ++public static final int pango_font_description_get_weight(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_get_weight(desc); +@@ -14562,8 +14562,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _pango_font_description_new(); +-public static final int /*long*/ pango_font_description_new() { ++public static final native long /*int*/ _pango_font_description_new(); ++public static final long /*int*/ pango_font_description_new() { + lock.lock(); + try { + return _pango_font_description_new(); +@@ -14575,8 +14575,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param family cast=(const char *),flags=no_out critical + */ +-public static final native void _pango_font_description_set_family(int /*long*/ desc, byte[] family); +-public static final void pango_font_description_set_family(int /*long*/ desc, byte[] family) { ++public static final native void _pango_font_description_set_family(long /*int*/ desc, byte[] family); ++public static final void pango_font_description_set_family(long /*int*/ desc, byte[] family) { + lock.lock(); + try { + _pango_font_description_set_family(desc, family); +@@ -14588,8 +14588,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param size cast=(gint) + */ +-public static final native void _pango_font_description_set_size(int /*long*/ desc, int size); +-public static final void pango_font_description_set_size(int /*long*/ desc, int size) { ++public static final native void _pango_font_description_set_size(long /*int*/ desc, int size); ++public static final void pango_font_description_set_size(long /*int*/ desc, int size) { + lock.lock(); + try { + _pango_font_description_set_size(desc, size); +@@ -14601,8 +14601,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param stretch cast=(PangoStretch) + */ +-public static final native void _pango_font_description_set_stretch(int /*long*/ desc, int stretch); +-public static final void pango_font_description_set_stretch(int /*long*/ desc, int stretch) { ++public static final native void _pango_font_description_set_stretch(long /*int*/ desc, int stretch); ++public static final void pango_font_description_set_stretch(long /*int*/ desc, int stretch) { + lock.lock(); + try { + _pango_font_description_set_stretch(desc, stretch); +@@ -14614,8 +14614,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param weight cast=(PangoStyle) + */ +-public static final native void _pango_font_description_set_style(int /*long*/ desc, int weight); +-public static final void pango_font_description_set_style(int /*long*/ desc, int weight) { ++public static final native void _pango_font_description_set_style(long /*int*/ desc, int weight); ++public static final void pango_font_description_set_style(long /*int*/ desc, int weight) { + lock.lock(); + try { + _pango_font_description_set_style(desc, weight); +@@ -14627,8 +14627,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param weight cast=(PangoWeight) + */ +-public static final native void _pango_font_description_set_weight(int /*long*/ desc, int weight); +-public static final void pango_font_description_set_weight(int /*long*/ desc, int weight) { ++public static final native void _pango_font_description_set_weight(long /*int*/ desc, int weight); ++public static final void pango_font_description_set_weight(long /*int*/ desc, int weight) { + lock.lock(); + try { + _pango_font_description_set_weight(desc, weight); +@@ -14640,8 +14640,8 @@ + * @param desc cast=(PangoFontDescription *) + * @param variant cast=(PangoVariant) + */ +-public static final native void _pango_font_description_set_variant(int /*long*/ desc, int variant); +-public static final void pango_font_description_set_variant(int /*long*/ desc, int variant) { ++public static final native void _pango_font_description_set_variant(long /*int*/ desc, int variant); ++public static final void pango_font_description_set_variant(long /*int*/ desc, int variant) { + lock.lock(); + try { + _pango_font_description_set_variant(desc, variant); +@@ -14650,8 +14650,8 @@ + } + } + /** @param desc cast=(PangoFontDescription *) */ +-public static final native int /*long*/ _pango_font_description_to_string(int /*long*/ desc); +-public static final int /*long*/ pango_font_description_to_string(int /*long*/ desc) { ++public static final native long /*int*/ _pango_font_description_to_string(long /*int*/ desc); ++public static final long /*int*/ pango_font_description_to_string(long /*int*/ desc) { + lock.lock(); + try { + return _pango_font_description_to_string(desc); +@@ -14660,8 +14660,8 @@ + } + } + /** @param face cast=(PangoFontFace *) */ +-public static final native int /*long*/ _pango_font_face_describe(int /*long*/ face); +-public static final int /*long*/ pango_font_face_describe(int /*long*/ face) { ++public static final native long /*int*/ _pango_font_face_describe(long /*int*/ face); ++public static final long /*int*/ pango_font_face_describe(long /*int*/ face) { + lock.lock(); + try { + return _pango_font_face_describe(face); +@@ -14670,8 +14670,8 @@ + } + } + /** @param family cast=(PangoFontFamily *) */ +-public static final native int /*long*/ _pango_font_family_get_name(int /*long*/ family); +-public static final int /*long*/ pango_font_family_get_name(int /*long*/ family) { ++public static final native long /*int*/ _pango_font_family_get_name(long /*int*/ family); ++public static final long /*int*/ pango_font_family_get_name(long /*int*/ family) { + lock.lock(); + try { + return _pango_font_family_get_name(family); +@@ -14684,8 +14684,8 @@ + * @param faces cast=(PangoFontFace ***) + * @param n_faces cast=(int *) + */ +-public static final native void _pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces); +-public static final void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces) { ++public static final native void _pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces); ++public static final void pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces) { + lock.lock(); + try { + _pango_font_family_list_faces(family, faces, n_faces); +@@ -14697,8 +14697,8 @@ + * @param font cast=(PangoFont *) + * @param language cast=(PangoLanguage *) + */ +-public static final native int /*long*/ _pango_font_get_metrics(int /*long*/ font, int /*long*/ language); +-public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /*long*/ language) { ++public static final native long /*int*/ _pango_font_get_metrics(long /*int*/ font, long /*int*/ language); ++public static final long /*int*/ pango_font_get_metrics(long /*int*/ font, long /*int*/ language) { + lock.lock(); + try { + return _pango_font_get_metrics(font, language); +@@ -14707,8 +14707,8 @@ + } + } + /** @param metrics cast=(PangoFontMetrics *) */ +-public static final native int _pango_font_metrics_get_approximate_char_width(int /*long*/ metrics); +-public static final int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_approximate_char_width(long /*int*/ metrics); ++public static final int pango_font_metrics_get_approximate_char_width(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_approximate_char_width(metrics); +@@ -14717,8 +14717,8 @@ + } + } + /** @param metrics cast=(PangoFontMetrics *) */ +-public static final native int _pango_font_metrics_get_ascent(int /*long*/ metrics); +-public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_ascent(long /*int*/ metrics); ++public static final int pango_font_metrics_get_ascent(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_ascent(metrics); +@@ -14727,8 +14727,8 @@ + } + } + /** @param metrics cast=(PangoFontMetrics *) */ +-public static final native int _pango_font_metrics_get_descent(int /*long*/ metrics); +-public static final int pango_font_metrics_get_descent(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_descent(long /*int*/ metrics); ++public static final int pango_font_metrics_get_descent(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_descent(metrics); +@@ -14737,8 +14737,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int _pango_font_metrics_get_underline_thickness(int /*long*/ metrics); +-public static final int pango_font_metrics_get_underline_thickness(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_underline_thickness(long /*int*/ metrics); ++public static final int pango_font_metrics_get_underline_thickness(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_underline_thickness(metrics); +@@ -14747,8 +14747,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int _pango_font_metrics_get_underline_position(int /*long*/ metrics); +-public static final int pango_font_metrics_get_underline_position(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_underline_position(long /*int*/ metrics); ++public static final int pango_font_metrics_get_underline_position(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_underline_position(metrics); +@@ -14757,8 +14757,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int _pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics); +-public static final int pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics); ++public static final int pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_strikethrough_thickness(metrics); +@@ -14767,8 +14767,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native int _pango_font_metrics_get_strikethrough_position(int /*long*/ metrics); +-public static final int pango_font_metrics_get_strikethrough_position(int /*long*/ metrics) { ++public static final native int _pango_font_metrics_get_strikethrough_position(long /*int*/ metrics); ++public static final int pango_font_metrics_get_strikethrough_position(long /*int*/ metrics) { + lock.lock(); + try { + return _pango_font_metrics_get_strikethrough_position(metrics); +@@ -14777,8 +14777,8 @@ + } + } + /** @param metrics cast=(PangoFontMetrics *) */ +-public static final native void _pango_font_metrics_unref(int /*long*/ metrics); +-public static final void pango_font_metrics_unref(int /*long*/ metrics) { ++public static final native void _pango_font_metrics_unref(long /*int*/ metrics); ++public static final void pango_font_metrics_unref(long /*int*/ metrics) { + lock.lock(); + try { + _pango_font_metrics_unref(metrics); +@@ -14787,8 +14787,8 @@ + } + } + /** @param language cast=(const char *),flags=no_out */ +-public static final native int /*long*/ _pango_language_from_string(byte[] language); +-public static final int /*long*/ pango_language_from_string(byte[] language) { ++public static final native long /*int*/ _pango_language_from_string(byte[] language); ++public static final long /*int*/ pango_language_from_string(byte[] language) { + lock.lock(); + try { + return _pango_language_from_string(language); +@@ -14797,8 +14797,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native void _pango_layout_context_changed(int /*long*/ layout); +-public static final void pango_layout_context_changed(int /*long*/ layout) { ++public static final native void _pango_layout_context_changed(long /*int*/ layout); ++public static final void pango_layout_context_changed(long /*int*/ layout) { + lock.lock(); + try { + _pango_layout_context_changed(layout); +@@ -14807,8 +14807,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int _pango_layout_get_alignment(int /*long*/ layout); +-public static final int pango_layout_get_alignment(int /*long*/ layout) { ++public static final native int _pango_layout_get_alignment(long /*int*/ layout); ++public static final int pango_layout_get_alignment(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_alignment(layout); +@@ -14817,8 +14817,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native int /*long*/ _pango_layout_get_context(int /*long*/ layout); +-public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) { ++public static final native long /*int*/ _pango_layout_get_context(long /*int*/ layout); ++public static final long /*int*/ pango_layout_get_context(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_context(layout); +@@ -14827,8 +14827,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native int /*long*/ _pango_layout_get_attributes(int /*long*/ layout); +-public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout) { ++public static final native long /*int*/ _pango_layout_get_attributes(long /*int*/ layout); ++public static final long /*int*/ pango_layout_get_attributes(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_attributes(layout); +@@ -14837,8 +14837,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int _pango_layout_get_indent(int /*long*/ layout); +-public static final int pango_layout_get_indent(int /*long*/ layout) { ++public static final native int _pango_layout_get_indent(long /*int*/ layout); ++public static final int pango_layout_get_indent(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_indent(layout); +@@ -14847,8 +14847,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int /*long*/ _pango_layout_get_iter(int /*long*/ layout); +-public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) { ++public static final native long /*int*/ _pango_layout_get_iter(long /*int*/ layout); ++public static final long /*int*/ pango_layout_get_iter(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_iter(layout); +@@ -14857,8 +14857,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native boolean _pango_layout_get_justify(int /*long*/ layout); +-public static final boolean pango_layout_get_justify(int /*long*/ layout) { ++public static final native boolean _pango_layout_get_justify(long /*int*/ layout); ++public static final boolean pango_layout_get_justify(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_justify(layout); +@@ -14867,8 +14867,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native int /*long*/ _pango_layout_get_line(int /*long*/ layout, int line); +-public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int line) { ++public static final native long /*int*/ _pango_layout_get_line(long /*int*/ layout, int line); ++public static final long /*int*/ pango_layout_get_line(long /*int*/ layout, int line) { + lock.lock(); + try { + return _pango_layout_get_line(layout, line); +@@ -14877,8 +14877,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int _pango_layout_get_line_count(int /*long*/ layout); +-public static final int pango_layout_get_line_count(int /*long*/ layout) { ++public static final native int _pango_layout_get_line_count(long /*int*/ layout); ++public static final int pango_layout_get_line_count(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_line_count(layout); +@@ -14891,8 +14891,8 @@ + * @param attrs cast=(PangoLogAttr **) + * @param n_attrs cast=(int *) + */ +-public static final native void _pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs); +-public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs) { ++public static final native void _pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs); ++public static final void pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs) { + lock.lock(); + try { + _pango_layout_get_log_attrs(layout, attrs, n_attrs); +@@ -14905,8 +14905,8 @@ + * @param width cast=(int *) + * @param height cast=(int *) + */ +-public static final native void _pango_layout_get_size(int /*long*/ layout, int[] width, int[] height); +-public static final void pango_layout_get_size(int /*long*/ layout, int[] width, int[] height) { ++public static final native void _pango_layout_get_size(long /*int*/ layout, int[] width, int[] height); ++public static final void pango_layout_get_size(long /*int*/ layout, int[] width, int[] height) { + lock.lock(); + try { + _pango_layout_get_size(layout, width, height); +@@ -14915,8 +14915,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int _pango_layout_get_spacing(int /*long*/ layout); +-public static final int pango_layout_get_spacing(int /*long*/ layout) { ++public static final native int _pango_layout_get_spacing(long /*int*/ layout); ++public static final int pango_layout_get_spacing(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_spacing(layout); +@@ -14925,8 +14925,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native int /*long*/ _pango_layout_get_tabs(int /*long*/ layout); +-public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) { ++public static final native long /*int*/ _pango_layout_get_tabs(long /*int*/ layout); ++public static final long /*int*/ pango_layout_get_tabs(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_tabs(layout); +@@ -14935,8 +14935,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native int /*long*/ _pango_layout_get_text(int /*long*/ layout); +-public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) { ++public static final native long /*int*/ _pango_layout_get_text(long /*int*/ layout); ++public static final long /*int*/ pango_layout_get_text(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_text(layout); +@@ -14945,8 +14945,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native int _pango_layout_get_width(int /*long*/ layout); +-public static final int pango_layout_get_width(int /*long*/ layout) { ++public static final native int _pango_layout_get_width(long /*int*/ layout); ++public static final int pango_layout_get_width(long /*int*/ layout) { + lock.lock(); + try { + return _pango_layout_get_width(layout); +@@ -14958,8 +14958,8 @@ + * @param layout cast=(PangoLayout*) + * @param pos flags=no_in + */ +-public static final native void _pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos); +-public static final void pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos) { ++public static final native void _pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos); ++public static final void pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos) { + lock.lock(); + try { + _pango_layout_index_to_pos(layout, index, pos); +@@ -14968,8 +14968,8 @@ + } + } + /** @param iter cast=(PangoLayoutIter*) */ +-public static final native void _pango_layout_iter_free(int /*long*/ iter); +-public static final void pango_layout_iter_free(int /*long*/ iter) { ++public static final native void _pango_layout_iter_free(long /*int*/ iter); ++public static final void pango_layout_iter_free(long /*int*/ iter) { + lock.lock(); + try { + _pango_layout_iter_free(iter); +@@ -14982,8 +14982,8 @@ + * @param ink_rect flags=no_in + * @param logical_rect flags=no_in + */ +-public static final native void _pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect); +-public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) { ++public static final native void _pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect); ++public static final void pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) { + lock.lock(); + try { + _pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect); +@@ -14992,8 +14992,8 @@ + } + } + /** @param iter cast=(PangoLayoutIter*) */ +-public static final native int _pango_layout_iter_get_index(int /*long*/ iter); +-public static final int pango_layout_iter_get_index(int /*long*/ iter) { ++public static final native int _pango_layout_iter_get_index(long /*int*/ iter); ++public static final int pango_layout_iter_get_index(long /*int*/ iter) { + lock.lock(); + try { + return _pango_layout_iter_get_index(iter); +@@ -15002,8 +15002,8 @@ + } + } + /** @param iter cast=(PangoLayoutIter*) */ +-public static final native int /*long*/ _pango_layout_iter_get_run(int /*long*/ iter); +-public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) { ++public static final native long /*int*/ _pango_layout_iter_get_run(long /*int*/ iter); ++public static final long /*int*/ pango_layout_iter_get_run(long /*int*/ iter) { + lock.lock(); + try { + return _pango_layout_iter_get_run(iter); +@@ -15012,8 +15012,8 @@ + } + } + /** @param iter cast=(PangoLayoutIter*) */ +-public static final native boolean _pango_layout_iter_next_line(int /*long*/ iter); +-public static final boolean pango_layout_iter_next_line(int /*long*/ iter) { ++public static final native boolean _pango_layout_iter_next_line(long /*int*/ iter); ++public static final boolean pango_layout_iter_next_line(long /*int*/ iter) { + lock.lock(); + try { + return _pango_layout_iter_next_line(iter); +@@ -15022,8 +15022,8 @@ + } + } + /** @param iter cast=(PangoLayoutIter*) */ +-public static final native boolean _pango_layout_iter_next_run(int /*long*/ iter); +-public static final boolean pango_layout_iter_next_run(int /*long*/ iter) { ++public static final native boolean _pango_layout_iter_next_run(long /*int*/ iter); ++public static final boolean pango_layout_iter_next_run(long /*int*/ iter) { + lock.lock(); + try { + return _pango_layout_iter_next_run(iter); +@@ -15036,8 +15036,8 @@ + * @param ink_rect cast=(PangoRectangle *),flags=no_in + * @param logical_rect cast=(PangoRectangle *),flags=no_in + */ +-public static final native void _pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect); +-public static final void pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) { ++public static final native void _pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect); ++public static final void pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) { + lock.lock(); + try { + _pango_layout_line_get_extents(line, ink_rect, logical_rect); +@@ -15050,8 +15050,8 @@ + * @param index_ cast=(int *) + * @param trailing cast=(int *) + */ +-public static final native boolean _pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing); +-public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing) { ++public static final native boolean _pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing); ++public static final boolean pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing) { + lock.lock(); + try { + return _pango_layout_line_x_to_index(line, x_pos, index_, trailing); +@@ -15060,8 +15060,8 @@ + } + } + /** @param context cast=(PangoContext *) */ +-public static final native int /*long*/ _pango_layout_new(int /*long*/ context); +-public static final int /*long*/ pango_layout_new(int /*long*/ context) { ++public static final native long /*int*/ _pango_layout_new(long /*int*/ context); ++public static final long /*int*/ pango_layout_new(long /*int*/ context) { + lock.lock(); + try { + return _pango_layout_new(context); +@@ -15070,8 +15070,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native void _pango_layout_set_alignment (int /*long*/ layout, int alignment); +-public static final void pango_layout_set_alignment (int /*long*/ layout, int alignment) { ++public static final native void _pango_layout_set_alignment (long /*int*/ layout, int alignment); ++public static final void pango_layout_set_alignment (long /*int*/ layout, int alignment) { + lock.lock(); + try { + _pango_layout_set_alignment(layout, alignment); +@@ -15083,8 +15083,8 @@ + * @param layout cast=(PangoLayout *) + * @param attrs cast=(PangoAttrList *) + */ +-public static final native void _pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs); +-public static final void pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs) { ++public static final native void _pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs); ++public static final void pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs) { + lock.lock(); + try { + _pango_layout_set_attributes(layout, attrs); +@@ -15093,8 +15093,8 @@ + } + } + /** @method flags=dynamic */ +-public static final native void _pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir); +-public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir) { ++public static final native void _pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir); ++public static final void pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir) { + lock.lock(); + try { + _pango_layout_set_auto_dir(layout, auto_dir); +@@ -15106,8 +15106,8 @@ + * @param context cast=(PangoLayout *) + * @param descr cast=(PangoFontDescription *) + */ +-public static final native void _pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr); +-public static final void pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr) { ++public static final native void _pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr); ++public static final void pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr) { + lock.lock(); + try { + _pango_layout_set_font_description(context, descr); +@@ -15116,8 +15116,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native void _pango_layout_set_indent(int /*long*/ layout, int indent); +-public static final void pango_layout_set_indent(int /*long*/ layout, int indent) { ++public static final native void _pango_layout_set_indent(long /*int*/ layout, int indent); ++public static final void pango_layout_set_indent(long /*int*/ layout, int indent) { + lock.lock(); + try { + _pango_layout_set_indent(layout, indent); +@@ -15126,8 +15126,8 @@ + } + } + /** @param layout cast=(PangoLayout*) */ +-public static final native void _pango_layout_set_justify(int /*long*/ layout, boolean justify); +-public static final void pango_layout_set_justify(int /*long*/ layout, boolean justify) { ++public static final native void _pango_layout_set_justify(long /*int*/ layout, boolean justify); ++public static final void pango_layout_set_justify(long /*int*/ layout, boolean justify) { + lock.lock(); + try { + _pango_layout_set_justify(layout, justify); +@@ -15139,8 +15139,8 @@ + * @param context cast=(PangoLayout *) + * @param setting cast=(gboolean) + */ +-public static final native void _pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting); +-public static final void pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting) { ++public static final native void _pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting); ++public static final void pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting) { + lock.lock(); + try { + _pango_layout_set_single_paragraph_mode(context, setting); +@@ -15149,8 +15149,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native void _pango_layout_set_spacing(int /*long*/ layout, int spacing); +-public static final void pango_layout_set_spacing(int /*long*/ layout, int spacing) { ++public static final native void _pango_layout_set_spacing(long /*int*/ layout, int spacing); ++public static final void pango_layout_set_spacing(long /*int*/ layout, int spacing) { + lock.lock(); + try { + _pango_layout_set_spacing(layout, spacing); +@@ -15162,8 +15162,8 @@ + * @param layout cast=(PangoLayout *) + * @param tabs cast=(PangoTabArray *) + */ +-public static final native void _pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs); +-public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs) { ++public static final native void _pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs); ++public static final void pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs) { + lock.lock(); + try { + _pango_layout_set_tabs(layout, tabs); +@@ -15176,8 +15176,8 @@ + * @param text cast=(const char *),flags=no_out critical + * @param length cast=(int) + */ +-public static final native void _pango_layout_set_text(int /*long*/ layout, byte[] text, int length); +-public static final void pango_layout_set_text(int /*long*/ layout, byte[] text, int length) { ++public static final native void _pango_layout_set_text(long /*int*/ layout, byte[] text, int length); ++public static final void pango_layout_set_text(long /*int*/ layout, byte[] text, int length) { + lock.lock(); + try { + _pango_layout_set_text(layout, text, length); +@@ -15186,8 +15186,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native void _pango_layout_set_width(int /*long*/ layout, int width); +-public static final void pango_layout_set_width(int /*long*/ layout, int width) { ++public static final native void _pango_layout_set_width(long /*int*/ layout, int width); ++public static final void pango_layout_set_width(long /*int*/ layout, int width) { + lock.lock(); + try { + _pango_layout_set_width(layout, width); +@@ -15196,8 +15196,8 @@ + } + } + /** @param layout cast=(PangoLayout *) */ +-public static final native void _pango_layout_set_wrap (int /*long*/ layout, int wrap); +-public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) { ++public static final native void _pango_layout_set_wrap (long /*int*/ layout, int wrap); ++public static final void pango_layout_set_wrap (long /*int*/ layout, int wrap) { + lock.lock(); + try { + _pango_layout_set_wrap(layout, wrap); +@@ -15210,8 +15210,8 @@ + * @param index cast=(int *) + * @param trailing cast=(int *) + */ +-public static final native boolean _pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing); +-public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing) { ++public static final native boolean _pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing); ++public static final boolean pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing) { + lock.lock(); + try { + return _pango_layout_xy_to_index(layout, x, y, index, trailing); +@@ -15220,8 +15220,8 @@ + } + } + /** @param tab_array cast=(PangoTabArray *) */ +-public static final native int _pango_tab_array_get_size(int /*long*/ tab_array); +-public static final int pango_tab_array_get_size(int /*long*/ tab_array) { ++public static final native int _pango_tab_array_get_size(long /*int*/ tab_array); ++public static final int pango_tab_array_get_size(long /*int*/ tab_array) { + lock.lock(); + try { + return _pango_tab_array_get_size(tab_array); +@@ -15234,8 +15234,8 @@ + * @param alignments cast=(PangoTabAlign **) + * @param locations cast=(int **) + */ +-public static final native void _pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations); +-public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations) { ++public static final native void _pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations); ++public static final void pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations) { + lock.lock(); + try { + _pango_tab_array_get_tabs(tab_array, alignments, locations); +@@ -15244,8 +15244,8 @@ + } + } + /** @param tab_array cast=(PangoTabArray *) */ +-public static final native void _pango_tab_array_free(int /*long*/ tab_array); +-public static final void pango_tab_array_free(int /*long*/ tab_array) { ++public static final native void _pango_tab_array_free(long /*int*/ tab_array); ++public static final void pango_tab_array_free(long /*int*/ tab_array) { + lock.lock(); + try { + _pango_tab_array_free(tab_array); +@@ -15257,8 +15257,8 @@ + * @param initial_size cast=(gint) + * @param positions_in_pixels cast=(gboolean) + */ +-public static final native int /*long*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels); +-public static final int /*long*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) { ++public static final native long /*int*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels); ++public static final long /*int*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) { + lock.lock(); + try { + return _pango_tab_array_new(initial_size, positions_in_pixels); +@@ -15272,8 +15272,8 @@ + * @param alignment cast=(PangoTabAlign) + * @param location cast=(gint) + */ +-public static final native void _pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location); +-public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location) { ++public static final native void _pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location); ++public static final void pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location) { + lock.lock(); + try { + _pango_tab_array_set_tab(tab_array, tab_index, alignment, location); +@@ -15287,8 +15287,8 @@ + * @param relationship cast=(AtkRelationType) + * @param target cast=(AtkObject *) + */ +-public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target); +-public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) { ++public static final native boolean _atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target); ++public static final boolean atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target) { + lock.lock(); + try { + return _atk_object_add_relationship(object, relationship, target); +@@ -15302,8 +15302,8 @@ + * @param relationship cast=(AtkRelationType) + * @param target cast=(AtkObject *) + */ +-public static final native boolean _atk_object_remove_relationship (int /*long*/ object, int relationship, int /*long*/ target); +-public static final boolean atk_object_remove_relationship (int /*long*/ object, int relationship, int /*long*/ target) { ++public static final native boolean _atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target); ++public static final boolean atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target) { + lock.lock(); + try { + return _atk_object_remove_relationship(object, relationship, target); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoAttribute.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoAttribute.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoAttribute.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoAttribute.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,7 +17,7 @@ + + public class PangoAttribute { + /** @field cast=(const PangoAttrClass *) */ +- public int /*long*/ klass; ++ public long /*int*/ klass; + public int start_index; + public int end_index; + public static final int sizeof = OS.PangoAttribute_sizeof(); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoItem.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoItem.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoItem.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoItem.java 2011-06-13 20:53:32.000000000 +0000 +@@ -19,16 +19,16 @@ + public int length; + public int num_chars; + /** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */ +- public int /*long*/ analysis_shape_engine; ++ public long /*int*/ analysis_shape_engine; + /** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */ +- public int /*long*/ analysis_lang_engine; ++ public long /*int*/ analysis_lang_engine; + /** @field accessor=analysis.font,cast=(PangoFont *) */ +- public int /*long*/ analysis_font; ++ public long /*int*/ analysis_font; + /** @field accessor=analysis.level */ + public byte analysis_level; + /** @field accessor=analysis.language,cast=(PangoLanguage *) */ +- public int /*long*/ analysis_language; ++ public long /*int*/ analysis_language; + /** @field accessor=analysis.extra_attrs,cast=(GSList *) */ +- public int /*long*/ analysis_extra_attrs; ++ public long /*int*/ analysis_extra_attrs; + public static final int sizeof = OS.PangoItem_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoLayoutLine.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoLayoutLine.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2011-06-13 20:53:32.000000000 +0000 +@@ -16,11 +16,11 @@ + + public class PangoLayoutLine { + /** @field cast=(PangoLayout *) */ +- public int /*long*/ layout; ++ public long /*int*/ layout; + public int start_index; + public int length; + /** @field cast=(GSList *) */ +- public int /*long*/ runs; ++ public long /*int*/ runs; + // public boolean is_paragraph_start; + // public byte resolved_dir; + public static final int sizeof = OS.PangoLayoutLine_sizeof(); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoLayoutRun.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoLayoutRun.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2011-06-13 20:53:32.000000000 +0000 +@@ -16,8 +16,8 @@ + + public class PangoLayoutRun { + /** @field cast=(PangoItem *) */ +- public int /*long*/ item; ++ public long /*int*/ item; + /** @field cast=(PangoGlyphString *) */ +- public int /*long*/ glyphs; ++ public long /*int*/ glyphs; + public static final int sizeof = OS.PangoLayoutRun_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XAnyEvent.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/XAnyEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XAnyEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/XAnyEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -12,11 +12,11 @@ + + + public abstract class XAnyEvent extends XEvent { +- public int /*long*/ serial; ++ public long /*int*/ serial; + public int send_event; + /** @field cast=(Display *) */ +- public int /*long*/ display; ++ public long /*int*/ display; + /** @field cast=(Window) */ +- public int /*long*/ window; ++ public long /*int*/ window; + public static final int sizeof = OS.XAnyEvent_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XClientMessageEvent.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/XClientMessageEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -13,16 +13,16 @@ + + public class XClientMessageEvent { + public int type; +- public int /*long*/ serial; ++ public long /*int*/ serial; + public boolean send_event; + /** @field cast=(Display *) */ +- public int /*long*/ display; ++ public long /*int*/ display; + /** @field cast=(Window) */ +- public int /*long*/ window; ++ public long /*int*/ window; + /** @field cast=(Atom) */ +- public int /*long*/ message_type; ++ public long /*int*/ message_type; + public int format; + /** @field accessor=data.l,cast=(long *) */ +- public int /*long*/[] data = new int /*long*/[5]; ++ public long /*int*/[] data = new long /*int*/[5]; + public static final int sizeof = OS.XClientMessageEvent_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XCrossingEvent.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/XCrossingEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XCrossingEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/XCrossingEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -13,9 +13,9 @@ + + public class XCrossingEvent extends XAnyEvent { + /** @field cast=(Window) */ +- public int /*long*/ root; ++ public long /*int*/ root; + /** @field cast=(Window) */ +- public int /*long*/ subwindow; ++ public long /*int*/ subwindow; + /** @field cast=(Time) */ + public int time; + public int x; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2011-06-13 20:53:32.000000000 +0000 +@@ -13,17 +13,17 @@ + + public class XRenderPictureAttributes { + public boolean repeat; +- public int /*long*/ alpha_map; ++ public long /*int*/ alpha_map; + public int alpha_x_origin; + public int alpha_y_origin; + public int clip_x_origin; + public int clip_y_origin; +- public int /*long*/ clip_mask; ++ public long /*int*/ clip_mask; + public boolean graphics_exposures; + public int subwindow_mode; + public int poly_edge; + public int poly_mode; +- public int /*long*/ dither; ++ public long /*int*/ dither; + public boolean component_alpha; + public static final int sizeof = OS.XRenderPictureAttributes_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XWindowChanges.java swt-gtk-3.7//org/eclipse/swt/internal/gtk/XWindowChanges.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/gtk/XWindowChanges.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/gtk/XWindowChanges.java 2011-06-13 20:53:32.000000000 +0000 +@@ -17,7 +17,7 @@ + public int width; + public int height; + public int border_width; +- public int /*long*/ sibling; ++ public long /*int*/ sibling; + public int stack_mode; + public static final int sizeof = OS.XWindowChanges_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/Library.java swt-gtk-3.7//org/eclipse/swt/internal/Library.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/Library.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/Library.java 2011-06-13 20:53:32.000000000 +0000 +@@ -40,7 +40,7 @@ + static final String DELIMITER; + + /* 64-bit support */ +- static final boolean IS_64 = longConst() == (int /*long*/)longConst(); ++ static final boolean IS_64 = longConst() == (long /*int*/)longConst(); + static final String SUFFIX_64 = "-64"; //$NON-NLS-1$ + static final String SWT_LIB_DIR; + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/LONG.java swt-gtk-3.7//org/eclipse/swt/internal/LONG.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/LONG.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/LONG.java 2011-06-13 20:53:32.000000000 +0000 +@@ -12,9 +12,9 @@ + + /** @jniclass flags=no_gen */ + public class LONG { +- public int /*long*/ value; ++ public long /*int*/ value; + +- public LONG (int /*long*/ value) { ++ public LONG (long /*int*/ value) { + this.value = value; + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/GREProperty.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/GREProperty.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/GREProperty.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/GREProperty.java 2011-06-13 20:53:32.000000000 +0000 +@@ -30,8 +30,8 @@ + /** @jniclass flags=cpp */ + public class GREProperty { + /** @field cast=(const char *) */ +- public int /*long*/ property; ++ public long /*int*/ property; + /** @field cast=(const char *) */ +- public int /*long*/ value; ++ public long /*int*/ value; + public static final int sizeof = XPCOMInit.GREProperty_sizeof (); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2011-06-13 20:53:32.000000000 +0000 +@@ -30,10 +30,10 @@ + /** @jniclass flags=cpp */ + public class GREVersionRange { + /** @field cast=(const char *) */ +- public int /*long*/ lower; ++ public long /*int*/ lower; + public boolean lowerInclusive; + /** @field cast=(const char *) */ +- public int /*long*/ upper; ++ public long /*int*/ upper; + public boolean upperInclusive; + public static final int sizeof = XPCOMInit.GREVersionRange_sizeof(); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2011-06-13 20:53:32.000000000 +0000 +@@ -41,8 +41,8 @@ + * @param properties cast=(const GREProperty *) + * @param buffer cast=(char *) + */ +-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen); +-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen) { ++public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen); ++public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen) { + lock.lock(); + try { + return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2011-06-13 20:53:32.000000000 +0000 +@@ -29,7 +29,7 @@ + + public class nsDynamicFunctionLoad { + /** @field cast=(const char *) */ +- public int /*long*/ functionName; ++ public long /*int*/ functionName; + /** @field cast=(NSFuncPtr *) */ +- public int /*long*/ function; ++ public long /*int*/ function; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsEmbedString.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsEmbedString.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsEmbedString.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsEmbedString.java 2011-06-13 20:53:32.000000000 +0000 +@@ -28,7 +28,7 @@ + package org.eclipse.swt.internal.mozilla; + + public class nsEmbedString { +- int /*long*/ handle; ++ long /*int*/ handle; + + public nsEmbedString() { + handle = XPCOM.nsEmbedString_new(); +@@ -42,14 +42,14 @@ + } + } + +-public int /*long*/ getAddress() { ++public long /*int*/ getAddress() { + return handle; + } + + public String toString() { + if (handle == 0) return null; + int length = XPCOM.nsEmbedString_Length(handle); +- int /*long*/ buffer = XPCOM.nsEmbedString_get(handle); ++ long /*int*/ buffer = XPCOM.nsEmbedString_get(handle); + char[] dest = new char[length]; + XPCOM.memmove(dest, buffer, length * 2); + return new String(dest); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIAppShell.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIAppShell.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIAppShell.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIAppShell.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IAPPSHELL_IID = + new nsID(NS_IAPPSHELL_IID_STR); + +- public nsIAppShell(int /*long*/ address) { ++ public nsIAppShell(long /*int*/ address) { + super(address); + } + +- public int Create(int /*long*/ argc, int /*long*/[] argv) { ++ public int Create(long /*int*/ argc, long /*int*/[] argv) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv); + } + +@@ -57,15 +57,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress()); + } + +- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) { ++ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen); + } + +- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) { ++ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent); + } + +- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) { ++ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IAUTHINFORMATION_IID = + new nsID(NS_IAUTHINFORMATION_IID_STR); + +- public nsIAuthInformation(int /*long*/ address) { ++ public nsIAuthInformation(long /*int*/ address) { + super(address); + } + +@@ -53,35 +53,35 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags); + } + +- public int GetRealm(int /*long*/ aRealm) { ++ public int GetRealm(long /*int*/ aRealm) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm); + } + +- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) { ++ public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme); + } + +- public int GetUsername(int /*long*/ aUsername) { ++ public int GetUsername(long /*int*/ aUsername) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername); + } + +- public int SetUsername(int /*long*/ aUsername) { ++ public int SetUsername(long /*int*/ aUsername) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername); + } + +- public int GetPassword(int /*long*/ aPassword) { ++ public int GetPassword(long /*int*/ aPassword) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword); + } + +- public int SetPassword(int /*long*/ aPassword) { ++ public int SetPassword(long /*int*/ aPassword) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword); + } + +- public int GetDomain(int /*long*/ aDomain) { ++ public int GetDomain(long /*int*/ aDomain) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain); + } + +- public int SetDomain(int /*long*/ aDomain) { ++ public int SetDomain(long /*int*/ aDomain) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IBADCERTLISTENER2_IID = + new nsID(NS_IBADCERTLISTENER2_IID_STR); + +- public nsIBadCertListener2(int /*long*/ address) { ++ public nsIBadCertListener2(long /*int*/ address) { + super(address); + } + +- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) { ++ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IBASEWINDOW_IID = + new nsID(NS_IBASEWINDOW_IID_STR); + +- public nsIBaseWindow(int /*long*/ address) { ++ public nsIBaseWindow(long /*int*/ address) { + super(address); + } + +- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) { ++ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy); + } + +@@ -81,19 +81,19 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force); + } + +- public int GetParentWidget(int /*long*/[] aParentWidget) { ++ public int GetParentWidget(long /*int*/[] aParentWidget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget); + } + +- public int SetParentWidget(int /*long*/ aParentWidget) { ++ public int SetParentWidget(long /*int*/ aParentWidget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget); + } + +- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) { ++ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow); + } + +- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) { ++ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow); + } + +@@ -121,7 +121,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression); + } + +- public int GetMainWidget(int /*long*/[] aMainWidget) { ++ public int GetMainWidget(long /*int*/[] aMainWidget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget); + } + +@@ -129,7 +129,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress()); + } + +- public int GetTitle(int /*long*/[] aTitle) { ++ public int GetTitle(long /*int*/[] aTitle) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICancelable.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICancelable.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICancelable.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICancelable.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ICANCELABLE_IID = + new nsID(NS_ICANCELABLE_IID_STR); + +- public nsICancelable(int /*long*/ address) { ++ public nsICancelable(long /*int*/ address) { + super(address); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICategoryManager.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICategoryManager.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_ICATEGORYMANAGER_IID = + new nsID(NS_ICATEGORYMANAGER_IID_STR); + +- public nsICategoryManager(int /*long*/ address) { ++ public nsICategoryManager(long /*int*/ address) { + super(address); + } + +- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) { ++ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval); + } + +- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) { ++ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval); + } + +@@ -57,11 +57,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory); + } + +- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) { ++ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval); + } + +- public int EnumerateCategories(int /*long*/[] _retval) { ++ public int EnumerateCategories(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,31 +37,31 @@ + public static final nsID NS_ICERTIFICATEDIALOGS_IID = + new nsID(NS_ICERTIFICATEDIALOGS_IID_STR); + +- public nsICertificateDialogs(int /*long*/ address) { ++ public nsICertificateDialogs(long /*int*/ address) { + super(address); + } + +- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) { ++ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval); + } + +- public int NotifyCACertExists(int /*long*/ ctx) { ++ public int NotifyCACertExists(long /*int*/ ctx) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx); + } + +- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) { ++ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval); + } + +- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) { ++ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval); + } + +- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) { ++ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert); + } + +- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) { ++ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ICERTOVERRIDESERVICE_IID = + new nsID(NS_ICERTOVERRIDESERVICE_IID_STR); + +- public nsICertOverrideService(int /*long*/ address) { ++ public nsICertOverrideService(long /*int*/ address) { + super(address); + } + +@@ -47,27 +47,27 @@ + + public static final int ERROR_TIME = 4; + +- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) { ++ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary); + } + +- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { ++ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval); + } + +- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { ++ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval); + } + +- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) { ++ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort); + } + +- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) { ++ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray); + } + +- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) { ++ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIChannel.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIChannel.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIChannel.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIChannel.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,55 +37,55 @@ + public static final nsID NS_ICHANNEL_IID = + new nsID(NS_ICHANNEL_IID_STR); + +- public nsIChannel(int /*long*/ address) { ++ public nsIChannel(long /*int*/ address) { + super(address); + } + +- public int GetOriginalURI(int /*long*/[] aOriginalURI) { ++ public int GetOriginalURI(long /*int*/[] aOriginalURI) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI); + } + +- public int SetOriginalURI(int /*long*/ aOriginalURI) { ++ public int SetOriginalURI(long /*int*/ aOriginalURI) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI); + } + +- public int GetURI(int /*long*/[] aURI) { ++ public int GetURI(long /*int*/[] aURI) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI); + } + +- public int GetOwner(int /*long*/[] aOwner) { ++ public int GetOwner(long /*int*/[] aOwner) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner); + } + +- public int SetOwner(int /*long*/ aOwner) { ++ public int SetOwner(long /*int*/ aOwner) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner); + } + +- public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) { ++ public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks); + } + +- public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) { ++ public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks); + } + +- public int GetSecurityInfo(int /*long*/[] aSecurityInfo) { ++ public int GetSecurityInfo(long /*int*/[] aSecurityInfo) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo); + } + +- public int GetContentType(int /*long*/ aContentType) { ++ public int GetContentType(long /*int*/ aContentType) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType); + } + +- public int SetContentType(int /*long*/ aContentType) { ++ public int SetContentType(long /*int*/ aContentType) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType); + } + +- public int GetContentCharset(int /*long*/ aContentCharset) { ++ public int GetContentCharset(long /*int*/ aContentCharset) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset); + } + +- public int SetContentCharset(int /*long*/ aContentCharset) { ++ public int SetContentCharset(long /*int*/ aContentCharset) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset); + } + +@@ -97,11 +97,11 @@ + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength); + } + +- public int Open(int /*long*/[] _retval) { ++ public int Open(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval); + } + +- public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) { ++ public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) { + return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIClassInfo.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIClassInfo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,27 +37,27 @@ + public static final nsID NS_ICLASSINFO_IID = + new nsID(NS_ICLASSINFO_IID_STR); + +- public nsIClassInfo(int /*long*/ address) { ++ public nsIClassInfo(long /*int*/ address) { + super(address); + } + +- public int GetInterfaces(int[] count, int /*long*/[] array) { ++ public int GetInterfaces(int[] count, long /*int*/[] array) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array); + } + +- public int GetHelperForLanguage(int language, int /*long*/[] _retval) { ++ public int GetHelperForLanguage(int language, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval); + } + +- public int GetContractID(int /*long*/[] aContractID) { ++ public int GetContractID(long /*int*/[] aContractID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID); + } + +- public int GetClassDescription(int /*long*/[] aClassDescription) { ++ public int GetClassDescription(long /*int*/[] aClassDescription) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription); + } + +- public int GetClassID(int /*long*/ aClassID) { ++ public int GetClassID(long /*int*/ aClassID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID); + } + +@@ -85,7 +85,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags); + } + +- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) { ++ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIComponentManager.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIComponentManager.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_ICOMPONENTMANAGER_IID = + new nsID(NS_ICOMPONENTMANAGER_IID_STR); + +- public nsIComponentManager(int /*long*/ address) { ++ public nsIComponentManager(long /*int*/ address) { + super(address); + } + +- public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) { ++ public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result); + } + +- public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) { ++ public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result); + } + +- public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) { ++ public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result); + } + +- public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) { ++ public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,31 +37,31 @@ + public static final nsID NS_ICOMPONENTREGISTRAR_IID = + new nsID(NS_ICOMPONENTREGISTRAR_IID_STR); + +- public nsIComponentRegistrar(int /*long*/ address) { ++ public nsIComponentRegistrar(long /*int*/ address) { + super(address); + } + +- public int AutoRegister(int /*long*/ aSpec) { ++ public int AutoRegister(long /*int*/ aSpec) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec); + } + +- public int AutoUnregister(int /*long*/ aSpec) { ++ public int AutoUnregister(long /*int*/ aSpec) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec); + } + +- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) { ++ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory); + } + +- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) { ++ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory); + } + +- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) { ++ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType); + } + +- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) { ++ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile); + } + +@@ -73,19 +73,19 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval); + } + +- public int EnumerateCIDs(int /*long*/[] _retval) { ++ public int EnumerateCIDs(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval); + } + +- public int EnumerateContractIDs(int /*long*/[] _retval) { ++ public int EnumerateContractIDs(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval); + } + +- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) { ++ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval); + } + +- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) { ++ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ICONTEXTMENULISTENER_IID = + new nsID(NS_ICONTEXTMENULISTENER_IID_STR); + +- public nsIContextMenuListener(int /*long*/ address) { ++ public nsIContextMenuListener(long /*int*/ address) { + super(address); + } + +@@ -53,7 +53,7 @@ + + public static final int CONTEXT_INPUT = 16; + +- public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) { ++ public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookie.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookie.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookie.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookie.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_ICOOKIE_IID = + new nsID(NS_ICOOKIE_IID_STR); + +- public nsICookie(int /*long*/ address) { ++ public nsICookie(long /*int*/ address) { + super(address); + } + +- public int GetName(int /*long*/ aName) { ++ public int GetName(long /*int*/ aName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName); + } + +- public int GetValue(int /*long*/ aValue) { ++ public int GetValue(long /*int*/ aValue) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue); + } + +@@ -53,11 +53,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain); + } + +- public int GetHost(int /*long*/ aHost) { ++ public int GetHost(long /*int*/ aHost) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost); + } + +- public int GetPath(int /*long*/ aPath) { ++ public int GetPath(long /*int*/ aPath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath); + } + +@@ -79,7 +79,7 @@ + + public static final int STATUS_REJECTED = 4; + +- public int GetStatus(int /*long*/ aStatus) { ++ public int GetStatus(long /*int*/ aStatus) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus); + } + +@@ -95,7 +95,7 @@ + + public static final int POLICY_NO_II = 5; + +- public int GetPolicy(int /*long*/ aPolicy) { ++ public int GetPolicy(long /*int*/ aPolicy) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieManager.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieManager.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieManager.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieManager.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ICOOKIEMANAGER_IID = + new nsID(NS_ICOOKIEMANAGER_IID_STR); + +- public nsICookieManager(int /*long*/ address) { ++ public nsICookieManager(long /*int*/ address) { + super(address); + } + +@@ -45,11 +45,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress()); + } + +- public int GetEnumerator(int /*long*/[] aEnumerator) { ++ public int GetEnumerator(long /*int*/[] aEnumerator) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator); + } + +- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) { ++ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_ICOOKIESERVICE_IID = + new nsID(NS_ICOOKIESERVICE_IID_STR); + +- public nsICookieService_1_9(int /*long*/ address) { ++ public nsICookieService_1_9(long /*int*/ address) { + super(address); + } + +- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) { ++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval); + } + +- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) { ++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval); + } + +- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) { ++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel); + } + +- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) { ++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsICookieService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsICookieService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_ICOOKIESERVICE_IID = + new nsID(NS_ICOOKIESERVICE_IID_STR); + +- public nsICookieService(int /*long*/ address) { ++ public nsICookieService(long /*int*/ address) { + super(address); + } + +- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) { ++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval); + } + +- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) { ++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval); + } + +- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) { ++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel); + } + +- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) { ++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDataType.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDataType.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDataType.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDataType.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDATATYPE_IID = + new nsID(NS_IDATATYPE_IID_STR); + +- public nsIDataType(int /*long*/ address) { ++ public nsIDataType(long /*int*/ address) { + super(address); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDIRECTORYSERVICE_IID = + new nsID(NS_IDIRECTORYSERVICE_IID_STR); + +- public nsIDirectoryService(int /*long*/ address) { ++ public nsIDirectoryService(long /*int*/ address) { + super(address); + } + +@@ -45,11 +45,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress()); + } + +- public int RegisterProvider(int /*long*/ prov) { ++ public int RegisterProvider(long /*int*/ prov) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov); + } + +- public int UnregisterProvider(int /*long*/ prov) { ++ public int UnregisterProvider(long /*int*/ prov) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID = + new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING); + +- public nsIDirectoryServiceProvider2(int /*long*/ address) { ++ public nsIDirectoryServiceProvider2(long /*int*/ address) { + super(address); + } + +- public int GetFiles(byte[] prop, int /*long*/[] _retval) { ++ public int GetFiles(byte[] prop, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID = + new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR); + +- public nsIDirectoryServiceProvider(int /*long*/ address) { ++ public nsIDirectoryServiceProvider(long /*int*/ address) { + super(address); + } + +- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) { ++ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsID.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsID.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsID.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsID.java 2011-06-13 20:53:32.000000000 +0000 +@@ -46,9 +46,9 @@ + } + + public boolean Equals(nsID other) { +- int /*long*/ ptr = XPCOM.nsID_new (); ++ long /*int*/ ptr = XPCOM.nsID_new (); + XPCOM.memmove (ptr, this, nsID.sizeof); +- int /*long*/ otherPtr = XPCOM.nsID_new (); ++ long /*int*/ otherPtr = XPCOM.nsID_new (); + XPCOM.memmove (otherPtr, other, nsID.sizeof); + boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0; + XPCOM.nsID_delete (ptr); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IDOCSHELL_IID = + new nsID(NS_IDOCSHELL_IID_STR); + +- public nsIDocShell_1_8(int /*long*/ address) { ++ public nsIDocShell_1_8(long /*int*/ address) { + super(address); + } + +- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) { ++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty); + } + +- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) { ++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo); + } + +@@ -55,11 +55,11 @@ + + public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2; + +- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) { ++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest); + } + +- public int CreateLoadInfo(int /*long*/[] loadInfo) { ++ public int CreateLoadInfo(long /*int*/[] loadInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo); + } + +@@ -67,7 +67,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress()); + } + +- public int SetCurrentURI(int /*long*/ aURI) { ++ public int SetCurrentURI(long /*int*/ aURI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI); + } + +@@ -75,35 +75,35 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload); + } + +- public int GetPresContext(int /*long*/[] aPresContext) { ++ public int GetPresContext(long /*int*/[] aPresContext) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext); + } + +- public int GetPresShell(int /*long*/[] aPresShell) { ++ public int GetPresShell(long /*int*/[] aPresShell) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell); + } + +- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) { ++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell); + } + +- public int GetContentViewer(int /*long*/[] aContentViewer) { ++ public int GetContentViewer(long /*int*/[] aContentViewer) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer); + } + +- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) { ++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler); + } + +- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) { ++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler); + } + +- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) { ++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo); + } + +- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) { ++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo); + } + +@@ -151,7 +151,7 @@ + + public static final int ENUMERATE_BACKWARDS = 1; + +- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) { ++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval); + } + +@@ -255,11 +255,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler); + } + +- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) { ++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState); + } + +- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) { ++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState); + } + +@@ -267,11 +267,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState); + } + +- public int GetSecurityUI(int /*long*/[] aSecurityUI) { ++ public int GetSecurityUI(long /*int*/[] aSecurityUI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI); + } + +- public int SetSecurityUI(int /*long*/ aSecurityUI) { ++ public int SetSecurityUI(long /*int*/ aSecurityUI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI); + } + +@@ -283,7 +283,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress()); + } + +- public int BeginRestore(int /*long*/ viewer, int top) { ++ public int BeginRestore(long /*int*/ viewer, int top) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDocShell.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDocShell.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDocShell.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDocShell.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_IDOCSHELL_IID = + new nsID(NS_IDOCSHELL_IID_STR); + +- public nsIDocShell(int /*long*/ address) { ++ public nsIDocShell(long /*int*/ address) { + super(address); + } + +- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) { ++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty); + } + +- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) { ++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo); + } + +- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) { ++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest); + } + +- public int CreateLoadInfo(int /*long*/[] loadInfo) { ++ public int CreateLoadInfo(long /*int*/[] loadInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo); + } + +@@ -61,7 +61,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress()); + } + +- public int SetCurrentURI(int /*long*/ aURI) { ++ public int SetCurrentURI(long /*int*/ aURI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI); + } + +@@ -69,43 +69,43 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress()); + } + +- public int GetPresContext(int /*long*/[] aPresContext) { ++ public int GetPresContext(long /*int*/[] aPresContext) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext); + } + +- public int GetPresShell(int /*long*/[] aPresShell) { ++ public int GetPresShell(long /*int*/[] aPresShell) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell); + } + +- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) { ++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell); + } + +- public int GetContentViewer(int /*long*/[] aContentViewer) { ++ public int GetContentViewer(long /*int*/[] aContentViewer) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer); + } + +- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) { ++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler); + } + +- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) { ++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler); + } + +- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) { ++ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener); + } + +- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) { ++ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener); + } + +- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) { ++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo); + } + +- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) { ++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo); + } + +@@ -153,7 +153,7 @@ + + public static final int ENUMERATE_BACKWARDS = 1; + +- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) { ++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval); + } + +@@ -255,11 +255,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler); + } + +- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) { ++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState); + } + +- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) { ++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDOMEVENT_IID = + new nsID(NS_IDOMEVENT_IID_STR); + +- public nsIDOMEvent(int /*long*/ address) { ++ public nsIDOMEvent(long /*int*/ address) { + super(address); + } + +@@ -47,15 +47,15 @@ + + public static final int BUBBLING_PHASE = 3; + +- public int GetType(int /*long*/ aType) { ++ public int GetType(long /*int*/ aType) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType); + } + +- public int GetTarget(int /*long*/[] aTarget) { ++ public int GetTarget(long /*int*/[] aTarget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget); + } + +- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) { ++ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget); + } + +@@ -71,7 +71,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable); + } + +- public int GetTimeStamp(int /*long*/[] aTimeStamp) { ++ public int GetTimeStamp(long /*int*/[] aTimeStamp) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp); + } + +@@ -83,7 +83,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress()); + } + +- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) { ++ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_IDOMEVENTTARGET_IID = + new nsID(NS_IDOMEVENTTARGET_IID_STR); + +- public nsIDOMEventTarget(int /*long*/ address) { ++ public nsIDOMEventTarget(long /*int*/ address) { + super(address); + } + +- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) { ++ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture); + } + +- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) { ++ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture); + } + +- public int DispatchEvent(int /*long*/ evt, int[] _retval) { ++ public int DispatchEvent(long /*int*/ evt, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDOMKEYEVENT_IID = + new nsID(NS_IDOMKEYEVENT_IID_STR); + +- public nsIDOMKeyEvent(int /*long*/ address) { ++ public nsIDOMKeyEvent(long /*int*/ address) { + super(address); + } + +@@ -293,7 +293,7 @@ + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey); + } + +- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) { ++ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) { + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDOMMOUSEEVENT_IID = + new nsID(NS_IDOMMOUSEEVENT_IID_STR); + +- public nsIDOMMouseEvent(int /*long*/ address) { ++ public nsIDOMMouseEvent(long /*int*/ address) { + super(address); + } + +@@ -77,11 +77,11 @@ + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton); + } + +- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) { ++ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) { + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget); + } + +- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) { ++ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) { + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IDOMSERIALIZER_IID = + new nsID(NS_IDOMSERIALIZER_IID_STR); + +- public nsIDOMSerializer_1_7(int /*long*/ address) { ++ public nsIDOMSerializer_1_7(long /*int*/ address) { + super(address); + } + +- public int SerializeToString(int /*long*/ root, int /*long*/ _retval) { ++ public int SerializeToString(long /*int*/ root, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval); + } + +- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) { ++ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IDOMSERIALIZER_IID = + new nsID(NS_IDOMSERIALIZER_IID_STR); + +- public nsIDOMSerializer(int /*long*/ address) { ++ public nsIDOMSerializer(long /*int*/ address) { + super(address); + } + +- public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) { ++ public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval); + } + +- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) { ++ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IDOMUIEVENT_IID = + new nsID(NS_IDOMUIEVENT_IID_STR); + +- public nsIDOMUIEvent(int /*long*/ address) { ++ public nsIDOMUIEvent(long /*int*/ address) { + super(address); + } + +- public int GetView(int /*long*/[] aView) { ++ public int GetView(long /*int*/[] aView) { + return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView); + } + +@@ -49,7 +49,7 @@ + return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail); + } + +- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) { ++ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) { + return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IDOMWINDOWCOLLECTION_IID = + new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR); + +- public nsIDOMWindowCollection(int /*long*/ address) { ++ public nsIDOMWindowCollection(long /*int*/ address) { + super(address); + } + +@@ -45,11 +45,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength); + } + +- public int Item(int index, int /*long*/[] _retval) { ++ public int Item(int index, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval); + } + +- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) { ++ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,35 +37,35 @@ + public static final nsID NS_IDOMWINDOW_IID = + new nsID(NS_IDOMWINDOW_IID_STR); + +- public nsIDOMWindow(int /*long*/ address) { ++ public nsIDOMWindow(long /*int*/ address) { + super(address); + } + +- public int GetDocument(int /*long*/[] aDocument) { ++ public int GetDocument(long /*int*/[] aDocument) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDocument); + } + +- public int GetParent(int /*long*/[] aParent) { ++ public int GetParent(long /*int*/[] aParent) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent); + } + +- public int GetTop(int /*long*/[] aTop) { ++ public int GetTop(long /*int*/[] aTop) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTop); + } + +- public int GetScrollbars(int /*long*/[] aScrollbars) { ++ public int GetScrollbars(long /*int*/[] aScrollbars) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScrollbars); + } + +- public int GetFrames(int /*long*/[] aFrames) { ++ public int GetFrames(long /*int*/[] aFrames) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFrames); + } + +- public int GetName(int /*long*/ aName) { ++ public int GetName(long /*int*/ aName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aName); + } + +- public int SetName(int /*long*/ aName) { ++ public int SetName(long /*int*/ aName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName); + } + +@@ -93,7 +93,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif); + } + +- public int GetSelection(int /*long*/[] _retval) { ++ public int GetSelection(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IDOWNLOAD_IID = + new nsID(NS_IDOWNLOAD_IID_STR); + +- public nsIDownload_1_8(int /*long*/ address) { ++ public nsIDownload_1_8(long /*int*/ address) { + super(address); + } + +- public int GetTargetFile(int /*long*/[] aTargetFile) { ++ public int GetTargetFile(long /*int*/[] aTargetFile) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile); + } + +@@ -49,27 +49,27 @@ + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete); + } + +- public int GetAmountTransferred(int /*long*/ aAmountTransferred) { ++ public int GetAmountTransferred(long /*int*/ aAmountTransferred) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred); + } + +- public int GetSize(int /*long*/ aSize) { ++ public int GetSize(long /*int*/ aSize) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize); + } + +- public int GetSource(int /*long*/[] aSource) { ++ public int GetSource(long /*int*/[] aSource) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource); + } + +- public int GetTarget(int /*long*/[] aTarget) { ++ public int GetTarget(long /*int*/[] aTarget) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget); + } + +- public int GetCancelable(int /*long*/[] aCancelable) { ++ public int GetCancelable(long /*int*/[] aCancelable) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable); + } + +- public int GetDisplayName(int /*long*/[] aDisplayName) { ++ public int GetDisplayName(long /*int*/[] aDisplayName) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName); + } + +@@ -77,7 +77,7 @@ + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime); + } + +- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) { ++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { + return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDownload.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDownload.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIDownload.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIDownload.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_IDOWNLOAD_IID = + new nsID(NS_IDOWNLOAD_IID_STR); + +- public nsIDownload(int /*long*/ address) { ++ public nsIDownload(long /*int*/ address) { + super(address); + } + +- public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) { ++ public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist); + } + +- public int GetSource(int /*long*/[] aSource) { ++ public int GetSource(long /*int*/[] aSource) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource); + } + +- public int GetTarget(int /*long*/[] aTarget) { ++ public int GetTarget(long /*int*/[] aTarget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget); + } + +- public int GetPersist(int /*long*/[] aPersist) { ++ public int GetPersist(long /*int*/[] aPersist) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist); + } + +@@ -61,7 +61,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete); + } + +- public int GetDisplayName(int /*long*/[] aDisplayName) { ++ public int GetDisplayName(long /*int*/[] aDisplayName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName); + } + +@@ -73,23 +73,23 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime); + } + +- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) { ++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo); + } + +- public int GetListener(int /*long*/[] aListener) { ++ public int GetListener(long /*int*/[] aListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener); + } + +- public int SetListener(int /*long*/ aListener) { ++ public int SetListener(long /*int*/ aListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener); + } + +- public int GetObserver(int /*long*/[] aObserver) { ++ public int GetObserver(long /*int*/[] aObserver) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver); + } + +- public int SetObserver(int /*long*/ aObserver) { ++ public int SetObserver(long /*int*/ aObserver) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IEMBEDDINGSITEWINDOW_IID = + new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR); + +- public nsIEmbeddingSiteWindow(int /*long*/ address) { ++ public nsIEmbeddingSiteWindow(long /*int*/ address) { + super(address); + } + +@@ -67,7 +67,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility); + } + +- public int GetTitle(int /*long*/[] aTitle) { ++ public int GetTitle(long /*int*/[] aTitle) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle); + } + +@@ -75,7 +75,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle); + } + +- public int GetSiteWindow(int /*long*/[] aSiteWindow) { ++ public int GetSiteWindow(long /*int*/[] aSiteWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFactory.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFactory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFactory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFactory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IFACTORY_IID = + new nsID(NS_IFACTORY_IID_STR); + +- public nsIFactory(int /*long*/ address) { ++ public nsIFactory(long /*int*/ address) { + super(address); + } + +- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) { ++ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFile.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFile.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFile.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFile.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IFILE_IID = + new nsID(NS_IFILE_IID_STR); + +- public nsIFile(int /*long*/ address) { ++ public nsIFile(long /*int*/ address) { + super(address); + } + +@@ -45,11 +45,11 @@ + + public static final int DIRECTORY_TYPE = 1; + +- public int Append(int /*long*/ node) { ++ public int Append(long /*int*/ node) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node); + } + +- public int AppendNative(int /*long*/ node) { ++ public int AppendNative(long /*int*/ node) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node); + } + +@@ -61,43 +61,43 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions); + } + +- public int GetLeafName(int /*long*/ aLeafName) { ++ public int GetLeafName(long /*int*/ aLeafName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName); + } + +- public int SetLeafName(int /*long*/ aLeafName) { ++ public int SetLeafName(long /*int*/ aLeafName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName); + } + +- public int GetNativeLeafName(int /*long*/ aNativeLeafName) { ++ public int GetNativeLeafName(long /*int*/ aNativeLeafName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName); + } + +- public int SetNativeLeafName(int /*long*/ aNativeLeafName) { ++ public int SetNativeLeafName(long /*int*/ aNativeLeafName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName); + } + +- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName); + } + +- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName); + } + +- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName); + } + +- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName); + } + +- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName); + } + +- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) { ++ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName); + } + +@@ -149,19 +149,19 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink); + } + +- public int GetTarget(int /*long*/ aTarget) { ++ public int GetTarget(long /*int*/ aTarget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget); + } + +- public int GetNativeTarget(int /*long*/ aNativeTarget) { ++ public int GetNativeTarget(long /*int*/ aNativeTarget) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget); + } + +- public int GetPath(int /*long*/ aPath) { ++ public int GetPath(long /*int*/ aPath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath); + } + +- public int GetNativePath(int /*long*/ aNativePath) { ++ public int GetNativePath(long /*int*/ aNativePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath); + } + +@@ -205,23 +205,23 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions); + } + +- public int Clone(int /*long*/[] _retval) { ++ public int Clone(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval); + } + +- public int Equals(int /*long*/ inFile, int[] _retval) { ++ public int Equals(long /*int*/ inFile, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval); + } + +- public int Contains(int /*long*/ inFile, int recur, int[] _retval) { ++ public int Contains(long /*int*/ inFile, int recur, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval); + } + +- public int GetParent(int /*long*/[] aParent) { ++ public int GetParent(long /*int*/[] aParent) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent); + } + +- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) { ++ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IFILEPICKER_IID = + new nsID(NS_IFILEPICKER_IID_STR); + +- public nsIFilePicker_1_8(int /*long*/ address) { ++ public nsIFilePicker_1_8(long /*int*/ address) { + super(address); + } + +@@ -56,7 +56,7 @@ + public static final int filterXUL = 32; + public static final int filterApps = 64; + +- public int Init(int /*long*/ parent, int /*long*/ title, int mode) { ++ public int Init(long /*int*/ parent, long /*int*/ title, int mode) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode); + } + +@@ -64,23 +64,23 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask); + } + +- public int AppendFilter(int /*long*/ title, int /*long*/ filter) { ++ public int AppendFilter(long /*int*/ title, long /*int*/ filter) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter); + } + +- public int GetDefaultString(int /*long*/ aDefaultString) { ++ public int GetDefaultString(long /*int*/ aDefaultString) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString); + } + +- public int SetDefaultString(int /*long*/ aDefaultString) { ++ public int SetDefaultString(long /*int*/ aDefaultString) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString); + } + +- public int GetDefaultExtension(int /*long*/ aDefaultExtension) { ++ public int GetDefaultExtension(long /*int*/ aDefaultExtension) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension); + } + +- public int SetDefaultExtension(int /*long*/ aDefaultExtension) { ++ public int SetDefaultExtension(long /*int*/ aDefaultExtension) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension); + } + +@@ -92,27 +92,27 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex); + } + +- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) { ++ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory); + } + +- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) { ++ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory); + } + +- public int GetFile(int /*long*/[] aFile) { ++ public int GetFile(long /*int*/[] aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile); + } + +- public int GetFileURL(int /*long*/[] aFileURL) { ++ public int GetFileURL(long /*int*/[] aFileURL) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL); + } + +- public int GetFiles(int /*long*/[] aFiles) { ++ public int GetFiles(long /*int*/[] aFiles) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles); + } + +- public int Show(int /*long*/ _retval) { ++ public int Show(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFilePicker.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IFILEPICKER_IID = + new nsID(NS_IFILEPICKER_IID_STR); + +- public nsIFilePicker(int /*long*/ address) { ++ public nsIFilePicker(long /*int*/ address) { + super(address); + } + +@@ -56,7 +56,7 @@ + public static final int filterXUL = 32; + public static final int filterApps = 64; + +- public int Init(int /*long*/ parent, char[] title, int mode) { ++ public int Init(long /*int*/ parent, char[] title, int mode) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode); + } + +@@ -68,7 +68,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter); + } + +- public int GetDefaultString(int /*long*/[] aDefaultString) { ++ public int GetDefaultString(long /*int*/[] aDefaultString) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString); + } + +@@ -76,7 +76,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString); + } + +- public int GetDefaultExtension(int /*long*/[] aDefaultExtension) { ++ public int GetDefaultExtension(long /*int*/[] aDefaultExtension) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension); + } + +@@ -92,27 +92,27 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex); + } + +- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) { ++ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory); + } + +- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) { ++ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory); + } + +- public int GetFile(int /*long*/[] aFile) { ++ public int GetFile(long /*int*/[] aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile); + } + +- public int GetFileURL(int /*long*/[] aFileURL) { ++ public int GetFileURL(long /*int*/[] aFileURL) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL); + } + +- public int GetFiles(int /*long*/[] aFiles) { ++ public int GetFiles(long /*int*/[] aFiles) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles); + } + +- public int Show(int /*long*/ _retval) { ++ public int Show(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,31 +37,31 @@ + public static final nsID NS_IHELPERAPPLAUNCHER_IID = + new nsID(NS_IHELPERAPPLAUNCHER_IID_STR); + +- public nsIHelperAppLauncher_1_8(int /*long*/ address) { ++ public nsIHelperAppLauncher_1_8(long /*int*/ address) { + super(address); + } + +- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) { ++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); + } + +- public int GetSource(int /*long*/[] aSource) { ++ public int GetSource(long /*int*/[] aSource) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource); + } + +- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) { ++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); + } + +- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) { ++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); + } + +- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) { ++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); + } + +- public int SetWebProgressListener(int /*long*/ aWebProgressListener) { ++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener); + } + +@@ -69,11 +69,11 @@ + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress()); + } + +- public int GetTargetFile(int /*long*/[] aTargetFile) { ++ public int GetTargetFile(long /*int*/[] aTargetFile) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile); + } + +- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) { ++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,31 +37,31 @@ + public static final nsID NS_IHELPERAPPLAUNCHER_IID = + new nsID(NS_IHELPERAPPLAUNCHER_IID_STR); + +- public nsIHelperAppLauncher_1_9(int /*long*/ address) { ++ public nsIHelperAppLauncher_1_9(long /*int*/ address) { + super(address); + } + +- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) { ++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); + } + +- public int GetSource(int /*long*/[] aSource) { ++ public int GetSource(long /*int*/[] aSource) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource); + } + +- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) { ++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); + } + +- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) { ++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); + } + +- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) { ++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); + } + +- public int SetWebProgressListener(int /*long*/ aWebProgressListener) { ++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener); + } + +@@ -69,7 +69,7 @@ + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress()); + } + +- public int GetTargetFile(int /*long*/[] aTargetFile) { ++ public int GetTargetFile(long /*int*/[] aTargetFile) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile); + } + +@@ -77,7 +77,7 @@ + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable); + } + +- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) { ++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) { + return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = + new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR); + +- public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) { ++ public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) { + super(address); + } + +@@ -47,11 +47,11 @@ + + public static final int REASON_TYPESNIFFED = 2; + +- public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) { ++ public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason); + } + +- public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) { ++ public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = + new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR); + +- public nsIHelperAppLauncherDialog(int /*long*/ address) { ++ public nsIHelperAppLauncherDialog(long /*int*/ address) { + super(address); + } + +- public int Show(int /*long*/ aLauncher, int /*long*/ aContext) { ++ public int Show(long /*int*/ aLauncher, long /*int*/ aContext) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext); + } + +- public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) { ++ public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval); + } + +- public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) { ++ public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,27 +37,27 @@ + public static final nsID NS_IHELPERAPPLAUNCHER_IID = + new nsID(NS_IHELPERAPPLAUNCHER_IID_STR); + +- public nsIHelperAppLauncher(int /*long*/ address) { ++ public nsIHelperAppLauncher(long /*int*/ address) { + super(address); + } + +- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) { ++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); + } + +- public int GetSource(int /*long*/[] aSource) { ++ public int GetSource(long /*int*/[] aSource) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource); + } + +- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) { ++ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); + } + +- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) { ++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); + } + +- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) { ++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); + } + +@@ -65,7 +65,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress()); + } + +- public int SetWebProgressListener(int /*long*/ aWebProgressListener) { ++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener); + } + +@@ -73,7 +73,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress()); + } + +- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) { ++ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIInputStream.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIInputStream.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIInputStream.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIInputStream.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IINPUTSTREAM_IID = + new nsID(NS_IINPUTSTREAM_IID_STR); + +- public nsIInputStream(int /*long*/ address) { ++ public nsIInputStream(long /*int*/ address) { + super(address); + } + +@@ -53,7 +53,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval); + } + +- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) { ++ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IINTERFACEREQUESTOR_IID = + new nsID(NS_IINTERFACEREQUESTOR_IID_STR); + +- public nsIInterfaceRequestor(int /*long*/ address) { ++ public nsIInterfaceRequestor(long /*int*/ address) { + super(address); + } + +- public int GetInterface(nsID uuid, int /*long*/[] result) { ++ public int GetInterface(nsID uuid, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIIOService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIIOService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIIOService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIIOService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IIOSERVICE_IID = + new nsID(NS_IIOSERVICE_IID_STR); + +- public nsIIOService(int /*long*/ address) { ++ public nsIIOService(long /*int*/ address) { + super(address); + } + +- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) { ++ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval); + } + +@@ -49,19 +49,19 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval); + } + +- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) { ++ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval); + } + +- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) { ++ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval); + } + +- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) { ++ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval); + } + +- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) { ++ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval); + } + +@@ -77,7 +77,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval); + } + +- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) { ++ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IJSCONTEXTSTACK_IID = + new nsID(NS_IJSCONTEXTSTACK_IID_STR); + +- public nsIJSContextStack(int /*long*/ address) { ++ public nsIJSContextStack(long /*int*/ address) { + super(address); + } + +@@ -45,15 +45,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount); + } + +- public int Peek(int /*long*/[] _retval) { ++ public int Peek(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); + } + +- public int Pop(int /*long*/[] _retval) { ++ public int Pop(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); + } + +- public int Push(int /*long*/ cx) { ++ public int Push(long /*int*/ cx) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsILocalFile.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsILocalFile.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsILocalFile.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsILocalFile.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_ILOCALFILE_IID = + new nsID(NS_ILOCALFILE_IID_STR); + +- public nsILocalFile(int /*long*/ address) { ++ public nsILocalFile(long /*int*/ address) { + super(address); + } + +- public int InitWithPath(int /*long*/ filePath) { ++ public int InitWithPath(long /*int*/ filePath) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath); + } + +- public int InitWithNativePath(int /*long*/ filePath) { ++ public int InitWithNativePath(long /*int*/ filePath) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath); + } + +- public int InitWithFile(int /*long*/ aFile) { ++ public int InitWithFile(long /*int*/ aFile) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile); + } + +@@ -61,15 +61,15 @@ + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks); + } + +- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) { ++ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval); + } + +- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) { ++ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval); + } + +- public int Load(int /*long*/[] _retval) { ++ public int Load(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval); + } + +@@ -77,19 +77,19 @@ + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable); + } + +- public int AppendRelativePath(int /*long*/ relativeFilePath) { ++ public int AppendRelativePath(long /*int*/ relativeFilePath) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath); + } + +- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) { ++ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath); + } + +- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) { ++ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor); + } + +- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) { ++ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor); + } + +@@ -101,11 +101,11 @@ + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress()); + } + +- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) { ++ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval); + } + +- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) { ++ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) { + return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIMemory.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIMemory.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIMemory.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIMemory.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_IMEMORY_IID = + new nsID(NS_IMEMORY_IID_STR); + +- public nsIMemory(int /*long*/ address) { ++ public nsIMemory(long /*int*/ address) { + super(address); + } + +- public int /*long*/ Alloc(int size) { ++ public long /*int*/ Alloc(int size) { + return XPCOM.nsIMemory_Alloc(getAddress(), size); + } + +- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) { ++ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) { + return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize); + } + +- public int Free(int /*long*/ ptr) { ++ public int Free(long /*int*/ ptr) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IMIMEINPUTSTREAM_IID = + new nsID(NS_IMIMEINPUTSTREAM_IID_STR); + +- public nsIMIMEInputStream(int /*long*/ address) { ++ public nsIMIMEInputStream(long /*int*/ address) { + super(address); + } + +@@ -53,7 +53,7 @@ + return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 3, getAddress(), name, value); + } + +- public int SetData(int /*long*/ stream) { ++ public int SetData(long /*int*/ stream) { + return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 4, getAddress(), stream); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIObserverService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIObserverService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIObserverService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIObserverService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_IOBSERVERSERVICE_IID = + new nsID(NS_IOBSERVERSERVICE_IID_STR); + +- public nsIObserverService(int /*long*/ address) { ++ public nsIObserverService(long /*int*/ address) { + super(address); + } + +- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) { ++ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak); + } + +- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) { ++ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic); + } + +- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) { ++ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData); + } + +- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) { ++ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IPREFBRANCH_IID = + new nsID(NS_IPREFBRANCH_IID_STR); + +- public nsIPrefBranch(int /*long*/ address) { ++ public nsIPrefBranch(long /*int*/ address) { + super(address); + } + +@@ -49,7 +49,7 @@ + + public static final int PREF_BOOL = 128; + +- public int GetRoot(int /*long*/[] aRoot) { ++ public int GetRoot(long /*int*/[] aRoot) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot); + } + +@@ -65,7 +65,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue); + } + +- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) { ++ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval); + } + +@@ -81,11 +81,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue); + } + +- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) { ++ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue); + } + +- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) { ++ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue); + } + +@@ -113,7 +113,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt); + } + +- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) { ++ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IPREFLOCALIZEDSTRING_IID = + new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR); + +- public nsIPrefLocalizedString(int /*long*/ address) { ++ public nsIPrefLocalizedString(long /*int*/ address) { + super(address); + } + +- public int GetData(int /*long*/[] aData) { ++ public int GetData(long /*int*/[] aData) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData); + } + +@@ -49,7 +49,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData); + } + +- public int ToString(int /*long*/[] _retval) { ++ public int ToString(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrefService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrefService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IPREFSERVICE_IID = + new nsID(NS_IPREFSERVICE_IID_STR); + +- public nsIPrefService(int /*long*/ address) { ++ public nsIPrefService(long /*int*/ address) { + super(address); + } + +- public int ReadUserPrefs(int /*long*/ aFile) { ++ public int ReadUserPrefs(long /*int*/ aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile); + } + +@@ -53,15 +53,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress()); + } + +- public int SavePrefFile(int /*long*/ aFile) { ++ public int SavePrefFile(long /*int*/ aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile); + } + +- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) { ++ public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval); + } + +- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) { ++ public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrincipal.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrincipal.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IPRINCIPAL_IID = + new nsID(NS_IPRINCIPAL_IID_STR); + +- public nsIPrincipal(int /*long*/ address) { ++ public nsIPrincipal(long /*int*/ address) { + super(address); + } + +@@ -49,11 +49,11 @@ + + public static final int ENABLE_GRANTED = 4; + +- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) { ++ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted); + } + +- public int Equals(int /*long*/ other, int[] _retval) { ++ public int Equals(long /*int*/ other, int[] _retval) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval); + } + +@@ -61,19 +61,19 @@ + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue); + } + +- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) { ++ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval); + } + +- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) { ++ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy); + } + +- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) { ++ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy); + } + +- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) { ++ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval); + } + +@@ -81,35 +81,35 @@ + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable); + } + +- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) { ++ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval); + } + +- public int EnableCapability(byte[] capability, int /*long*/[] annotation) { ++ public int EnableCapability(byte[] capability, long /*int*/[] annotation) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation); + } + +- public int RevertCapability(byte[] capability, int /*long*/[] annotation) { ++ public int RevertCapability(byte[] capability, long /*int*/[] annotation) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation); + } + +- public int DisableCapability(byte[] capability, int /*long*/[] annotation) { ++ public int DisableCapability(byte[] capability, long /*int*/[] annotation) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation); + } + +- public int GetURI(int /*long*/[] aURI) { ++ public int GetURI(long /*int*/[] aURI) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI); + } + +- public int GetDomain(int /*long*/[] aDomain) { ++ public int GetDomain(long /*int*/[] aDomain) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain); + } + +- public int SetDomain(int /*long*/ aDomain) { ++ public int SetDomain(long /*int*/ aDomain) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain); + } + +- public int GetOrigin(int /*long*/[] aOrigin) { ++ public int GetOrigin(long /*int*/[] aOrigin) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin); + } + +@@ -117,27 +117,27 @@ + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate); + } + +- public int GetFingerprint(int /*long*/ aFingerprint) { ++ public int GetFingerprint(long /*int*/ aFingerprint) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint); + } + +- public int GetPrettyName(int /*long*/ aPrettyName) { ++ public int GetPrettyName(long /*int*/ aPrettyName) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName); + } + +- public int Subsumes(int /*long*/ other, int[] _retval) { ++ public int Subsumes(long /*int*/ other, int[] _retval) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval); + } + +- public int CheckMayLoad(int /*long*/ uri, int report) { ++ public int CheckMayLoad(long /*int*/ uri, int report) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report); + } + +- public int GetSubjectName(int /*long*/ aSubjectName) { ++ public int GetSubjectName(long /*int*/ aSubjectName) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName); + } + +- public int GetCertificate(int /*long*/[] aCertificate) { ++ public int GetCertificate(long /*int*/[] aCertificate) { + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IPROGRESSDIALOG_IID = + new nsID(NS_IPROGRESSDIALOG_IID_STR); + +- public nsIProgressDialog_1_8(int /*long*/ address) { ++ public nsIProgressDialog_1_8(long /*int*/ address) { + super(address); + } + +- public int Open(int /*long*/ aParent) { ++ public int Open(long /*int*/ aParent) { + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent); + } + +@@ -53,19 +53,19 @@ + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose); + } + +- public int GetObserver(int /*long*/[] aObserver) { ++ public int GetObserver(long /*int*/[] aObserver) { + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver); + } + +- public int SetObserver(int /*long*/ aObserver) { ++ public int SetObserver(long /*int*/ aObserver) { + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver); + } + +- public int GetDialog(int /*long*/[] aDialog) { ++ public int GetDialog(long /*int*/[] aDialog) { + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog); + } + +- public int SetDialog(int /*long*/ aDialog) { ++ public int SetDialog(long /*int*/ aDialog) { + return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IPROGRESSDIALOG_IID = + new nsID(NS_IPROGRESSDIALOG_IID_STR); + +- public nsIProgressDialog(int /*long*/ address) { ++ public nsIProgressDialog(long /*int*/ address) { + super(address); + } + +- public int Open(int /*long*/ aParent) { ++ public int Open(long /*int*/ aParent) { + return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent); + } + +@@ -53,11 +53,11 @@ + return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose); + } + +- public int GetDialog(int /*long*/[] aDialog) { ++ public int GetDialog(long /*int*/[] aDialog) { + return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog); + } + +- public int SetDialog(int /*long*/ aDialog) { ++ public int SetDialog(long /*int*/ aDialog) { + return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPromptService2.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPromptService2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IPROMPTSERVICE2_IID = + new nsID(NS_IPROMPTSERVICE2_IID_STR); + +- public nsIPromptService2(int /*long*/ address) { ++ public nsIPromptService2(long /*int*/ address) { + super(address); + } + +- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) { ++ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) { + return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval); + } + +- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) { ++ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPromptService.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPromptService.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIPromptService.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIPromptService.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_IPROMPTSERVICE_IID = + new nsID(NS_IPROMPTSERVICE_IID_STR); + +- public nsIPromptService(int /*long*/ address) { ++ public nsIPromptService(long /*int*/ address) { + super(address); + } + +- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) { ++ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText); + } + +- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) { ++ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState); + } + +- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) { ++ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval); + } + +- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) { ++ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval); + } + +@@ -91,23 +91,23 @@ + + public static final int STD_YES_NO_BUTTONS = 1027; + +- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) { ++ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval); + } + +- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) { ++ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval); + } + +- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { ++ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval); + } + +- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { ++ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval); + } + +- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) { ++ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProperties.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProperties.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIProperties.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIProperties.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IPROPERTIES_IID = + new nsID(NS_IPROPERTIES_IID_STR); + +- public nsIProperties(int /*long*/ address) { ++ public nsIProperties(long /*int*/ address) { + super(address); + } + +- public int Get(byte[] prop, nsID iid, int /*long*/[] result) { ++ public int Get(byte[] prop, nsID iid, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result); + } + +- public int Set(byte[] prop, int /*long*/ value) { ++ public int Set(byte[] prop, long /*int*/ value) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value); + } + +@@ -57,7 +57,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop); + } + +- public int GetKeys(int[] count, int /*long*/[] keys) { ++ public int GetKeys(int[] count, long /*int*/[] keys) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIRequest.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIRequest.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIRequest.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIRequest.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IREQUEST_IID = + new nsID(NS_IREQUEST_IID_STR); + +- public nsIRequest(int /*long*/ address) { ++ public nsIRequest(long /*int*/ address) { + super(address); + } + +- public int GetName(int /*long*/ aName) { ++ public int GetName(long /*int*/ aName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName); + } + +@@ -49,7 +49,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); + } + +- public int GetStatus(int /*long*/[] aStatus) { ++ public int GetStatus(long /*int*/[] aStatus) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus); + } + +@@ -65,15 +65,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress()); + } + +- public int GetLoadGroup(int /*long*/[] aLoadGroup) { ++ public int GetLoadGroup(long /*int*/[] aLoadGroup) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup); + } + +- public int SetLoadGroup(int /*long*/ aLoadGroup) { ++ public int SetLoadGroup(long /*int*/ aLoadGroup) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup); + } + +- public int GetLoadFlags(int /*long*/[] aLoadFlags) { ++ public int GetLoadFlags(long /*int*/[] aLoadFlags) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_ISCRIPTSECURITYMANAGER_IID = + new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR); + +- public nsIScriptSecurityManager_1_9_1(int /*long*/ address) { ++ public nsIScriptSecurityManager_1_9_1(long /*int*/ address) { + super(address); + } + +-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) { ++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction); + // } + +- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) { ++ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty); + } + +- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) { ++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri); + } + +@@ -65,47 +65,47 @@ + + public static final int DISALLOW_SCRIPT = 8; + +- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) { ++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags); + } + +- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) { ++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags); + } + +- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) { ++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags); + } + +- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) { ++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags); + } + +- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) { ++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj); + } + +-// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) { ++// public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM); + // } + +-// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetSubjectPrincipal(long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM); + // } + +- public int GetSystemPrincipal(int /*long*/[] _retval) { ++ public int GetSystemPrincipal(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval); + } + +-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM); + // } + +-// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM); + // } + +-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) { ++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM); + // } + +@@ -125,11 +125,11 @@ + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability); + } + +-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) { ++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable); + // } + +-// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM); + // } + +@@ -137,23 +137,23 @@ + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM); + // } + +- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) { ++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI); + } + +- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) { ++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError); + } + +-// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM); + // } + +-// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) { ++// public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM); + // } + +-// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) { ++// public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval NS_OUTPARAM) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM); + // } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,19 +37,19 @@ + public static final nsID NS_ISCRIPTSECURITYMANAGER_IID = + new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR); + +- public nsIScriptSecurityManager_1_9(int /*long*/ address) { ++ public nsIScriptSecurityManager_1_9(long /*int*/ address) { + super(address); + } + +-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) { ++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction); + // } + +-// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) { ++// public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty); + // } + +- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) { ++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri); + } + +@@ -65,47 +65,47 @@ + + public static final int DISALLOW_SCRIPT = 8; + +- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) { ++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags); + } + +- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) { ++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags); + } + +- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) { ++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags); + } + +- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) { ++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags); + } + +- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) { ++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj); + } + +- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) { ++ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval); + } + +- public int GetSubjectPrincipal(int /*long*/[] _retval) { ++ public int GetSubjectPrincipal(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval); + } + +- public int GetSystemPrincipal(int /*long*/[] _retval) { ++ public int GetSystemPrincipal(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval); + } + +-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) { ++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval); + // } + +- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) { ++ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval); + } + +-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) { ++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval); + // } + +@@ -125,11 +125,11 @@ + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability); + } + +-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) { ++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) { + // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable); + // } + +- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) { ++ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval); + } + +@@ -137,23 +137,23 @@ + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval); + } + +- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) { ++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI); + } + +- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) { ++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError); + } + +- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) { ++ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval); + } + +- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) { ++ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval); + } + +- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) { ++ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) { + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,23 +37,23 @@ + public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID = + new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR); + +- public nsISecurityCheckedComponent(int /*long*/ address) { ++ public nsISecurityCheckedComponent(long /*int*/ address) { + super(address); + } + +- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) { ++ public int CanCreateWrapper(long /*int*/ iid, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval); + } + +- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) { ++ public int CanCallMethod(long /*int*/ iid, char[] methodName, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval); + } + +- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) { ++ public int CanGetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval); + } + +- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) { ++ public int CanSetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISerializable.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISerializable.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISerializable.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISerializable.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_ISERIALIZABLE_IID = + new nsID(NS_ISERIALIZABLE_IID_STR); + +- public nsISerializable(int /*long*/ address) { ++ public nsISerializable(long /*int*/ address) { + super(address); + } + +- public int Read(int /*long*/ aInputStream) { ++ public int Read(long /*int*/ aInputStream) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream); + } + +- public int Write(int /*long*/ aOutputStream) { ++ public int Write(long /*int*/ aOutputStream) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIServiceManager.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIServiceManager.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_ISERVICEMANAGER_IID = + new nsID(NS_ISERVICEMANAGER_IID_STR); + +- public nsIServiceManager(int /*long*/ address) { ++ public nsIServiceManager(long /*int*/ address) { + super(address); + } + +- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) { ++ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result); + } + +- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) { ++ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ISIMPLEENUMERATOR_IID = + new nsID(NS_ISIMPLEENUMERATOR_IID_STR); + +- public nsISimpleEnumerator(int /*long*/ address) { ++ public nsISimpleEnumerator(long /*int*/ address) { + super(address); + } + +@@ -45,7 +45,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval); + } + +- public int GetNext(int /*long*/[] _retval) { ++ public int GetNext(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISSLStatus.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISSLStatus.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_ISSLSTATUS_IID = + new nsID(NS_ISSLSTATUS_IID_STR); + +- public nsISSLStatus(int /*long*/ address) { ++ public nsISSLStatus(long /*int*/ address) { + super(address); + } + +- public int GetServerCert(int /*long*/[] aServerCert) { ++ public int GetServerCert(long /*int*/[] aServerCert) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert); + } + +- public int GetCipherName(int /*long*/[] aCipherName) { ++ public int GetCipherName(long /*int*/[] aCipherName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISupports.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISupports.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISupports.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISupports.java 2011-06-13 20:53:32.000000000 +0000 +@@ -44,17 +44,17 @@ + public static final nsID NS_ISUPPORTS_IID = + new nsID(NS_ISUPPORTS_IID_STR); + +- int /*long*/ address; ++ long /*int*/ address; + +- public nsISupports(int /*long*/ address) { ++ public nsISupports(long /*int*/ address) { + this.address = address; + } + +- public int /*long*/ getAddress() { ++ public long /*int*/ getAddress() { + return this.address; + } + +- public int QueryInterface(nsID uuid, int /*long*/[] result) { ++ public int QueryInterface(nsID uuid, long /*int*/[] result) { + return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID = + new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR); + +- public nsISupportsWeakReference(int /*long*/ address) { ++ public nsISupportsWeakReference(long /*int*/ address) { + super(address); + } + +- public int GetWeakReference(int /*long*/[] _retval) { ++ public int GetWeakReference(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsITooltipListener.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsITooltipListener.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_ITOOLTIPLISTENER_IID = + new nsID(NS_ITOOLTIPLISTENER_IID_STR); + +- public nsITooltipListener(int /*long*/ address) { ++ public nsITooltipListener(long /*int*/ address) { + super(address); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsITransfer.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsITransfer.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsITransfer.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsITransfer.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_ITRANSFER_IID = + new nsID(NS_ITRANSFER_IID_STR); + +- public nsITransfer(int /*long*/ address) { ++ public nsITransfer(long /*int*/ address) { + super(address); + } + +- public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) { ++ public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) { + return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,39 +37,39 @@ + public static final nsID NS_IURICONTENTLISTENER_IID = + new nsID(NS_IURICONTENTLISTENER_IID_STR); + +- public nsIURIContentListener(int /*long*/ address) { ++ public nsIURIContentListener(long /*int*/ address) { + super(address); + } + +- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) { ++ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval); + } + +- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) { ++ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval); + } + +- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) { ++ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval); + } + +- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) { ++ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval); + } + +- public int GetLoadCookie(int /*long*/[] aLoadCookie) { ++ public int GetLoadCookie(long /*int*/[] aLoadCookie) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie); + } + +- public int SetLoadCookie(int /*long*/ aLoadCookie) { ++ public int SetLoadCookie(long /*int*/ aLoadCookie) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie); + } + +- public int GetParentContentListener(int /*long*/[] aParentContentListener) { ++ public int GetParentContentListener(long /*int*/[] aParentContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener); + } + +- public int SetParentContentListener(int /*long*/ aParentContentListener) { ++ public int SetParentContentListener(long /*int*/ aParentContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIURI.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIURI.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIURI.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIURI.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,67 +37,67 @@ + public static final nsID NS_IURI_IID = + new nsID(NS_IURI_IID_STR); + +- public nsIURI(int /*long*/ address) { ++ public nsIURI(long /*int*/ address) { + super(address); + } + +- public int GetSpec(int /*long*/ aSpec) { ++ public int GetSpec(long /*int*/ aSpec) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec); + } + +- public int SetSpec(int /*long*/ aSpec) { ++ public int SetSpec(long /*int*/ aSpec) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec); + } + +- public int GetPrePath(int /*long*/ aPrePath) { ++ public int GetPrePath(long /*int*/ aPrePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath); + } + +- public int GetScheme(int /*long*/ aScheme) { ++ public int GetScheme(long /*int*/ aScheme) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme); + } + +- public int SetScheme(int /*long*/ aScheme) { ++ public int SetScheme(long /*int*/ aScheme) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme); + } + +- public int GetUserPass(int /*long*/ aUserPass) { ++ public int GetUserPass(long /*int*/ aUserPass) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass); + } + +- public int SetUserPass(int /*long*/ aUserPass) { ++ public int SetUserPass(long /*int*/ aUserPass) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass); + } + +- public int GetUsername(int /*long*/ aUsername) { ++ public int GetUsername(long /*int*/ aUsername) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername); + } + +- public int SetUsername(int /*long*/ aUsername) { ++ public int SetUsername(long /*int*/ aUsername) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername); + } + +- public int GetPassword(int /*long*/ aPassword) { ++ public int GetPassword(long /*int*/ aPassword) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword); + } + +- public int SetPassword(int /*long*/ aPassword) { ++ public int SetPassword(long /*int*/ aPassword) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword); + } + +- public int GetHostPort(int /*long*/ aHostPort) { ++ public int GetHostPort(long /*int*/ aHostPort) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort); + } + +- public int SetHostPort(int /*long*/ aHostPort) { ++ public int SetHostPort(long /*int*/ aHostPort) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort); + } + +- public int GetHost(int /*long*/ aHost) { ++ public int GetHost(long /*int*/ aHost) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost); + } + +- public int SetHost(int /*long*/ aHost) { ++ public int SetHost(long /*int*/ aHost) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost); + } + +@@ -109,15 +109,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort); + } + +- public int GetPath(int /*long*/ aPath) { ++ public int GetPath(long /*int*/ aPath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath); + } + +- public int SetPath(int /*long*/ aPath) { ++ public int SetPath(long /*int*/ aPath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath); + } + +- public int Equals(int /*long*/ other, int[] _retval) { ++ public int Equals(long /*int*/ other, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval); + } + +@@ -125,23 +125,23 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval); + } + +- public int Clone(int /*long*/[] _retval) { ++ public int Clone(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval); + } + +- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) { ++ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval); + } + +- public int GetAsciiSpec(int /*long*/ aAsciiSpec) { ++ public int GetAsciiSpec(long /*int*/ aAsciiSpec) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec); + } + +- public int GetAsciiHost(int /*long*/ aAsciiHost) { ++ public int GetAsciiHost(long /*int*/ aAsciiHost) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost); + } + +- public int GetOriginCharset(int /*long*/ aOriginCharset) { ++ public int GetOriginCharset(long /*int*/ aOriginCharset) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIVariant.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIVariant.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIVariant.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIVariant.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IVARIANT_IID = + new nsID(NS_IVARIANT_IID_STR); + +- public nsIVariant(int /*long*/ address) { ++ public nsIVariant(long /*int*/ address) { + super(address); + } + +@@ -45,11 +45,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType); + } + +- public int GetAsInt8(int /*long*/ _retval) { ++ public int GetAsInt8(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); + } + +- public int GetAsInt16(int /*long*/ _retval) { ++ public int GetAsInt16(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); + } + +@@ -61,7 +61,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval); + } + +- public int GetAsUint8(int /*long*/ _retval) { ++ public int GetAsUint8(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval); + } + +@@ -73,7 +73,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval); + } + +- public int GetAsUint64(int /*long*/ _retval) { ++ public int GetAsUint64(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval); + } + +@@ -81,7 +81,7 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval); + } + +- public int GetAsDouble(int /*long*/ _retval) { ++ public int GetAsDouble(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval); + } + +@@ -97,51 +97,51 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval); + } + +- public int GetAsID(int /*long*/ retval) { ++ public int GetAsID(long /*int*/ retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval); + } + +- public int GetAsAString(int /*long*/ _retval) { ++ public int GetAsAString(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval); + } + +- public int GetAsDOMString(int /*long*/ _retval) { ++ public int GetAsDOMString(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval); + } + +- public int GetAsACString(int /*long*/ _retval) { ++ public int GetAsACString(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval); + } + +- public int GetAsAUTF8String(int /*long*/ _retval) { ++ public int GetAsAUTF8String(long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval); + } + +- public int GetAsString(int /*long*/[] _retval) { ++ public int GetAsString(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval); + } + +- public int GetAsWString(int /*long*/[] _retval) { ++ public int GetAsWString(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval); + } + +- public int GetAsISupports(int /*long*/[] _retval) { ++ public int GetAsISupports(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval); + } + +- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) { ++ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface); + } + +- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) { ++ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr); + } + +- public int GetAsStringWithSize(int[] size, int /*long*/[] str) { ++ public int GetAsStringWithSize(int[] size, long /*int*/[] str) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str); + } + +- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) { ++ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWeakReference.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWeakReference.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IWEAKREFERENCE_IID = + new nsID(NS_IWEAKREFERENCE_IID_STR); + +- public nsIWeakReference(int /*long*/ address) { ++ public nsIWeakReference(long /*int*/ address) { + super(address); + } + +- public int QueryReferent(nsID uuid, int /*long*/[] result) { ++ public int QueryReferent(nsID uuid, long /*int*/[] result) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID = + new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR); + +- public nsIWebBrowserChromeFocus(int /*long*/ address) { ++ public nsIWebBrowserChromeFocus(long /*int*/ address) { + super(address); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBBROWSERCHROME_IID = + new nsID(NS_IWEBBROWSERCHROME_IID_STR); + +- public nsIWebBrowserChrome(int /*long*/ address) { ++ public nsIWebBrowserChrome(long /*int*/ address) { + super(address); + } + +@@ -51,11 +51,11 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status); + } + +- public int GetWebBrowser(int /*long*/[] aWebBrowser) { ++ public int GetWebBrowser(long /*int*/[] aWebBrowser) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser); + } + +- public int SetWebBrowser(int /*long*/ aWebBrowser) { ++ public int SetWebBrowser(long /*int*/ aWebBrowser) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBBROWSERFOCUS_IID = + new nsID(NS_IWEBBROWSERFOCUS_IID_STR); + +- public nsIWebBrowserFocus(int /*long*/ address) { ++ public nsIWebBrowserFocus(long /*int*/ address) { + super(address); + } + +@@ -57,19 +57,19 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress()); + } + +- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) { ++ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow); + } + +- public int SetFocusedWindow(int /*long*/ aFocusedWindow) { ++ public int SetFocusedWindow(long /*int*/ aFocusedWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow); + } + +- public int GetFocusedElement(int /*long*/[] aFocusedElement) { ++ public int GetFocusedElement(long /*int*/[] aFocusedElement) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement); + } + +- public int SetFocusedElement(int /*long*/ aFocusedElement) { ++ public int SetFocusedElement(long /*int*/ aFocusedElement) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,35 +37,35 @@ + public static final nsID NS_IWEBBROWSER_IID = + new nsID(NS_IWEBBROWSER_IID_STR); + +- public nsIWebBrowser(int /*long*/ address) { ++ public nsIWebBrowser(long /*int*/ address) { + super(address); + } + +- public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) { ++ public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID); + } + +- public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) { ++ public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID); + } + +- public int GetContainerWindow(int /*long*/[] aContainerWindow) { ++ public int GetContainerWindow(long /*int*/[] aContainerWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow); + } + +- public int SetContainerWindow(int /*long*/ aContainerWindow) { ++ public int SetContainerWindow(long /*int*/ aContainerWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow); + } + +- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) { ++ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener); + } + +- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) { ++ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener); + } + +- public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) { ++ public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBBROWSERSETUP_IID = + new nsID(NS_IWEBBROWSERSETUP_IID_STR); + +- public nsIWebBrowserSetup(int /*long*/ address) { ++ public nsIWebBrowserSetup(long /*int*/ address) { + super(address); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,15 +37,15 @@ + public static final nsID NS_IWEBBROWSERSTREAM_IID = + new nsID(NS_IWEBBROWSERSTREAM_IID_STR); + +- public nsIWebBrowserStream(int /*long*/ address) { ++ public nsIWebBrowserStream(long /*int*/ address) { + super(address); + } + +- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) { ++ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType); + } + +- public int AppendToStream(int /*long*/ aData, int aLen) { ++ public int AppendToStream(long /*int*/ aData, int aLen) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBNAVIGATIONINFO_IID = + new nsID(NS_IWEBNAVIGATIONINFO_IID_STR); + +- public nsIWebNavigationInfo(int /*long*/ address) { ++ public nsIWebNavigationInfo(long /*int*/ address) { + super(address); + } + +@@ -49,7 +49,7 @@ + + public static final int OTHER = 32768; + +- public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) { ++ public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBNAVIGATION_IID = + new nsID(NS_IWEBNAVIGATION_IID_STR); + +- public nsIWebNavigation(int /*long*/ address) { ++ public nsIWebNavigation(long /*int*/ address) { + super(address); + } + +@@ -79,7 +79,7 @@ + + public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024; + +- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) { ++ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers); + } + +@@ -97,23 +97,23 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags); + } + +- public int GetDocument(int /*long*/[] aDocument) { ++ public int GetDocument(long /*int*/[] aDocument) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument); + } + +- public int GetCurrentURI(int /*long*/[] aCurrentURI) { ++ public int GetCurrentURI(long /*int*/[] aCurrentURI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI); + } + +- public int GetReferringURI(int /*long*/[] aReferringURI) { ++ public int GetReferringURI(long /*int*/[] aReferringURI) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI); + } + +- public int GetSessionHistory(int /*long*/[] aSessionHistory) { ++ public int GetSessionHistory(long /*int*/[] aSessionHistory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory); + } + +- public int SetSessionHistory(int /*long*/ aSessionHistory) { ++ public int SetSessionHistory(long /*int*/ aSessionHistory) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgress.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgress.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBPROGRESS_IID = + new nsID(NS_IWEBPROGRESS_IID_STR); + +- public nsIWebProgress(int /*long*/ address) { ++ public nsIWebProgress(long /*int*/ address) { + super(address); + } + +@@ -61,15 +61,15 @@ + + public static final int NOTIFY_ALL = 255; + +- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) { ++ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask); + } + +- public int RemoveProgressListener(int /*long*/ listener) { ++ public int RemoveProgressListener(long /*int*/ listener) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener); + } + +- public int GetDOMWindow(int /*long*/[] aDOMWindow) { ++ public int GetDOMWindow(long /*int*/[] aDOMWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IWEBPROGRESSLISTENER2_IID = + new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR); + +- public nsIWebProgressListener2(int /*long*/ address) { ++ public nsIWebProgressListener2(long /*int*/ address) { + super(address); + } + +- public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) { ++ public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) { + return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWEBPROGRESSLISTENER_IID = + new nsID(NS_IWEBPROGRESSLISTENER_IID_STR); + +- public nsIWebProgressListener(int /*long*/ address) { ++ public nsIWebProgressListener(long /*int*/ address) { + super(address); + } + +@@ -71,23 +71,23 @@ + + public static final int STATE_SECURE_LOW = 131072; + +- public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) { ++ public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus); + } + +- public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) { ++ public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); + } + +- public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) { ++ public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location); + } + +- public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) { ++ public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage); + } + +- public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) { ++ public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,13 +37,13 @@ + public static final nsID NS_IWINDOWCREATOR2_IID = + new nsID(NS_IWINDOWCREATOR2_IID_STR); + +- public nsIWindowCreator2(int /*long*/ address) { ++ public nsIWindowCreator2(long /*int*/ address) { + super(address); + } + + public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1; + +- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) { ++ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,11 +37,11 @@ + public static final nsID NS_IWINDOWCREATOR_IID = + new nsID(NS_IWINDOWCREATOR_IID_STR); + +- public nsIWindowCreator(int /*long*/ address) { ++ public nsIWindowCreator(long /*int*/ address) { + super(address); + } + +- public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) { ++ public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,51 +37,51 @@ + public static final nsID NS_IWINDOWWATCHER_IID = + new nsID(NS_IWINDOWWATCHER_IID_STR); + +- public nsIWindowWatcher(int /*long*/ address) { ++ public nsIWindowWatcher(long /*int*/ address) { + super(address); + } + +- public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) { ++ public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval); + } + +- public int RegisterNotification(int /*long*/ aObserver) { ++ public int RegisterNotification(long /*int*/ aObserver) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver); + } + +- public int UnregisterNotification(int /*long*/ aObserver) { ++ public int UnregisterNotification(long /*int*/ aObserver) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver); + } + +- public int GetWindowEnumerator(int /*long*/[] _retval) { ++ public int GetWindowEnumerator(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval); + } + +- public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) { ++ public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval); + } + +- public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) { ++ public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval); + } + +- public int SetWindowCreator(int /*long*/ creator) { ++ public int SetWindowCreator(long /*int*/ creator) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator); + } + +- public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) { ++ public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval); + } + +- public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) { ++ public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval); + } + +- public int GetActiveWindow(int /*long*/[] aActiveWindow) { ++ public int GetActiveWindow(long /*int*/[] aActiveWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow); + } + +- public int SetActiveWindow(int /*long*/ aActiveWindow) { ++ public int SetActiveWindow(long /*int*/ aActiveWindow) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IWRITABLEVARIANT_IID = + new nsID(NS_IWRITABLEVARIANT_IID_STR); + +- public nsIWritableVariant(int /*long*/ address) { ++ public nsIWritableVariant(long /*int*/ address) { + super(address); + } + +@@ -101,23 +101,23 @@ + // return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue); + // } + +- public int SetAsID(int /*long*/ aValue) { ++ public int SetAsID(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue); + } + +- public int SetAsAString(int /*long*/ aValue) { ++ public int SetAsAString(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue); + } + +- public int SetAsDOMString(int /*long*/ aValue) { ++ public int SetAsDOMString(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue); + } + +- public int SetAsACString(int /*long*/ aValue) { ++ public int SetAsACString(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue); + } + +- public int SetAsAUTF8String(int /*long*/ aValue) { ++ public int SetAsAUTF8String(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue); + } + +@@ -129,15 +129,15 @@ + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue); + } + +- public int SetAsISupports(int /*long*/ aValue) { ++ public int SetAsISupports(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue); + } + +- public int SetAsInterface(nsID iid, int /*long*/ iface) { ++ public int SetAsInterface(nsID iid, long /*int*/ iface) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface); + } + +- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) { ++ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr); + } + +@@ -161,7 +161,7 @@ + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress()); + } + +- public int SetFromVariant(int /*long*/ aValue) { ++ public int SetFromVariant(long /*int*/ aValue) { + return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIX509Cert.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIX509Cert.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,87 +37,87 @@ + public static final nsID NS_IX509CERT_IID = + new nsID(NS_IX509CERT_IID_STR); + +- public nsIX509Cert(int /*long*/ address) { ++ public nsIX509Cert(long /*int*/ address) { + super(address); + } + +- public int GetNickname(int /*long*/ aNickname) { ++ public int GetNickname(long /*int*/ aNickname) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname); + } + +- public int GetEmailAddress(int /*long*/ aEmailAddress) { ++ public int GetEmailAddress(long /*int*/ aEmailAddress) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress); + } + +- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) { ++ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses); + } + +- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) { ++ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval); + } + +- public int GetSubjectName(int /*long*/ aSubjectName) { ++ public int GetSubjectName(long /*int*/ aSubjectName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName); + } + +- public int GetCommonName(int /*long*/ aCommonName) { ++ public int GetCommonName(long /*int*/ aCommonName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName); + } + +- public int GetOrganization(int /*long*/ aOrganization) { ++ public int GetOrganization(long /*int*/ aOrganization) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization); + } + +- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) { ++ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit); + } + +- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) { ++ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint); + } + +- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) { ++ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint); + } + +- public int GetTokenName(int /*long*/ aTokenName) { ++ public int GetTokenName(long /*int*/ aTokenName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName); + } + +- public int GetIssuerName(int /*long*/ aIssuerName) { ++ public int GetIssuerName(long /*int*/ aIssuerName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName); + } + +- public int GetSerialNumber(int /*long*/ aSerialNumber) { ++ public int GetSerialNumber(long /*int*/ aSerialNumber) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber); + } + +- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) { ++ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName); + } + +- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) { ++ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization); + } + +- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) { ++ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit); + } + +- public int GetIssuer(int /*long*/[] aIssuer) { ++ public int GetIssuer(long /*int*/[] aIssuer) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer); + } + +- public int GetValidity(int /*long*/[] aValidity) { ++ public int GetValidity(long /*int*/[] aValidity) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity); + } + +- public int GetDbKey(int /*long*/[] aDbKey) { ++ public int GetDbKey(long /*int*/[] aDbKey) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey); + } + +- public int GetWindowTitle(int /*long*/[] aWindowTitle) { ++ public int GetWindowTitle(long /*int*/[] aWindowTitle) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle); + } + +@@ -173,15 +173,15 @@ + + public static final int CERT_USAGE_AnyCA = 11; + +- public int GetChain(int /*long*/[] _retval) { ++ public int GetChain(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval); + } + +- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) { ++ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages); + } + +- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) { ++ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages); + } + +@@ -189,15 +189,15 @@ + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval); + } + +- public int GetASN1Structure(int /*long*/[] aASN1Structure) { ++ public int GetASN1Structure(long /*int*/[] aASN1Structure) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure); + } + +- public int GetRawDER(int[] length, int /*long*/[] data) { ++ public int GetRawDER(int[] length, long /*int*/[] data) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data); + } + +- public int Equals(int /*long*/ other, int[] _retval) { ++ public int Equals(long /*int*/ other, int[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,39 +37,39 @@ + public static final nsID NS_IX509CERTVALIDITY_IID = + new nsID(NS_IX509CERTVALIDITY_IID_STR); + +- public nsIX509CertValidity(int /*long*/ address) { ++ public nsIX509CertValidity(long /*int*/ address) { + super(address); + } + +- public int GetNotBefore(int /*long*/ aNotBefore) { ++ public int GetNotBefore(long /*int*/ aNotBefore) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore); + } + +- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) { ++ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime); + } + +- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) { ++ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay); + } + +- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) { ++ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT); + } + +- public int GetNotAfter(int /*long*/ aNotAfter) { ++ public int GetNotAfter(long /*int*/ aNotAfter) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter); + } + +- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) { ++ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime); + } + +- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) { ++ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay); + } + +- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) { ++ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2011-06-13 20:53:32.000000000 +0000 +@@ -37,7 +37,7 @@ + public static final nsID NS_IXPCSECURITYMANAGER_IID = + new nsID(NS_IXPCSECURITYMANAGER_IID_STR); + +- public nsIXPCSecurityManager(int /*long*/ address) { ++ public nsIXPCSecurityManager(long /*int*/ address) { + super(address); + } + +@@ -55,15 +55,15 @@ + + public static final int HOOK_ALL = 63; + +- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) { ++ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy); + } + +- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) { ++ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID); + } + +- public int CanGetService(int /*long*/ aJSContext, nsID aCID) { ++ public int CanGetService(long /*int*/ aJSContext, nsID aCID) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID); + } + +@@ -73,7 +73,7 @@ + + public static final int ACCESS_SET_PROPERTY = 2; + +- public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) { ++ public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy); + } + } +\ No newline at end of file +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/XPCOM.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/XPCOM.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/XPCOM.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/XPCOM.java 2011-06-13 20:53:32.000000000 +0000 +@@ -140,25 +140,25 @@ + * @param src cast=(const void *),flags=no_out critical + * @param size cast=(size_t) + */ +-public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size); ++public static final native void memmove (long /*int*/ dest, nsDynamicFunctionLoad src, long /*int*/ size); + /** + * @param dest cast=(void *) + * @param src cast=(const void *) + * @param nbytes cast=(size_t) + */ +-public static final native void memmove(nsID dest, int /*long*/ src, int nbytes); ++public static final native void memmove(nsID dest, long /*int*/ src, int nbytes); + /** + * @param dest cast=(void *) + * @param src cast=(const void *) + * @param nbytes cast=(size_t) + */ +-public static final native void memmove(int /*long*/ dest, nsID src, int nbytes); ++public static final native void memmove(long /*int*/ dest, nsID src, int nbytes); + /** @method flags=no_gen */ +-public static final native int strlen_PRUnichar(int /*long*/ s); ++public static final native int strlen_PRUnichar(long /*int*/ s); + + /** @method flags=no_gen */ +-public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal); +-public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) { ++public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal); ++public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal) { + lock.lock(); + try { + return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal); +@@ -167,8 +167,8 @@ + } + } + /** @method flags=no_gen */ +-public static final native boolean _NS_Free(byte[] mozillaPath, int /*long*/ aPtr); +-public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) { ++public static final native boolean _NS_Free(byte[] mozillaPath, long /*int*/ aPtr); ++public static final boolean NS_Free(byte[] mozillaPath, long /*int*/ aPtr) { + lock.lock(); + try { + return _NS_Free(mozillaPath, aPtr); +@@ -177,8 +177,8 @@ + } + } + /** @param result cast=(nsIComponentManager**) */ +-public static final native int _NS_GetComponentManager(int /*long*/[] result); +-public static final int NS_GetComponentManager(int /*long*/[] result) { ++public static final native int _NS_GetComponentManager(long /*int*/[] result); ++public static final int NS_GetComponentManager(long /*int*/[] result) { + lock.lock(); + try { + return _NS_GetComponentManager(result); +@@ -187,8 +187,8 @@ + } + } + /** @param result cast=(nsIServiceManager**) */ +-public static final native int _NS_GetServiceManager(int /*long*/[] result); +-public static final int NS_GetServiceManager(int /*long*/[] result) { ++public static final native int _NS_GetServiceManager(long /*int*/[] result); ++public static final int NS_GetServiceManager(long /*int*/[] result) { + lock.lock(); + try { + return _NS_GetServiceManager(result); +@@ -201,8 +201,8 @@ + * @param binDirectory cast=(nsIFile *) + * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *) + */ +-public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider); +-public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) { ++public static final native int _NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider); ++public static final int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider) { + lock.lock(); + try { + return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider); +@@ -214,8 +214,8 @@ + * @param path cast=(nsAString *),flags=struct + * @param result cast=(nsILocalFile**) + */ +-public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result); +-public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) { ++public static final native int _NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result); ++public static final int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result) { + lock.lock(); + try { + return _NS_NewLocalFile(path, followLinks, result); +@@ -224,8 +224,8 @@ + } + } + /** @method flags=new */ +-public static final native int /*long*/ _nsEmbedCString_new(); +-public static final int /*long*/ nsEmbedCString_new() { ++public static final native long /*int*/ _nsEmbedCString_new(); ++public static final long /*int*/ nsEmbedCString_new() { + lock.lock(); + try { + return _nsEmbedCString_new(); +@@ -237,8 +237,8 @@ + * @method flags=new + * @param aString cast=(const char *) + */ +-public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length); +-public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) { ++public static final native long /*int*/ _nsEmbedCString_new(byte[] aString, int length); ++public static final long /*int*/ nsEmbedCString_new(byte[] aString, int length) { + lock.lock(); + try { + return _nsEmbedCString_new(aString, length); +@@ -250,8 +250,8 @@ + * @method flags=new + * @param aString cast=(const char *) + */ +-public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length); +-public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) { ++public static final native long /*int*/ _nsEmbedCString_new(long /*int*/ aString, int length); ++public static final long /*int*/ nsEmbedCString_new(long /*int*/ aString, int length) { + lock.lock(); + try { + return _nsEmbedCString_new(aString, length); +@@ -263,8 +263,8 @@ + * @method flags=delete + * @param ptr cast=(nsEmbedCString *) + */ +-public static final native void _nsEmbedCString_delete(int /*long*/ ptr); +-public static final void nsEmbedCString_delete(int /*long*/ ptr) { ++public static final native void _nsEmbedCString_delete(long /*int*/ ptr); ++public static final void nsEmbedCString_delete(long /*int*/ ptr) { + lock.lock(); + try { + _nsEmbedCString_delete(ptr); +@@ -276,8 +276,8 @@ + * @method flags=cpp + * @param ptr cast=(nsEmbedCString *) + */ +-public static final native int _nsEmbedCString_Length(int /*long*/ ptr); +-public static final int nsEmbedCString_Length(int /*long*/ ptr) { ++public static final native int _nsEmbedCString_Length(long /*int*/ ptr); ++public static final int nsEmbedCString_Length(long /*int*/ ptr) { + lock.lock(); + try { + return _nsEmbedCString_Length(ptr); +@@ -289,8 +289,8 @@ + * @method flags=cpp + * @param ptr cast=(nsIScriptGlobalObject *) + */ +-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang); +-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) { ++public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang); ++public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang) { + lock.lock(); + try { + return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang); +@@ -302,8 +302,8 @@ + * @method flags=cpp + * @param ptr cast=(nsIScriptGlobalObject *) + */ +-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang); +-public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang) { ++public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang); ++public static final long /*int*/ nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang) { + lock.lock(); + try { + return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang); +@@ -315,8 +315,8 @@ + * @method flags=cpp + * @param ptr cast=(nsIScriptGlobalObject *) + */ +-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang); +-public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) { ++public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang); ++public static final long /*int*/ nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang) { + lock.lock(); + try { + return _nsIScriptGlobalObject_GetScriptContext(ptr, lang); +@@ -328,8 +328,8 @@ + * @method flags=cpp + * @param ptr cast=(nsIScriptContext *) + */ +-public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr); +-public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) { ++public static final native long /*int*/ _nsIScriptContext_GetNativeContext(long /*int*/ ptr); ++public static final long /*int*/ nsIScriptContext_GetNativeContext(long /*int*/ ptr) { + lock.lock(); + try { + return _nsIScriptContext_GetNativeContext(ptr); +@@ -342,8 +342,8 @@ + * @method flags=cpp + * @param ptr cast=(nsEmbedCString *) + */ +-public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr); +-public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) { ++public static final native long /*int*/ _nsEmbedCString_get(long /*int*/ ptr); ++public static final long /*int*/ nsEmbedCString_get(long /*int*/ ptr) { + lock.lock(); + try { + return _nsEmbedCString_get(ptr); +@@ -355,8 +355,8 @@ + * @method flags=delete + * @param ptr cast=(nsID *) + */ +-public static final native void _nsID_delete(int /*long*/ ptr); +-public static final void nsID_delete(int /*long*/ ptr) { ++public static final native void _nsID_delete(long /*int*/ ptr); ++public static final void nsID_delete(long /*int*/ ptr) { + lock.lock(); + try { + _nsID_delete(ptr); +@@ -365,8 +365,8 @@ + } + } + /** @method flags=new */ +-public static final native int /*long*/ _nsID_new(); +-public static final int /*long*/ nsID_new() { ++public static final native long /*int*/ _nsID_new(); ++public static final long /*int*/ nsID_new() { + lock.lock(); + try { + return _nsID_new(); +@@ -379,8 +379,8 @@ + * @param ptr cast=(nsID *) + * @param other cast=(nsID *),flags=struct + */ +-public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other); +-public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) { ++public static final native int _nsID_Equals(long /*int*/ ptr, long /*int*/ other); ++public static final int nsID_Equals(long /*int*/ ptr, long /*int*/ other) { + lock.lock(); + try { + return _nsID_Equals(ptr, other); +@@ -389,8 +389,8 @@ + } + } + /** @method flags=new */ +-public static final native int /*long*/ _nsEmbedString_new(); +-public static final int /*long*/ nsEmbedString_new() { ++public static final native long /*int*/ _nsEmbedString_new(); ++public static final long /*int*/ nsEmbedString_new() { + lock.lock(); + try { + return _nsEmbedString_new(); +@@ -402,8 +402,8 @@ + * @method flags=new + * @param aString cast=(PRUnichar *) + */ +-public static final native int /*long*/ _nsEmbedString_new(char[] aString); +-public static final int /*long*/ nsEmbedString_new(char[] aString) { ++public static final native long /*int*/ _nsEmbedString_new(char[] aString); ++public static final long /*int*/ nsEmbedString_new(char[] aString) { + lock.lock(); + try { + return _nsEmbedString_new(aString); +@@ -415,8 +415,8 @@ + * @method flags=delete + * @param ptr cast=(nsEmbedString *) + */ +-public static final native void _nsEmbedString_delete(int /*long*/ ptr); +-public static final void nsEmbedString_delete(int /*long*/ ptr) { ++public static final native void _nsEmbedString_delete(long /*int*/ ptr); ++public static final void nsEmbedString_delete(long /*int*/ ptr) { + lock.lock(); + try { + _nsEmbedString_delete(ptr); +@@ -428,8 +428,8 @@ + * @method flags=cpp + * @param ptr cast=(nsEmbedString *) + */ +-public static final native int _nsEmbedString_Length(int /*long*/ ptr); +-public static final int nsEmbedString_Length(int /*long*/ ptr) { ++public static final native int _nsEmbedString_Length(long /*int*/ ptr); ++public static final int nsEmbedString_Length(long /*int*/ ptr) { + lock.lock(); + try { + return _nsEmbedString_Length(ptr); +@@ -441,8 +441,8 @@ + * @method flags=cpp + * @param ptr cast=(nsEmbedString *) + */ +-public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr); +-public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) { ++public static final native long /*int*/ _nsEmbedString_get(long /*int*/ ptr); ++public static final long /*int*/ nsEmbedString_get(long /*int*/ ptr) { + lock.lock(); + try { + return _nsEmbedString_get(ptr); +@@ -455,8 +455,8 @@ + * @param ptr cast=(nsIMemory *) + * @param size cast=(size_t) + */ +-public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size); +-public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) { ++public static final native long /*int*/ _nsIMemory_Alloc(long /*int*/ ptr, int size); ++public static final long /*int*/ nsIMemory_Alloc(long /*int*/ ptr, int size) { + lock.lock(); + try { + return _nsIMemory_Alloc(ptr, size); +@@ -470,8 +470,8 @@ + * @param ptr2 cast=(void *) + * @param size cast=(size_t) + */ +-public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size); +-public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) { ++public static final native long /*int*/ _nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size); ++public static final long /*int*/ nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size) { + lock.lock(); + try { + return _nsIMemory_Realloc(ptr1, ptr2, size); +@@ -480,8 +480,8 @@ + } + } + /** @param functionLoad cast=(const nsDynamicFunctionLoad *) */ +-public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad); +-public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) { ++public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad); ++public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) { + lock.lock(); + try { + return _XPCOMGlueLoadXULFunctions(functionLoad); +@@ -509,8 +509,8 @@ + } + } + +-public static final native int _Call(int /*long*/ ptr); +-public static final int Call(int /*long*/ ptr) { ++public static final native int _Call(long /*int*/ ptr); ++public static final int Call(long /*int*/ ptr) { + lock.lock(); + try { + return _Call(ptr); +@@ -526,8 +526,8 @@ + * @param aFromSegment cast=(const char *) + * @param aWriteCount cast=(PRUint32 *) + */ +-public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount); +-public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) { ++public static final native long /*int*/ _Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount); ++public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) { + lock.lock(); + try { + return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount); +@@ -543,8 +543,8 @@ + * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *) + * @param aStaticComponents cast=(nsStaticModuleInfo const *) + */ +-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount); +-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) { ++public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount); ++public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) { + lock.lock(); + try { + return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount); +@@ -553,8 +553,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl); +@@ -563,8 +563,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -572,8 +572,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -581,8 +581,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -590,8 +590,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -599,8 +599,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -608,8 +608,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -617,8 +617,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -626,8 +626,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -635,8 +635,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -644,8 +644,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0); +@@ -654,8 +654,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -663,8 +663,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -672,8 +672,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -681,8 +681,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -690,8 +690,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -699,8 +699,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -708,8 +708,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -717,8 +717,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -726,8 +726,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -735,8 +735,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -744,8 +744,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -753,8 +753,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -762,8 +762,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -771,8 +771,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -780,8 +780,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -789,8 +789,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -798,8 +798,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -807,8 +807,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -816,8 +816,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -825,8 +825,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -834,8 +834,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -843,8 +843,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -852,8 +852,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -862,8 +862,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -871,8 +871,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -880,8 +880,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -889,8 +889,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -898,8 +898,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -907,8 +907,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1); +@@ -916,8 +916,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -925,8 +925,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -934,8 +934,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -944,8 +944,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -953,8 +953,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -963,8 +963,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -972,8 +972,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -981,8 +981,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -990,8 +990,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -999,8 +999,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1008,8 +1008,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1017,8 +1017,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1026,8 +1026,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1035,8 +1035,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1044,8 +1044,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1053,8 +1053,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1062,8 +1062,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1071,8 +1071,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1080,8 +1080,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1089,8 +1089,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1098,8 +1098,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1107,8 +1107,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1116,8 +1116,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1125,8 +1125,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1134,8 +1134,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1143,8 +1143,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1152,8 +1152,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1161,8 +1161,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1170,8 +1170,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1179,8 +1179,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1188,8 +1188,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1197,8 +1197,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1206,8 +1206,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1215,8 +1215,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1224,8 +1224,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1233,8 +1233,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1242,8 +1242,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1251,8 +1251,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1260,8 +1260,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1269,8 +1269,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1278,8 +1278,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1287,8 +1287,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1296,8 +1296,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1305,8 +1305,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1314,8 +1314,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1323,8 +1323,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1332,8 +1332,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2); +@@ -1342,8 +1342,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1351,8 +1351,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1360,8 +1360,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1369,8 +1369,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1378,8 +1378,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1387,8 +1387,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1396,8 +1396,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1405,8 +1405,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1414,8 +1414,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1423,8 +1423,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1432,8 +1432,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1441,8 +1441,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1450,8 +1450,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1459,8 +1459,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1468,8 +1468,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1477,8 +1477,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1486,8 +1486,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1495,8 +1495,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1504,8 +1504,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1513,8 +1513,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1522,8 +1522,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1531,8 +1531,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1540,8 +1540,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1549,8 +1549,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1558,8 +1558,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1567,8 +1567,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1576,8 +1576,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1585,8 +1585,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1594,8 +1594,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1603,8 +1603,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1612,8 +1612,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1621,8 +1621,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1630,8 +1630,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1639,8 +1639,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3); +@@ -1649,8 +1649,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1658,8 +1658,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1667,8 +1667,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1676,8 +1676,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1685,8 +1685,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1694,8 +1694,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1703,8 +1703,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1712,8 +1712,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1721,8 +1721,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1730,8 +1730,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1740,8 +1740,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1749,8 +1749,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1758,8 +1758,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1767,8 +1767,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4); +@@ -1777,8 +1777,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1786,8 +1786,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1795,8 +1795,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1804,8 +1804,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1813,8 +1813,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1822,8 +1822,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1831,8 +1831,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1841,8 +1841,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1850,8 +1850,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1859,8 +1859,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1868,8 +1868,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1878,8 +1878,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1887,8 +1887,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1896,8 +1896,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1905,8 +1905,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1914,8 +1914,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1923,8 +1923,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1932,8 +1932,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1941,8 +1941,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1950,8 +1950,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1959,8 +1959,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1968,8 +1968,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1977,8 +1977,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1986,8 +1986,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -1995,8 +1995,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -2004,8 +2004,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -2013,8 +2013,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -2022,8 +2022,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -2032,8 +2032,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2041,8 +2041,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2050,8 +2050,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2059,8 +2059,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2068,8 +2068,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2077,8 +2077,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2086,8 +2086,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2095,8 +2095,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2104,8 +2104,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2113,8 +2113,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -2123,8 +2123,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +@@ -2132,8 +2132,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +@@ -2141,8 +2141,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +@@ -2150,8 +2150,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +@@ -2160,8 +2160,8 @@ + } + } + +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); +@@ -2169,8 +2169,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); +@@ -2178,8 +2178,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +@@ -2187,8 +2187,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +@@ -2196,8 +2196,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +@@ -2205,8 +2205,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +@@ -2214,8 +2214,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11); +@@ -2223,8 +2223,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11); +@@ -2232,8 +2232,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); +@@ -2241,8 +2241,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); +@@ -2250,8 +2250,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14); +@@ -2259,8 +2259,8 @@ + lock.unlock(); + } + } +-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14); +-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) { ++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14); ++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) { + lock.lock(); + try { + return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/XPCOMObject.java swt-gtk-3.7//org/eclipse/swt/internal/mozilla/XPCOMObject.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/mozilla/XPCOMObject.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/mozilla/XPCOMObject.java 2011-06-13 20:53:32.000000000 +0000 +@@ -21,7 +21,7 @@ + IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$ + } + +- private int /*long*/ ppVtable; ++ private long /*int*/ ppVtable; + + static private final int MAX_ARG_COUNT = 12; + static private final int MAX_VTABLE_LENGTH = 80; +@@ -31,7 +31,7 @@ + + + public XPCOMObject (int[] argCounts) { +- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET]; ++ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length + OS_OFFSET]; + synchronized (Callbacks) { + for (int i = 0, length = argCounts.length; i < length; i++) { + if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) { +@@ -42,737 +42,737 @@ + } + } + +- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET)); ++ long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET)); + XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET)); + ppVtable = C.malloc (C.PTR_SIZEOF); +- XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF); + ObjectMap.put (new LONG (ppVtable), this); + } + +-static int /*long*/ callback0 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback0 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method0 (args); + } +-static int /*long*/ callback1 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback1 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method1 (args); + } +-static int /*long*/ callback10 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback10 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method10 (args); + } +-static int /*long*/ callback11 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback11 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method11 (args); + } +-static int /*long*/ callback12 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback12 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method12 (args); + } +-static int /*long*/ callback13 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback13 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method13 (args); + } +-static int /*long*/ callback14 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback14 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method14 (args); + } +-static int /*long*/ callback15 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback15 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method15 (args); + } +-static int /*long*/ callback16 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback16 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method16 (args); + } +-static int /*long*/ callback17 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback17 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method17 (args); + } +-static int /*long*/ callback18 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback18 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method18 (args); + } +-static int /*long*/ callback19 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback19 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method19 (args); + } +-static int /*long*/ callback2 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback2 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method2 (args); + } +-static int /*long*/ callback20 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback20 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method20 (args); + } +-static int /*long*/ callback21 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback21 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method21 (args); + } +-static int /*long*/ callback22 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback22 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method22 (args); + } +-static int /*long*/ callback23 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback23 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method23 (args); + } +-static int /*long*/ callback24 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback24 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method24 (args); + } +-static int /*long*/ callback25 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback25 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method25 (args); + } +-static int /*long*/ callback26 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback26 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method26 (args); + } +-static int /*long*/ callback27 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback27 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method27 (args); + } +-static int /*long*/ callback28 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback28 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method28 (args); + } +-static int /*long*/ callback29 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback29 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method29 (args); + } +-static int /*long*/ callback3 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback3 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method3 (args); + } +-static int /*long*/ callback30 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback30 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method30 (args); + } +-static int /*long*/ callback31 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback31 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method31 (args); + } +-static int /*long*/ callback32 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback32 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method32 (args); + } +-static int /*long*/ callback33 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback33 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method33 (args); + } +-static int /*long*/ callback34 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback34 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method34 (args); + } +-static int /*long*/ callback35 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback35 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method35 (args); + } +-static int /*long*/ callback36 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback36 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method36 (args); + } +-static int /*long*/ callback37 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback37 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method37 (args); + } +-static int /*long*/ callback38 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback38 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method38 (args); + } +-static int /*long*/ callback39 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback39 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method39 (args); + } +-static int /*long*/ callback4 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback4 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method4 (args); + } +-static int /*long*/ callback40 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback40 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method40 (args); + } +-static int /*long*/ callback41 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback41 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method41 (args); + } +-static int /*long*/ callback42 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback42 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method42 (args); + } +-static int /*long*/ callback43 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback43 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method43 (args); + } +-static int /*long*/ callback44 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback44 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method44 (args); + } +-static int /*long*/ callback45 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback45 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method45 (args); + } +-static int /*long*/ callback46 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback46 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method46 (args); + } +-static int /*long*/ callback47 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback47 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method47 (args); + } +-static int /*long*/ callback48 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback48 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method48 (args); + } +-static int /*long*/ callback49 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback49 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method49 (args); + } +-static int /*long*/ callback5 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback5 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method5 (args); + } +-static int /*long*/ callback50 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback50 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method50 (args); + } +-static int /*long*/ callback51 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback51 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method51 (args); + } +-static int /*long*/ callback52 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback52 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method52 (args); + } +-static int /*long*/ callback53 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback53 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method53 (args); + } +-static int /*long*/ callback54 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback54 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method54 (args); + } +-static int /*long*/ callback55 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback55 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method55 (args); + } +-static int /*long*/ callback56 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback56 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method56 (args); + } +-static int /*long*/ callback57 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback57 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method57 (args); + } +-static int /*long*/ callback58 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback58 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method58 (args); + } +-static int /*long*/ callback59 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback59 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method59 (args); + } +-static int /*long*/ callback6 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback6 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method6 (args); + } +-static int /*long*/ callback60 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback60 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method60 (args); + } +-static int /*long*/ callback61 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback61 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method61 (args); + } +-static int /*long*/ callback62 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback62 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method62 (args); + } +-static int /*long*/ callback63 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback63 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method63 (args); + } +-static int /*long*/ callback64 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback64 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method64 (args); + } +-static int /*long*/ callback65 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback65 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method65 (args); + } +-static int /*long*/ callback66 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback66 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method66 (args); + } +-static int /*long*/ callback67 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback67 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method67 (args); + } +-static int /*long*/ callback68 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback68 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method68 (args); + } +-static int /*long*/ callback69 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback69 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method69 (args); + } +-static int /*long*/ callback7 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback7 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method7 (args); + } +-static int /*long*/ callback70 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback70 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method70 (args); + } +-static int /*long*/ callback71 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback71 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method71 (args); + } +-static int /*long*/ callback72 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback72 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method72 (args); + } +-static int /*long*/ callback73 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback73 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method73 (args); + } +-static int /*long*/ callback74 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback74 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method74 (args); + } +-static int /*long*/ callback75 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback75 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method75 (args); + } +-static int /*long*/ callback76 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback76 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method76 (args); + } +-static int /*long*/ callback77 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback77 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method77 (args); + } +-static int /*long*/ callback78 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback78 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method78 (args); + } +-static int /*long*/ callback79 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback79 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method79 (args); + } +-static int /*long*/ callback8 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback8 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method8 (args); + } +-static int /*long*/ callback9 (int /*long*/[] callbackArgs) { ++static long /*int*/ callback9 (long /*int*/[] callbackArgs) { + // find the object on which this call was invoked +- int /*long*/ address = callbackArgs[0]; ++ long /*int*/ address = callbackArgs[0]; + Object object = ObjectMap.get (new LONG (address)); + if (object == null) return XPCOM.NS_ERROR_FAILURE; +- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; ++ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + System.arraycopy (callbackArgs, 1, args, 0, args.length); + return ((XPCOMObject) object).method9 (args); + } + + public void dispose() { + // free the memory for this reference +- int /*long*/[] pVtable = new int /*long*/[1]; ++ long /*int*/[] pVtable = new long /*int*/[1]; + XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF); + C.free (pVtable[0]); + C.free (ppVtable); +@@ -783,248 +783,248 @@ + ppVtable = 0; + } + +-public int /*long*/ getAddress () { ++public long /*int*/ getAddress () { + return ppVtable; + } + +-public int /*long*/ method0 (int /*long*/[] args) { ++public long /*int*/ method0 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method1 (int /*long*/[] args) { ++public long /*int*/ method1 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method10 (int /*long*/[] args) { ++public long /*int*/ method10 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method11 (int /*long*/[] args) { ++public long /*int*/ method11 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method12 (int /*long*/[] args) { ++public long /*int*/ method12 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method13 (int /*long*/[] args) { ++public long /*int*/ method13 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method14 (int /*long*/[] args) { ++public long /*int*/ method14 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method15 (int /*long*/[] args) { ++public long /*int*/ method15 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method16 (int /*long*/[] args) { ++public long /*int*/ method16 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method17 (int /*long*/[] args) { ++public long /*int*/ method17 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method18 (int /*long*/[] args) { ++public long /*int*/ method18 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method19 (int /*long*/[] args) { ++public long /*int*/ method19 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method2 (int /*long*/[] args) { ++public long /*int*/ method2 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method20 (int /*long*/[] args) { ++public long /*int*/ method20 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method21 (int /*long*/[] args) { ++public long /*int*/ method21 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method22 (int /*long*/[] args) { ++public long /*int*/ method22 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method23 (int /*long*/[] args) { ++public long /*int*/ method23 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method24 (int /*long*/[] args) { ++public long /*int*/ method24 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method25 (int /*long*/[] args) { ++public long /*int*/ method25 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method26 (int /*long*/[] args) { ++public long /*int*/ method26 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method27 (int /*long*/[] args) { ++public long /*int*/ method27 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method28 (int /*long*/[] args) { ++public long /*int*/ method28 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method29 (int /*long*/[] args) { ++public long /*int*/ method29 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method3 (int /*long*/[] args) { ++public long /*int*/ method3 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method30 (int /*long*/[] args) { ++public long /*int*/ method30 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method31 (int /*long*/[] args) { ++public long /*int*/ method31 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method32 (int /*long*/[] args) { ++public long /*int*/ method32 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method33 (int /*long*/[] args) { ++public long /*int*/ method33 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method34 (int /*long*/[] args) { ++public long /*int*/ method34 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method35 (int /*long*/[] args) { ++public long /*int*/ method35 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method36 (int /*long*/[] args) { ++public long /*int*/ method36 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method37 (int /*long*/[] args) { ++public long /*int*/ method37 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method38 (int /*long*/[] args) { ++public long /*int*/ method38 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method39 (int /*long*/[] args) { ++public long /*int*/ method39 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method4 (int /*long*/[] args) { ++public long /*int*/ method4 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method40 (int /*long*/[] args) { ++public long /*int*/ method40 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method41 (int /*long*/[] args) { ++public long /*int*/ method41 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method42 (int /*long*/[] args) { ++public long /*int*/ method42 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method43 (int /*long*/[] args) { ++public long /*int*/ method43 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method44 (int /*long*/[] args) { ++public long /*int*/ method44 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method45 (int /*long*/[] args) { ++public long /*int*/ method45 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method46 (int /*long*/[] args) { ++public long /*int*/ method46 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method47 (int /*long*/[] args) { ++public long /*int*/ method47 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method48 (int /*long*/[] args) { ++public long /*int*/ method48 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method49 (int /*long*/[] args) { ++public long /*int*/ method49 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method5 (int /*long*/[] args) { ++public long /*int*/ method5 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method50 (int /*long*/[] args) { ++public long /*int*/ method50 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method51 (int /*long*/[] args) { ++public long /*int*/ method51 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method52 (int /*long*/[] args) { ++public long /*int*/ method52 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method53 (int /*long*/[] args) { ++public long /*int*/ method53 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method54 (int /*long*/[] args) { ++public long /*int*/ method54 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method55 (int /*long*/[] args) { ++public long /*int*/ method55 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method56 (int /*long*/[] args) { ++public long /*int*/ method56 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method57 (int /*long*/[] args) { ++public long /*int*/ method57 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method58 (int /*long*/[] args) { ++public long /*int*/ method58 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method59 (int /*long*/[] args) { ++public long /*int*/ method59 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method6 (int /*long*/[] args) { ++public long /*int*/ method6 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method60 (int /*long*/[] args) { ++public long /*int*/ method60 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method61 (int /*long*/[] args) { ++public long /*int*/ method61 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method62 (int /*long*/[] args) { ++public long /*int*/ method62 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method63 (int /*long*/[] args) { ++public long /*int*/ method63 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method64 (int /*long*/[] args) { ++public long /*int*/ method64 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method65 (int /*long*/[] args) { ++public long /*int*/ method65 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method66 (int /*long*/[] args) { ++public long /*int*/ method66 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method67 (int /*long*/[] args) { ++public long /*int*/ method67 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method68 (int /*long*/[] args) { ++public long /*int*/ method68 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method69 (int /*long*/[] args) { ++public long /*int*/ method69 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method7 (int /*long*/[] args) { ++public long /*int*/ method7 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method70 (int /*long*/[] args) { ++public long /*int*/ method70 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method71 (int /*long*/[] args) { ++public long /*int*/ method71 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method72 (int /*long*/[] args) { ++public long /*int*/ method72 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method73 (int /*long*/[] args) { ++public long /*int*/ method73 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method74 (int /*long*/[] args) { ++public long /*int*/ method74 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method75 (int /*long*/[] args) { ++public long /*int*/ method75 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method76 (int /*long*/[] args) { ++public long /*int*/ method76 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method77 (int /*long*/[] args) { ++public long /*int*/ method77 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method78 (int /*long*/[] args) { ++public long /*int*/ method78 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method79 (int /*long*/[] args) { ++public long /*int*/ method79 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method8 (int /*long*/[] args) { ++public long /*int*/ method8 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +-public int /*long*/ method9 (int /*long*/[] args) { ++public long /*int*/ method9 (long /*int*/[] args) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/opengl/glx/GLX.java swt-gtk-3.7//org/eclipse/swt/internal/opengl/glx/GLX.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/opengl/glx/GLX.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/opengl/glx/GLX.java 2011-06-13 20:53:32.000000000 +0000 +@@ -231,8 +231,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native int /*long*/ _glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList); +-public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList) { ++public static final native long /*int*/ _glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList); ++public static final long /*int*/ glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList) { + lock.lock(); + try { + return _glXChooseVisual(dpy, screen, attribList); +@@ -245,8 +245,8 @@ + * @param src cast=(GLXContext) + * @param dst cast=(GLXContext) + */ +-public static final native void _glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask); +-public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask) { ++public static final native void _glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask); ++public static final void glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask) { + lock.lock(); + try { + _glXCopyContext(dpy, src, dst, mask); +@@ -258,8 +258,8 @@ + * @param dpy cast=(Display *) + * @param shareList cast=(GLXContext) + */ +-public static final native int /*long*/ _glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct); +-public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct) { ++public static final native long /*int*/ _glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct); ++public static final long /*int*/ glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct) { + lock.lock(); + try { + return _glXCreateContext(dpy, vis, shareList, direct); +@@ -271,8 +271,8 @@ + * @param dpy cast=(Display *) + * @param pixmap cast=(Pixmap) + */ +-public static final native int /*long*/ _glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap); +-public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap) { ++public static final native long /*int*/ _glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap); ++public static final long /*int*/ glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap) { + lock.lock(); + try { + return _glXCreateGLXPixmap(dpy, vis, pixmap); +@@ -284,8 +284,8 @@ + * @param dpy cast=(Display *) + * @param ctx cast=(GLXContext) + */ +-public static final native void _glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx); +-public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) { ++public static final native void _glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx); ++public static final void glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx) { + lock.lock(); + try { + _glXDestroyContext(dpy, ctx); +@@ -297,8 +297,8 @@ + * @param dpy cast=(Display *) + * @param pix cast=(GLXPixmap) + */ +-public static final native void _glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix); +-public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) { ++public static final native void _glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix); ++public static final void glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix) { + lock.lock(); + try { + _glXDestroyGLXPixmap(dpy, pix); +@@ -307,8 +307,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native int /*long*/ _glXGetClientString(int /*long*/ dpy, int name); +-public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) { ++public static final native long /*int*/ _glXGetClientString(long /*int*/ dpy, int name); ++public static final long /*int*/ glXGetClientString(long /*int*/ dpy, int name) { + lock.lock(); + try { + return _glXGetClientString(dpy, name); +@@ -317,8 +317,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native int _glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value); +-public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value) { ++public static final native int _glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value); ++public static final int glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value) { + lock.lock(); + try { + return _glXGetConfig(dpy, vis, attrib, value); +@@ -326,8 +326,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _glXGetCurrentContext(); +-public static final int /*long*/ glXGetCurrentContext() { ++public static final native long /*int*/ _glXGetCurrentContext(); ++public static final long /*int*/ glXGetCurrentContext() { + lock.lock(); + try { + return _glXGetCurrentContext(); +@@ -335,8 +335,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _glXGetCurrentDrawable(); +-public static final int /*long*/ glXGetCurrentDrawable() { ++public static final native long /*int*/ _glXGetCurrentDrawable(); ++public static final long /*int*/ glXGetCurrentDrawable() { + lock.lock(); + try { + return _glXGetCurrentDrawable(); +@@ -348,8 +348,8 @@ + * @param dpy cast=(Display *) + * @param ctx cast=(GLXContext) + */ +-public static final native boolean _glXIsDirect(int /*long*/ dpy, int /*long*/ ctx); +-public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) { ++public static final native boolean _glXIsDirect(long /*int*/ dpy, long /*int*/ ctx); ++public static final boolean glXIsDirect(long /*int*/ dpy, long /*int*/ ctx) { + lock.lock(); + try { + return _glXIsDirect(dpy, ctx); +@@ -362,8 +362,8 @@ + * @param drawable cast=(GLXDrawable) + * @param ctx cast=(GLXContext) + */ +-public static final native boolean _glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx); +-public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx) { ++public static final native boolean _glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx); ++public static final boolean glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx) { + lock.lock(); + try { + return _glXMakeCurrent(dpy, drawable, ctx); +@@ -372,8 +372,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native boolean _glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase); +-public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase) { ++public static final native boolean _glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase); ++public static final boolean glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase) { + lock.lock(); + try { + return _glXQueryExtension(dpy, errorBase, eventBase); +@@ -382,8 +382,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native int /*long*/ _glXQueryExtensionsString(int /*long*/ dpy, int screen); +-public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int screen) { ++public static final native long /*int*/ _glXQueryExtensionsString(long /*int*/ dpy, int screen); ++public static final long /*int*/ glXQueryExtensionsString(long /*int*/ dpy, int screen) { + lock.lock(); + try { + return _glXQueryExtensionsString(dpy, screen); +@@ -392,8 +392,8 @@ + } + } + /** @param dpy cast=(Display *) */ +-public static final native int /*long*/ _glXQueryServerString(int /*long*/ dpy, int screen, int name); +-public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int screen, int name) { ++public static final native long /*int*/ _glXQueryServerString(long /*int*/ dpy, int screen, int name); ++public static final long /*int*/ glXQueryServerString(long /*int*/ dpy, int screen, int name) { + lock.lock(); + try { + return _glXQueryServerString(dpy, screen, name); +@@ -406,8 +406,8 @@ + * @param major flags=no_in + * @param minor flags=no_in + */ +-public static final native boolean _glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor); +-public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor) { ++public static final native boolean _glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor); ++public static final boolean glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor) { + lock.lock(); + try { + return _glXQueryVersion(dpy, major, minor); +@@ -419,8 +419,8 @@ + * @param dpy cast=(Display *) + * @param drawable cast=(GLXDrawable) + */ +-public static final native void _glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable); +-public static final void glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable) { ++public static final native void _glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable); ++public static final void glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable) { + lock.lock(); + try { + _glXSwapBuffers(dpy, drawable); +@@ -450,5 +450,5 @@ + * @param src cast=(const void *) + * @param size cast=(size_t) + */ +-public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size); ++public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java swt-gtk-3.7//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -12,7 +12,7 @@ + + public class XVisualInfo { + /** @field cast=(Visual *) */ +- public int /*long*/ visual; ++ public long /*int*/ visual; + public int visualid; + public int screen; + public int depth; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ButtonDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/ButtonDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ButtonDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/ButtonDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -25,10 +25,10 @@ + void draw(Theme theme, GC gc, Rectangle bounds) { + int state = this.state[DrawData.WIDGET_WHOLE]; + +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ drawable = gc.getGCData().drawable; + if ((style & SWT.RADIO) != 0) { +- int /*long*/ radioButtonHandle = theme.radioButtonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle); ++ long /*int*/ radioButtonHandle = theme.radioButtonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle); + theme.transferClipping (gc, gtkStyle); + int indicator_size = theme.getWidgetProperty(radioButtonHandle, "indicator-size"); + int indicator_spacing = theme.getWidgetProperty(radioButtonHandle, "indicator-spacing"); +@@ -74,8 +74,8 @@ + } + + if ((style & SWT.CHECK) != 0) { +- int /*long*/ checkButtonHandle = theme.checkButtonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle); ++ long /*int*/ checkButtonHandle = theme.checkButtonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle); + theme.transferClipping (gc, gtkStyle); + int indicator_size = theme.getWidgetProperty(checkButtonHandle, "indicator-size"); + int indicator_spacing = theme.getWidgetProperty(checkButtonHandle, "indicator-spacing"); +@@ -122,15 +122,15 @@ + + + if ((style & SWT.PUSH) != 0) { +- int /*long*/ buttonHandle = theme.buttonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle); ++ long /*int*/ buttonHandle = theme.buttonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle); + theme.transferClipping (gc, gtkStyle); + int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width"); + int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding"); + int border_width = OS.gtk_container_get_border_width(buttonHandle); + + GtkBorder default_border = new GtkBorder(); +- int /*long*/ default_border_ptr = theme.getBorderProperty(buttonHandle, "default-border"); ++ long /*int*/ default_border_ptr = theme.getBorderProperty(buttonHandle, "default-border"); + if (default_border_ptr != 0) { + OS.memmove(default_border, default_border_ptr, GtkBorder.sizeof); + OS.gtk_border_free(default_border_ptr); +@@ -139,7 +139,7 @@ + } + + GtkBorder default_outside_border = new GtkBorder(); +- int /*long*/ default_outside_border_ptr = theme.getBorderProperty(buttonHandle, "default-outside-border"); ++ long /*int*/ default_outside_border_ptr = theme.getBorderProperty(buttonHandle, "default-outside-border"); + if (default_outside_border_ptr != 0) { + OS.memmove(default_outside_border, default_outside_border_ptr, GtkBorder.sizeof); + OS.gtk_border_free(default_outside_border_ptr); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ComboDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/ComboDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ComboDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/ComboDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -24,9 +24,9 @@ + } + + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ buttonHandle = theme.buttonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ buttonHandle = theme.buttonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + + int x = bounds.x; +@@ -61,10 +61,10 @@ + OS.gtk_paint_box(gtkStyle, drawable, state_type, shadow_type, null, buttonHandle, detail, arrow_button_x, y, arrow_button_width, height); + } + byte[] arrow_detail = Converter.wcsToMbcs(null, "arrow", true); +- int /*long*/ arrowHandle = theme.arrowHandle; ++ long /*int*/ arrowHandle = theme.arrowHandle; + OS.gtk_paint_arrow(gtkStyle, drawable, state_type, OS.GTK_SHADOW_OUT, null, arrowHandle, arrow_detail, OS.GTK_ARROW_DOWN, true, arrow_x, arrow_y, arrow_width, arrow_height); + +- int /*long*/ entryHandle = theme.entryHandle; ++ long /*int*/ entryHandle = theme.entryHandle; + gtkStyle = OS.gtk_widget_get_style(entryHandle); + theme.transferClipping(gc, gtkStyle); + state_type = getStateType(DrawData.WIDGET_WHOLE); +@@ -100,8 +100,8 @@ + + int hit(Theme theme, Point position, Rectangle bounds) { + if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; +- int /*long*/ buttonHandle = theme.buttonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle); ++ long /*int*/ buttonHandle = theme.buttonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle); + int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus"); + int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width"); + int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding"); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/DrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/DrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/DrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/DrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -79,21 +79,21 @@ + } + + void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) { +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ drawable = gc.getGCData().drawable; + Rectangle rect = image.getBounds(); + int state_type = getStateType(DrawData.WIDGET_WHOLE); + if (state_type == OS.GTK_STATE_NORMAL) { + gc.drawImage(image, 0, 0, rect.width, rect.height, bounds.x, bounds.y, bounds.width, bounds.height); + } else { +- int /*long*/ pixbuf = Theme.createPixbuf(image); +- int /*long*/ source = OS.gtk_icon_source_new(); ++ long /*int*/ pixbuf = Theme.createPixbuf(image); ++ long /*int*/ source = OS.gtk_icon_source_new(); + if (source != 0) { + OS.gtk_icon_source_set_pixbuf(source, pixbuf); + //TODO - always uses buttonHandle +- int /*long*/ buttonHandle = theme.buttonHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle); ++ long /*int*/ buttonHandle = theme.buttonHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle); + theme.transferClipping(gc, gtkStyle); +- int /*long*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null); ++ long /*int*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null); + OS.g_object_unref(pixbuf); + //TODO - stretching + if (rendered != 0) { +@@ -106,12 +106,12 @@ + } + + void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) { +- int /*long*/ widget = getTextHandle(theme); +- int /*long*/ gtkStyle = OS.gtk_widget_get_style(widget); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ widget = getTextHandle(theme); ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style(widget); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping (gc, gtkStyle); + byte[] buffer = Converter.wcsToMbcs(null, text, true); +- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer); ++ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer); + int[] width = new int[1], height = new int[1]; + OS.pango_layout_get_size(layout, width, height); + OS.pango_layout_set_width(layout, bounds.width * OS.PANGO_SCALE); +@@ -160,7 +160,7 @@ + return state_type; + } + +-int /*long*/ getTextHandle(Theme theme) { ++long /*int*/ getTextHandle(Theme theme) { + return theme.labelHandle; + } + +@@ -169,9 +169,9 @@ + } + + Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) { +- int /*long*/ widget = getTextHandle(theme); ++ long /*int*/ widget = getTextHandle(theme); + byte[] buffer = Converter.wcsToMbcs(null, text, true); +- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer); ++ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer); + if (bounds != null) OS.pango_layout_set_width(layout, bounds.width); + if ((flags & DrawData.DRAW_LEFT) != 0) { + OS.pango_layout_set_alignment(layout, OS.PANGO_ALIGN_LEFT); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ExpanderDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/ExpanderDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ExpanderDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/ExpanderDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -22,9 +22,9 @@ + } + + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ treeHandle = theme.treeHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (treeHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ treeHandle = theme.treeHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (treeHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + int state_type = getStateType(DrawData.WIDGET_WHOLE); + int expander_style = OS.GTK_EXPANDER_COLAPSED; +@@ -38,7 +38,7 @@ + + int hit(Theme theme, Point position, Rectangle bounds) { + if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; +- int /*long*/ treeHandle = theme.treeHandle; ++ long /*int*/ treeHandle = theme.treeHandle; + int expander_size = theme.getWidgetProperty(treeHandle, "expander-size"); + if (new Rectangle(bounds.x, bounds.y, expander_size, expander_size).contains(position)) { + return DrawData.WIDGET_WHOLE; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/GroupDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/GroupDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/GroupDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/GroupDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -29,9 +29,9 @@ + static final int GROUP_HEADER_X = 9; + static final int GROUP_HEADER_PAD = 2; + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ frameHandle = theme.frameHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (frameHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ frameHandle = theme.frameHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (frameHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + int xthickness = OS.gtk_style_get_xthickness(gtkStyle); + int ythickness = OS.gtk_style_get_ythickness(gtkStyle); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ProgressBarDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/ProgressBarDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -22,9 +22,9 @@ + } + + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ progressHandle = theme.progressHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (progressHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ progressHandle = theme.progressHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (progressHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + byte[] detail = Converter.wcsToMbcs(null, "trough", true); + int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/TabFolderDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/TabFolderDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/TabFolderDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/TabFolderDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -31,9 +31,9 @@ + } + + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ notebookHandle = theme.notebookHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ notebookHandle = theme.notebookHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; + height -= tabsHeight; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/TabItemDrawData.java swt-gtk-3.7//org/eclipse/swt/internal/theme/TabItemDrawData.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/TabItemDrawData.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/TabItemDrawData.java 2011-06-13 20:53:32.000000000 +0000 +@@ -27,8 +27,8 @@ + } + + Rectangle computeTrim(Theme theme, GC gc) { +- int /*long*/ notebookHandle = theme.notebookHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle); ++ long /*int*/ notebookHandle = theme.notebookHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle); + int hborder, vborder; + if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) { + hborder = theme.getWidgetProperty(notebookHandle, "tab-hborder"); +@@ -50,9 +50,9 @@ + } + + void draw(Theme theme, GC gc, Rectangle bounds) { +- int /*long*/ notebookHandle = theme.notebookHandle; +- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle); +- int /*long*/ drawable = gc.getGCData().drawable; ++ long /*int*/ notebookHandle = theme.notebookHandle; ++ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle); ++ long /*int*/ drawable = gc.getGCData().drawable; + theme.transferClipping(gc, gtkStyle); + int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; + if ((state[DrawData.WIDGET_WHOLE] & DrawData.SELECTED) == 0) { +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/Theme.java swt-gtk-3.7//org/eclipse/swt/internal/theme/Theme.java +--- swt-gtk-3.7.orig//org/eclipse/swt/internal/theme/Theme.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/internal/theme/Theme.java 2011-06-13 20:53:32.000000000 +0000 +@@ -18,7 +18,7 @@ + public class Theme { + Device device; + +- int /*long*/ shellHandle, fixedHandle, buttonHandle, arrowHandle, ++ long /*int*/ shellHandle, fixedHandle, buttonHandle, arrowHandle, + frameHandle, entryHandle, checkButtonHandle, radioButtonHandle, + notebookHandle, treeHandle, progressHandle, toolbarHandle, + labelHandle, separatorHandle; +@@ -68,29 +68,29 @@ + } + + //TODO - share this code +-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) { + paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height); +@@ -271,13 +271,13 @@ + if (length == 0) return null; + char[] chars = new char[length]; + filename.getChars(0, length, chars, 0); +- int /*long*/[] error = new int /*long*/[1]; +- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); ++ long /*int*/[] error = new long /*int*/[1]; ++ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); + if (error[0] != 0 || utf8Ptr == 0) return null; +- int /*long*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); ++ long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); + OS.g_free(utf8Ptr); + if (error[0] != 0 || localePtr == 0) return null; +- int /*long*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); ++ long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); + OS.g_free(localePtr); + if (error[0] != 0 || uriPtr == 0) return null; + length = OS.strlen(uriPtr); +@@ -292,7 +292,7 @@ + if (data.driver == null || data.name == null) { + PrinterData defaultData = null; + if (data.printToFile) { +- int /*long*/ filePrinter = gtkPrinterFromPrinterData(data); ++ long /*int*/ filePrinter = gtkPrinterFromPrinterData(data); + if (filePrinter != 0) { + defaultData = printerDataFromGtkPrinter(filePrinter); + OS.g_object_unref(filePrinter); +@@ -408,8 +408,8 @@ + public Font getSystemFont () { + checkDevice (); + if (systemFont != null) return systemFont; +- int /*long*/ style = OS.gtk_widget_get_default_style(); +- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style)); ++ long /*int*/ style = OS.gtk_widget_get_default_style(); ++ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style)); + int size = OS.pango_font_description_get_size(defaultFont); + Point dpi = getDPI(), screenDPI = super.getDPI(); + OS.pango_font_description_set_size(defaultFont, size * dpi.y / screenDPI.y); +@@ -431,11 +431,11 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public int /*long*/ internal_new_GC(GCData data) { ++public long /*int*/ internal_new_GC(GCData data) { + GdkVisual visual = new GdkVisual (); + OS.memmove (visual, OS.gdk_visual_get_system()); +- int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth); +- int /*long*/ gdkGC = OS.gdk_gc_new (drawable); ++ long /*int*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth); ++ long /*int*/ gdkGC = OS.gdk_gc_new (drawable); + if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES); + if (data != null) { + if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT); +@@ -478,7 +478,7 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public void internal_dispose_GC(int /*long*/ gdkGC, GCData data) { ++public void internal_dispose_GC(long /*int*/ gdkGC, GCData data) { + if (data != null) isGCCreated = false; + OS.g_object_unref (gdkGC); + if (data != null) { +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/program/Program.java swt-gtk-3.7//org/eclipse/swt/program/Program.java +--- swt-gtk-3.7.orig//org/eclipse/swt/program/Program.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/program/Program.java 2011-06-13 20:53:32.000000000 +0000 +@@ -42,10 +42,10 @@ + */ + boolean gnomeExpectUri; + +- static int /*long*/ modTime; ++ static long /*int*/ modTime; + static Hashtable mimeTable; + +- static int /*long*/ cdeShell; ++ static long /*int*/ cdeShell; + + static final String[] CDE_ICON_EXT = { ".m.pm", ".l.pm", ".s.pm", ".t.pm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + static final String[] CDE_MASK_EXT = { ".m_m.bm", ".l_m.bm", ".s_m.bm", ".t_m.bm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ +@@ -74,11 +74,11 @@ + int desktop = DESKTOP_UNKNOWN; + + /* Get the list of properties on the root window. */ +- int /*long*/ xDisplay = OS.GDK_DISPLAY(); +- int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY(); ++ long /*int*/ rootWindow = OS.XDefaultRootWindow(xDisplay); + int[] numProp = new int[1]; +- int /*long*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp); +- int /*long*/ [] property = new int /*long*/ [numProp[0]]; ++ long /*int*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp); ++ long /*int*/ [] property = new long /*int*/ [numProp[0]]; + if (propList != 0) { + OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF)); + OS.XFree(propList); +@@ -99,7 +99,7 @@ + */ + if (desktop == DESKTOP_UNKNOWN) { + byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true); +- int /*long*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true); ++ long /*int*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true); + if (gnome != OS.None) { + /* Check for the existence of libgio libraries first */ + byte[] buffer; +@@ -112,10 +112,10 @@ + } else { + buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true); + } +- int /*long*/ libgio = OS.dlopen(buffer, flags); ++ long /*int*/ libgio = OS.dlopen(buffer, flags); + if (libgio != 0) { + buffer = Converter.wcsToMbcs(null, "g_app_info_launch_default_for_uri", true); +- int /*long*/ g_app_info_launch_default_for_uri = OS.dlsym(libgio, buffer); ++ long /*int*/ g_app_info_launch_default_for_uri = OS.dlsym(libgio, buffer); + if (g_app_info_launch_default_for_uri != 0) { + desktop = DESKTOP_GIO; + } +@@ -124,7 +124,7 @@ + + if (desktop == DESKTOP_UNKNOWN && (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) && gnome_init()) { + desktop = DESKTOP_GNOME; +- int /*long*/ icon_theme = GNOME.gnome_icon_theme_new(); ++ long /*int*/ icon_theme = GNOME.gnome_icon_theme_new(); + display.setData(ICON_THEME_DATA, new LONG(icon_theme)); + display.addListener(SWT.Dispose, new Listener() { + public void handleEvent(Event event) { +@@ -140,10 +140,10 @@ + }); + /* Check for libgnomevfs-2 version 2.4 */ + buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true); +- int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY); ++ long /*int*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY); + if (libgnomevfs != 0) { + buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true); +- int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer); ++ long /*int*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer); + if (gnome_vfs_url_show != 0) { + desktop = DESKTOP_GNOME_24; + } +@@ -160,7 +160,7 @@ + */ + if (desktop == DESKTOP_UNKNOWN) { + byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true); +- int /*long*/ cde = OS.XInternAtom(xDisplay, cdeName, true); ++ long /*int*/ cde = OS.XInternAtom(xDisplay, cdeName, true); + for (int index = 0; desktop == DESKTOP_UNKNOWN && index < property.length; index++) { + if (property[index] == OS.None) continue; /* do not match atoms that do not exist */ + if (property[index] == cde && cde_init(display)) desktop = DESKTOP_CDE; +@@ -175,7 +175,7 @@ + /* Use the character encoding for the default locale */ + byte[] action = Converter.wcsToMbcs(null, command, true); + byte[] fileArg = Converter.wcsToMbcs(null, fileName, true); +- int /*long*/ ptr = OS.g_malloc(fileArg.length); ++ long /*int*/ ptr = OS.g_malloc(fileArg.length); + OS.memmove(ptr, fileArg, fileArg.length); + DtActionArg args = new DtActionArg(); + args.argClass = CDE.DtACTION_FILE; +@@ -205,7 +205,7 @@ + byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true); + byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true); + byte[] optNameBuf = null; +- int /*long*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf); ++ long /*int*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf); + if (attrValue == 0) return null; + int length = OS.strlen(attrValue); + byte[] attrValueBuf = new byte[length]; +@@ -218,11 +218,11 @@ + static Hashtable cde_getDataTypeInfo() { + Hashtable dataTypeInfo = new Hashtable(); + int index; +- int /*long*/ dataTypeList = CDE.DtDtsDataTypeNames(); ++ long /*int*/ dataTypeList = CDE.DtDtsDataTypeNames(); + if (dataTypeList != 0) { + /* For each data type name in the list */ + index = 0; +- int /*long*/ [] dataType = new int /*long*/ [1]; ++ long /*int*/ [] dataType = new long /*int*/ [1]; + OS.memmove(dataType, dataTypeList + (index++ * 4), 4); + while (dataType[0] != 0) { + int length = OS.strlen(dataType[0]); +@@ -306,13 +306,13 @@ + + /* Use the character encoding for the default locale */ + CDE.XtToolkitInitialize(); +- int /*long*/ xtContext = CDE.XtCreateApplicationContext (); +- int /*long*/ xDisplay = OS.GDK_DISPLAY(); ++ long /*int*/ xtContext = CDE.XtCreateApplicationContext (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY(); + byte[] appName = Converter.wcsToMbcs(null, "CDE", true); + byte[] appClass = Converter.wcsToMbcs(null, "CDE", true); +- int /*long*/ [] argc = new int /*long*/ [] {0}; ++ long /*int*/ [] argc = new long /*int*/ [] {0}; + CDE.XtDisplayInitialize(xtContext, xDisplay, appName, appClass, 0, 0, argc, 0); +- int /*long*/ widgetClass = CDE.topLevelShellWidgetClass (); ++ long /*int*/ widgetClass = CDE.topLevelShellWidgetClass (); + cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0); + CDE.XtSetMappedWhenManaged (cdeShell, false); + CDE.XtResizeWidget (cdeShell, 10, 10, 0); +@@ -378,10 +378,10 @@ + */ + boolean gnome_24_execute(String fileName) { + byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true); +- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer); ++ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer); + byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true); +- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT); +- int /*long*/ list = GNOME.g_list_append(0, uri); ++ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT); ++ long /*int*/ list = GNOME.g_list_append(0, uri); + int result = GNOME.gnome_vfs_mime_application_launch(ptr, list); + GNOME.gnome_vfs_mime_application_free(ptr); + GNOME.g_free(uri); +@@ -394,7 +394,7 @@ + */ + static boolean gnome_24_launch(String fileName) { + byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true); +- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT); ++ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT); + int result = GNOME.gnome_vfs_url_show(uri); + GNOME.g_free(uri); + return (result == GNOME.GNOME_VFS_OK); +@@ -407,7 +407,7 @@ + if (gnomeExpectUri) { + /* Convert the given path into a URL */ + byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true); +- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer); ++ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer); + if (uri != 0) { + int length = OS.strlen(uri); + if (length > 0) { +@@ -471,24 +471,24 @@ + */ + static Hashtable gnome_getMimeInfo() { + Hashtable mimeInfo = new Hashtable(); +- int /*long*/[] mimeData = new int /*long*/[1]; +- int /*long*/[] extensionData = new int /*long*/[1]; +- int /*long*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types(); +- int /*long*/ mimeElement = mimeList; ++ long /*int*/[] mimeData = new long /*int*/[1]; ++ long /*int*/[] extensionData = new long /*int*/[1]; ++ long /*int*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types(); ++ long /*int*/ mimeElement = mimeList; + while (mimeElement != 0) { + OS.memmove (mimeData, mimeElement, OS.PTR_SIZEOF); +- int /*long*/ mimePtr = mimeData[0]; ++ long /*int*/ mimePtr = mimeData[0]; + int mimeLength = OS.strlen(mimePtr); + byte[] mimeTypeBuffer = new byte[mimeLength]; + OS.memmove(mimeTypeBuffer, mimePtr, mimeLength); + String mimeType = new String(Converter.mbcsToWcs(null, mimeTypeBuffer)); +- int /*long*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr); ++ long /*int*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr); + if (extensionList != 0) { + Vector extensions = new Vector(); +- int /*long*/ extensionElement = extensionList; ++ long /*int*/ extensionElement = extensionList; + while (extensionElement != 0) { + OS.memmove(extensionData, extensionElement, OS.PTR_SIZEOF); +- int /*long*/ extensionPtr = extensionData[0]; ++ long /*int*/ extensionPtr = extensionData[0]; + int extensionLength = OS.strlen(extensionPtr); + byte[] extensionBuffer = new byte[extensionLength]; + OS.memmove(extensionBuffer, extensionPtr, extensionLength); +@@ -510,7 +510,7 @@ + String mimeType = null; + String fileName = "swt" + extension; + byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true); +- int /*long*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer); ++ long /*int*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer); + if (typeName != 0) { + int length = OS.strlen(typeName); + if (length > 0) { +@@ -525,7 +525,7 @@ + static Program gnome_getProgram(Display display, String mimeType) { + Program program = null; + byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true); +- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer); ++ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer); + if (ptr != 0) { + program = new Program(); + program.display = display; +@@ -542,9 +542,9 @@ + buffer = new byte[length + 1]; + OS.memmove(buffer, application.id, length); + LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA); +- int /*long*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer, ++ long /*int*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer, + GNOME.GNOME_ICON_LOOKUP_FLAGS_NONE, null); +- int /*long*/ path = 0; ++ long /*int*/ path = 0; + if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null); + if (path != 0) { + length = OS.strlen(path); +@@ -575,8 +575,8 @@ + if (!GNOME.gnome_vfs_is_executable_command_string(fileNameBuffer)) return false; + + /* check if the mime type is executable */ +- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer); +- int /*long*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri); ++ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer); ++ long /*int*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri); + GNOME.g_free(uri); + + byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$ +@@ -725,16 +725,16 @@ + ImageData gio_getImageData() { + if (iconPath == null) return null; + ImageData data = null; +- int /*long*/ icon_theme =OS.gtk_icon_theme_get_default(); ++ long /*int*/ icon_theme =OS.gtk_icon_theme_get_default(); + byte[] icon = Converter.wcsToMbcs (null, iconPath, true); +- int /*long*/ gicon = OS.g_icon_new_for_string(icon, null); ++ long /*int*/ gicon = OS.g_icon_new_for_string(icon, null); + if (gicon != 0) { +- int /*long*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0); ++ long /*int*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0); + if (gicon_info != 0) { +- int /*long*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null); ++ long /*int*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null); + if (pixbuf != 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); + int height = OS.gdk_pixbuf_get_height(pixbuf); + int width = OS.gdk_pixbuf_get_width(pixbuf); + boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf); +@@ -769,7 +769,7 @@ + } + + static Hashtable gio_getMimeInfo() { +- int /*long*/ mimeDatabase = 0, fileInfo = 0; ++ long /*int*/ mimeDatabase = 0, fileInfo = 0; + /* + * The file 'globs' contain the file extensions + * associated to the mime-types. Each line that has +@@ -779,10 +779,10 @@ + */ + byte[] buffer = Converter.wcsToMbcs (null, "/usr/share/mime/globs", true); + mimeDatabase = OS.g_file_new_for_path (buffer); +- int /*long*/ fileInputStream = OS.g_file_read (mimeDatabase, 0, 0); ++ long /*int*/ fileInputStream = OS.g_file_read (mimeDatabase, 0, 0); + try { + if (fileInputStream != 0) { +- int /*long*/ [] modTimestamp = new int /*long*/ [2]; ++ long /*int*/ [] modTimestamp = new long /*int*/ [2]; + buffer = Converter.wcsToMbcs (null, "*", true); + fileInfo = OS.g_file_query_info(mimeDatabase, buffer, 0, 0, 0); + OS.g_file_info_get_modification_time(fileInfo, modTimestamp); +@@ -791,11 +791,11 @@ + } else { + mimeTable = new Hashtable(); + modTime = modTimestamp[0]; +- int /*long*/ reader = OS.g_data_input_stream_new (fileInputStream); ++ long /*int*/ reader = OS.g_data_input_stream_new (fileInputStream); + int[] length = new int[1]; + + if (reader != 0) { +- int /*long*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0); ++ long /*int*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0); + while (linePtr != 0) { + byte[] lineBytes = new byte[length[0]]; + OS.memmove(lineBytes, linePtr, length[0]); +@@ -850,19 +850,19 @@ + static Program gio_getProgram(Display display, String mimeType) { + Program program = null; + byte[] mimeTypeBuffer = Converter.wcsToMbcs (null, mimeType, true); +- int /*long*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false); ++ long /*int*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false); + if (application != 0) { + program = gio_getProgram(display, application); + } + return program; + } + +-static Program gio_getProgram (Display display, int /*long*/ application) { ++static Program gio_getProgram (Display display, long /*int*/ application) { + Program program = new Program(); + program.display = display; + int length; + byte[] buffer; +- int /*long*/ applicationName = OS.g_app_info_get_name (application); ++ long /*int*/ applicationName = OS.g_app_info_get_name (application); + if (applicationName != 0) { + length = OS.strlen (applicationName); + if (length > 0) { +@@ -871,7 +871,7 @@ + program.name = new String (Converter.mbcsToWcs (null, buffer)); + } + } +- int /*long*/ applicationCommand = OS.g_app_info_get_executable (application); ++ long /*int*/ applicationCommand = OS.g_app_info_get_executable (application); + if (applicationCommand != 0) { + length = OS.strlen (applicationCommand); + if (length > 0) { +@@ -881,9 +881,9 @@ + } + } + program.gnomeExpectUri = OS.g_app_info_supports_uris(application); +- int /*long*/ icon = OS.g_app_info_get_icon(application); ++ long /*int*/ icon = OS.g_app_info_get_icon(application); + if (icon != 0) { +- int /*long*/ icon_name = OS.g_icon_to_string(icon); ++ long /*int*/ icon_name = OS.g_icon_to_string(icon); + if (icon_name != 0) { + length = OS.strlen(icon_name); + if (length > 0) { +@@ -899,12 +899,12 @@ + } + + static Program[] gio_getPrograms(Display display) { +- int /*long*/ applicationList = OS.g_app_info_get_all (); +- int /*long*/ list = applicationList; ++ long /*int*/ applicationList = OS.g_app_info_get_all (); ++ long /*int*/ list = applicationList; + Program program; + Vector programs = new Vector(); + while (list != 0) { +- int /*long*/ application = OS.g_list_data(list); ++ long /*int*/ application = OS.g_list_data(list); + if (application != 0) { + //TODO: Should the list be filtered or not? + // if (OS.g_app_info_should_show(application)) { +@@ -926,13 +926,13 @@ + byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); + if (OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_DIR)) return false; + if (!OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_EXECUTABLE)) return false; +- int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer); ++ long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer); + boolean result = false; + if (file != 0) { + byte[] buffer = Converter.wcsToMbcs (null, "*", true); //$NON-NLS-1$ +- int /*long*/ fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0); ++ long /*int*/ fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0); + if (fileInfo != 0) { +- int /*long*/ contentType = OS.g_file_info_get_content_type(fileInfo); ++ long /*int*/ contentType = OS.g_file_info_get_content_type(fileInfo); + if (contentType != 0) { + byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$ + result = OS.g_content_type_is_a(contentType, exeType); +@@ -954,9 +954,9 @@ + static boolean gio_launch(String fileName) { + boolean result = false; + byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); +- int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer); ++ long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer); + if (file != 0) { +- int /*long*/ uri = OS.g_file_get_uri (file); ++ long /*int*/ uri = OS.g_file_get_uri (file); + if (uri != 0) { + result = OS.g_app_info_launch_default_for_uri (uri, 0, 0); + OS.g_free(uri); +@@ -973,11 +973,11 @@ + boolean result = false; + byte[] commandBuffer = Converter.wcsToMbcs (null, command, true); + byte[] nameBuffer = Converter.wcsToMbcs (null, name, true); +- int /*long*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gnomeExpectUri ++ long /*int*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gnomeExpectUri + ? OS.G_APP_INFO_CREATE_SUPPORTS_URIS : OS.G_APP_INFO_CREATE_NONE, 0); + if (application != 0) { + byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); +- int /*long*/ file = 0; ++ long /*int*/ file = 0; + if (fileName.length() > 0) { + if (OS.g_app_info_supports_uris (application)) { + file = OS.g_file_new_for_uri (fileNameBuffer); +@@ -985,7 +985,7 @@ + file = OS.g_file_new_for_path (fileNameBuffer); + } + } +- int /*long*/ list = 0; ++ long /*int*/ list = 0; + if (file != 0) list = OS.g_list_append (0, file); + result = OS.g_app_info_launch (application, list, 0, 0); + if (list != 0) { +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Button.java swt-gtk-3.7//org/eclipse/swt/widgets/Button.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Button.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Button.java 2011-06-13 20:53:32.000000000 +0000 +@@ -45,7 +45,7 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Button extends Control { +- int /*long*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle; ++ long /*int*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle; + boolean selected, grayed; + ImageList imageList; + Image image; +@@ -111,9 +111,9 @@ + return style; + } + +-static GtkBorder getBorder (byte[] border, int /*long*/ handle, int defaultBorder) { ++static GtkBorder getBorder (byte[] border, long /*int*/ handle, int defaultBorder) { + GtkBorder gtkBorder = new GtkBorder(); +- int /*long*/ [] borderPtr = new int /*long*/ [1]; ++ long /*int*/ [] borderPtr = new long /*int*/ [1]; + OS.gtk_widget_style_get (handle, border, borderPtr,0); + if (borderPtr[0] != 0) { + OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof); +@@ -201,7 +201,7 @@ + indicatorHeight = indicatorSize [0] + 2 * indicatorSpacing [0]; + trimWidth += indicatorHeight + indicatorSpacing [0]; + } else { +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + trimWidth += OS.gtk_style_get_xthickness (style) * 2; + trimHeight += OS.gtk_style_get_ythickness (style) * 2; + GtkBorder innerBorder = getBorder (OS.inner_border, handle, INNER_BORDER); +@@ -223,7 +223,7 @@ + OS.g_object_get (boxHandle, OS.spacing, spacing, 0); + imageWidth += spacing [0]; + } +- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle); ++ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle); + int pangoWidth = OS.pango_layout_get_width (labelLayout); + if (wHint != SWT.DEFAULT) { + OS.pango_layout_set_width (labelLayout, Math.max (1, (wHint - imageWidth - trimWidth)) * OS.PANGO_SCALE); +@@ -343,7 +343,7 @@ + if (arrowHandle != 0) display.removeWidget (arrowHandle); + } + +-int /*long*/ fontHandle () { ++long /*int*/ fontHandle () { + if (labelHandle != 0) return labelHandle; + return super.fontHandle (); + } +@@ -459,14 +459,14 @@ + return text; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_button_press_event (widget, event); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_button_press_event (widget, event); + if (result != 0) return result; + if ((style & SWT.RADIO) != 0) selected = getSelection (); + return result; + } + +-int /*long*/ gtk_clicked (int /*long*/ widget) { ++long /*int*/ gtk_clicked (long /*int*/ widget) { + if ((style & SWT.RADIO) != 0) { + if ((parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) { + setSelection (!selected); +@@ -488,8 +488,8 @@ + return 0; + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_in_event (widget, event); ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_in_event (widget, event); + // widget could be disposed at this point + if (handle == 0) return 0; + if ((style & SWT.PUSH) != 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) { +@@ -499,8 +499,8 @@ + return result; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_out_event (widget, event); ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_out_event (widget, event); + // widget could be disposed at this point + if (handle == 0) return 0; + if ((style & SWT.PUSH) != 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) { +@@ -512,8 +512,8 @@ + return result; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) return result; + if ((style & SWT.RADIO) != 0) selected = getSelection (); + return result; +@@ -747,7 +747,7 @@ + if (wrap) { + int boxWidth = OS.GTK_WIDGET_WIDTH (boxHandle); + int boxHeight = OS.GTK_WIDGET_HEIGHT (boxHandle); +- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle); ++ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle); + int pangoWidth = OS.pango_layout_get_width (labelLayout); + OS.pango_layout_set_width (labelLayout, -1); + int [] w = new int [1], h = new int [1]; +@@ -779,7 +779,7 @@ + return result; + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font); + if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font); +@@ -854,7 +854,7 @@ + if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); + imageList = new ImageList (); + int imageIndex = imageList.add (image); +- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex); ++ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); + if (text.length () == 0) OS.gtk_widget_hide (labelHandle); + OS.gtk_widget_show (imageHandle); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Canvas.java swt-gtk-3.7//org/eclipse/swt/widgets/Canvas.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Canvas.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Canvas.java 2011-06-13 20:53:32.000000000 +0000 +@@ -144,46 +144,46 @@ + return ime; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + if (ime != null) { +- int /*long*/ result = ime.gtk_button_press_event (widget, event); ++ long /*int*/ result = ime.gtk_button_press_event (widget, event); + if (result != 0) return result; + } + return super.gtk_button_press_event (widget, event); + } + +-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) { ++long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { + if (ime != null) { +- int /*long*/ result = ime.gtk_commit (imcontext, text); ++ long /*int*/ result = ime.gtk_commit (imcontext, text); + if (result != 0) return result; + } + return super.gtk_commit (imcontext, text); + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) { + if ((state & OBSCURED) != 0) return 0; + boolean isFocus = caret != null && caret.isFocusCaret (); + if (isFocus) caret.killFocus (); +- int /*long*/ result = super.gtk_expose_event (widget, event); ++ long /*int*/ result = super.gtk_expose_event (widget, event); + if (isFocus) caret.setFocus (); + return result; + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_in_event (widget, event); ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_in_event (widget, event); + if (caret != null) caret.setFocus (); + return result; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_out_event (widget, event); ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_out_event (widget, event); + if (caret != null) caret.killFocus (); + return result; + } + +-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { ++long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { + if (ime != null) { +- int /*long*/ result = ime.gtk_preedit_changed (imcontext); ++ long /*int*/ result = ime.gtk_preedit_changed (imcontext); + if (result != 0) return result; + } + return super.gtk_preedit_changed (imcontext); +@@ -249,16 +249,16 @@ + if (!isVisible ()) return; + boolean isFocus = caret != null && caret.isFocusCaret (); + if (isFocus) caret.killFocus (); +- int /*long*/ window = paintWindow (); +- int /*long*/ visibleRegion = OS.gdk_drawable_get_visible_region (window); ++ long /*int*/ window = paintWindow (); ++ long /*int*/ visibleRegion = OS.gdk_drawable_get_visible_region (window); + GdkRectangle srcRect = new GdkRectangle (); + srcRect.x = x; + srcRect.y = y; + srcRect.width = width; + srcRect.height = height; +- int /*long*/ copyRegion = OS.gdk_region_rectangle (srcRect); ++ long /*int*/ copyRegion = OS.gdk_region_rectangle (srcRect); + OS.gdk_region_intersect(copyRegion, visibleRegion); +- int /*long*/ invalidateRegion = OS.gdk_region_rectangle (srcRect); ++ long /*int*/ invalidateRegion = OS.gdk_region_rectangle (srcRect); + OS.gdk_region_subtract (invalidateRegion, visibleRegion); + OS.gdk_region_offset (invalidateRegion, deltaX, deltaY); + GdkRectangle copyRect = new GdkRectangle(); +@@ -275,7 +275,7 @@ + // GC gc = new GC (this); + // gc.copyArea (x, y, width, height, destX, destY); + // gc.dispose (); +- int /*long*/ gdkGC = OS.gdk_gc_new (window); ++ long /*int*/ gdkGC = OS.gdk_gc_new (window); + OS.gdk_gc_set_exposures (gdkGC, true); + OS.gdk_draw_drawable (window, gdkGC, window, copyRect.x, copyRect.y, copyRect.x + deltaX, copyRect.y + deltaY, copyRect.width, copyRect.height); + OS.g_object_unref (gdkGC); +@@ -397,7 +397,7 @@ + } + + void updateCaret () { +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle == 0) return; + GdkRectangle rect = new GdkRectangle (); + rect.x = caret.x; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Caret.java swt-gtk-3.7//org/eclipse/swt/widgets/Caret.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Caret.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Caret.java 2011-06-13 20:53:32.000000000 +0000 +@@ -96,13 +96,13 @@ + boolean drawCaret () { + if (parent == null) return false; + if (parent.isDisposed ()) return false; +- int /*long*/ window = parent.paintWindow (); +- int /*long*/ gc = OS.gdk_gc_new (window); ++ long /*int*/ window = parent.paintWindow (); ++ long /*int*/ gc = OS.gdk_gc_new (window); + GdkColor color = new GdkColor (); + color.red = (short) 0xffff; + color.green = (short) 0xffff; + color.blue = (short) 0xffff; +- int /*long*/ colormap = OS.gdk_colormap_get_system (); ++ long /*int*/ colormap = OS.gdk_colormap_get_system (); + OS.gdk_colormap_alloc_color (colormap, color, true, true); + OS.gdk_gc_set_foreground (gc, color); + OS.gdk_gc_set_function (gc, OS.GDK_XOR); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ColorDialog.java swt-gtk-3.7//org/eclipse/swt/widgets/ColorDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ColorDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ColorDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -113,19 +113,19 @@ + */ + public RGB open () { + byte [] buffer = Converter.wcsToMbcs (null, title, true); +- int /*long*/ handle = OS.gtk_color_selection_dialog_new (buffer); ++ long /*int*/ handle = OS.gtk_color_selection_dialog_new (buffer); + Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); + if (parent != null) { +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + OS.gtk_window_set_transient_for (handle, shellHandle); +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); + } + } + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { +- int /*long*/ group = OS.gtk_window_get_group(0); ++ long /*int*/ group = OS.gtk_window_get_group(0); + OS.gtk_window_group_add_window (group, handle); + } + OS.gtk_window_set_modal (handle, true); +@@ -146,7 +146,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Combo.java swt-gtk-3.7//org/eclipse/swt/widgets/Combo.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Combo.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Combo.java 2011-06-13 20:53:32.000000000 +0000 +@@ -57,9 +57,9 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Combo extends Composite { +- int /*long*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle, menuHandle; ++ long /*int*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle, menuHandle; + int lastEventTime, visibleCount = 10; +- int /*long*/ gdkEventKey = 0; ++ long /*int*/ gdkEventKey = 0; + int fixStart = -1, fixEnd = -1; + String [] items = new String [0]; + boolean ignoreSelect, lockText, selectionAdded; +@@ -182,13 +182,13 @@ + * stopping the "delete" and "insert_text" signal emission. + */ + ignoreSelect = lockText = true; +- int /*long*/ item = OS.gtk_list_item_new_with_label (buffer); +- int /*long*/ label = OS.gtk_bin_get_child (item); ++ long /*int*/ item = OS.gtk_list_item_new_with_label (buffer); ++ long /*int*/ label = OS.gtk_bin_get_child (item); + setForegroundColor (label, getForegroundColor ()); + OS.gtk_widget_modify_font (label, getFontDescription ()); + OS.gtk_widget_set_direction (label, OS.gtk_widget_get_direction (handle)); + OS.gtk_widget_show (item); +- int /*long*/ items = OS.g_list_append (0, item); ++ long /*int*/ items = OS.g_list_append (0, item); + OS.gtk_list_insert_items (listHandle, items, index); + ignoreSelect = lockText = false; + } +@@ -343,9 +343,9 @@ + if ((style & SWT.READ_ONLY) != 0) { + int index = OS.gtk_combo_box_get_active (handle); + if (index != -1) { +- int /*long*/ modelHandle = OS.gtk_combo_box_get_model (handle); +- int /*long*/ [] ptr = new int /*long*/ [1]; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ modelHandle = OS.gtk_combo_box_get_model (handle); ++ long /*int*/ [] ptr = new long /*int*/ [1]; ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); + OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1); + OS.g_free (iter); +@@ -369,10 +369,10 @@ + if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0; + int[] w = new int [1], h = new int [1]; + OS.gtk_widget_realize (entryHandle); +- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle); ++ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle); + OS.pango_layout_get_size (layout, w, h); + int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER; +- int /*long*/ style = OS.gtk_widget_get_style (entryHandle); ++ long /*int*/ style = OS.gtk_widget_get_style (entryHandle); + xborder += OS.gtk_style_get_xthickness (style); + yborder += OS.gtk_style_get_ythickness (style); + int [] property = new int [1]; +@@ -388,7 +388,7 @@ + GtkRequisition arrowRequesition = new GtkRequisition (); + OS.gtk_widget_size_request (buttonHandle, arrowRequesition); + GtkRequisition listRequesition = new GtkRequisition (); +- int /*long*/ listParent = OS.gtk_widget_get_parent (listHandle); ++ long /*int*/ listParent = OS.gtk_widget_get_parent (listHandle); + OS.gtk_widget_size_request (listParent != 0 ? listParent : listHandle, listRequesition); + + width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4; +@@ -421,7 +421,7 @@ + if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (fixedHandle, true); + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { +- int /*long*/ oldList = OS.gtk_window_list_toplevels (); ++ long /*int*/ oldList = OS.gtk_window_list_toplevels (); + if ((style & SWT.READ_ONLY) != 0) { + handle = OS.gtk_combo_box_new_text (); + if (handle == 0) error (SWT.ERROR_NO_HANDLES); +@@ -486,14 +486,14 @@ + listHandle = combo.list; + + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { +- int /*long*/ parentHandle = 0; +- int /*long*/ temp = listHandle; ++ long /*int*/ parentHandle = 0; ++ long /*int*/ temp = listHandle; + while ((temp = OS.gtk_widget_get_parent(temp)) != 0) { + parentHandle = temp; + } + popupHandle = parentHandle; + if (popupHandle != 0) { +- int /*long*/ modalGroup = getShell().modalGroup; ++ long /*int*/ modalGroup = getShell().modalGroup; + if (modalGroup != 0) { + OS.gtk_window_group_add_window (modalGroup, popupHandle); + } +@@ -506,11 +506,11 @@ + * to hook events. The fix is to find the first child that is + * not the entry or list and assume this is the arrow handle. + */ +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list != 0) { + int i = 0, count = OS.g_list_length (list); + while (i= OS.VERSION (2, 4, 0)) { + if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle; + } +@@ -708,9 +708,9 @@ + } + int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | + OS.GDK_BUTTON_RELEASE_MASK; +- int /*long*/ [] handles = new int /*long*/ [] {buttonHandle, entryHandle, listHandle, menuHandle}; ++ long /*int*/ [] handles = new long /*int*/ [] {buttonHandle, entryHandle, listHandle, menuHandle}; + for (int i=0; i= OS.VERSION (2, 4, 0)) { + if (widget == handle) { + if (entryHandle == 0) { +@@ -1188,7 +1188,7 @@ + } + } else { + if (!ignoreSelect) { +- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle); + int length = OS.strlen (ptr); + byte [] buffer = new byte [length]; + OS.memmove (buffer, ptr, length); +@@ -1209,7 +1209,7 @@ + * is to post the modify event when the user is typing. + */ + boolean keyPress = false; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +@@ -1228,7 +1228,7 @@ + return 0; + } + +-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) { ++long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { + if (text == 0) return 0; + if (!OS.gtk_editable_get_editable (entryHandle)) return 0; + int length = OS.strlen (text); +@@ -1266,14 +1266,14 @@ + return 0; + } + +-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) { ++long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { + if (lockText) { + OS.gtk_list_unselect_item (listHandle, 0); + OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text); + return 0; + } + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; +- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle); + if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); + int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); +@@ -1296,7 +1296,7 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + /* + * Feature in GTK. Depending on where the user clicks, GTK prevents + * the left mouse button event from being propagated. The fix is to +@@ -1316,7 +1316,7 @@ + switch (event.type) { + case OS.GDK_BUTTON_PRESS: { + if (OS.GTK_VERSION < OS.VERSION (2, 8, 0) && !selectionAdded) { +- int /*long*/ grabHandle = OS.gtk_grab_get_current (); ++ long /*int*/ grabHandle = OS.gtk_grab_get_current (); + if (grabHandle != 0) { + if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) { + menuHandle = grabHandle; +@@ -1361,12 +1361,12 @@ + return super.gtk_event_after(widget, gdkEvent); + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + fixIM (); + return super.gtk_focus_out_event (widget, event); + } + +-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) { ++long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { + if (lockText) { + OS.gtk_list_unselect_item (listHandle, 0); + OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text); +@@ -1379,7 +1379,7 @@ + String oldText = new String (Converter.mbcsToWcs (null, buffer)); + int [] pos = new int [1]; + OS.memmove (pos, position, 4); +- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle); + if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); + int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]); + String newText = verifyText (oldText, start, start); +@@ -1411,8 +1411,8 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) { + gdkEventKey = 0; + fixIM (); +@@ -1462,7 +1462,7 @@ + return result; + } + +-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { ++long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL); + OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL); +@@ -1470,7 +1470,7 @@ + return 0; + } + +-int /*long*/ gtk_selection_done(int /*long*/ menushell) { ++long /*int*/ gtk_selection_done(long /*int*/ menushell) { + int index = OS.gtk_combo_box_get_active (handle); + if (indexSelected == -1){ + indexSelected = index; +@@ -1539,14 +1539,14 @@ + return super.isFocusHandle (widget); + } + +-int /*long*/ paintWindow () { +- int /*long*/ childHandle = entryHandle != 0 ? entryHandle : handle; ++long /*int*/ paintWindow () { ++ long /*int*/ childHandle = entryHandle != 0 ? entryHandle : handle; + OS.gtk_widget_realize (childHandle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (childHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (childHandle); + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + if ((style & SWT.READ_ONLY) != 0) return window; + } +- int /*long*/ children = OS.gdk_window_get_children (window); ++ long /*int*/ children = OS.gdk_window_get_children (window); + if (children != 0) window = OS.g_list_data (children); + OS.g_list_free (children); + return window; +@@ -1571,7 +1571,7 @@ + if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle); + } + +-int /*long*/ parentingHandle() { ++long /*int*/ parentingHandle() { + return fixedHandle; + } + +@@ -1582,7 +1582,7 @@ + if (listHandle != 0) display.addWidget (listHandle, this); + if (popupHandle != 0) display.addWidget (popupHandle, this); + if (menuHandle != 0) display.addWidget (menuHandle, this); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) display.addWidget (imContext, this); + } + +@@ -1626,10 +1626,10 @@ + OS.gtk_combo_box_remove_text (handle, index); + } else { + ignoreSelect = true; +- int /*long*/ children = OS.gtk_container_get_children (listHandle); +- int /*long*/ item = OS.g_list_nth_data (children, index); ++ long /*int*/ children = OS.gtk_container_get_children (listHandle); ++ long /*int*/ item = OS.g_list_nth_data (children, index); + boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED; +- int /*long*/ items = OS.g_list_append (0, item); ++ long /*int*/ items = OS.g_list_append (0, item); + OS.gtk_list_remove_items (listHandle, items); + OS.g_list_free (items); + OS.g_list_free (children); +@@ -1676,10 +1676,10 @@ + } else { + boolean selected = false; + ignoreSelect = true; +- int /*long*/ items = 0; +- int /*long*/ children = OS.gtk_container_get_children (listHandle); ++ long /*int*/ items = 0; ++ long /*int*/ children = OS.gtk_container_get_children (listHandle); + for (int i = start; i <= end; i++) { +- int /*long*/ item = OS.g_list_nth_data (children, i); ++ long /*int*/ item = OS.g_list_nth_data (children, i); + selected |= OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED; + items = OS.g_list_append (items, item); + } +@@ -1870,7 +1870,7 @@ + return super.setBounds (x, y, width, newHeight, move, resize); + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font); +@@ -1891,11 +1891,11 @@ + OS.gtk_widget_modify_font (entryHandle, font); + if (listHandle != 0) { + OS.gtk_widget_modify_font (listHandle, font); +- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle); ++ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle); + if (itemsList != 0) { + int count = OS.g_list_length (itemsList); + for (int i=count - 1; i>=0; i--) { +- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); ++ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); + OS.gtk_widget_modify_font (widget, font); + } + OS.g_list_free (itemsList); +@@ -1913,11 +1913,11 @@ + setForegroundColor (entryHandle, color); + if (listHandle != 0) { + setForegroundColor (listHandle, color); +- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle); ++ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle); + if (itemsList != 0) { + int count = OS.g_list_length (itemsList); + for (int i=count - 1; i>=0; i--) { +- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); ++ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); + setForegroundColor (widget, color); + } + OS.g_list_free (itemsList); +@@ -1958,9 +1958,9 @@ + } + } else { + ignoreSelect = true; +- int /*long*/ children = OS.gtk_container_get_children (listHandle); +- int /*long*/ item = OS.g_list_nth_data (children, index); +- int /*long*/ label = OS.gtk_bin_get_child (item); ++ long /*int*/ children = OS.gtk_container_get_children (listHandle); ++ long /*int*/ item = OS.g_list_nth_data (children, index); ++ long /*int*/ label = OS.gtk_bin_get_child (item); + OS.gtk_label_set_text (label, buffer); + OS.g_list_free (children); + ignoreSelect = false; +@@ -2006,15 +2006,15 @@ + } else { + lockText = ignoreSelect = true; + OS.gtk_list_clear_items (listHandle, 0, -1); +- int /*long*/ font = getFontDescription (); ++ long /*int*/ font = getFontDescription (); + GdkColor color = getForegroundColor (); + int direction = OS.gtk_widget_get_direction (handle); + int i = 0; + while (i < items.length) { + String string = items [i]; + byte [] buffer = Converter.wcsToMbcs (null, string, true); +- int /*long*/ item = OS.gtk_list_item_new_with_label (buffer); +- int /*long*/ label = OS.gtk_bin_get_child (item); ++ long /*int*/ item = OS.gtk_list_item_new_with_label (buffer); ++ long /*int*/ label = OS.gtk_bin_get_child (item); + setForegroundColor (label, color); + OS.gtk_widget_modify_font (label, font); + OS.gtk_widget_set_direction (label, direction); +@@ -2066,11 +2066,11 @@ + if (!create) { + if (listHandle != 0) { + OS.gtk_widget_set_direction (listHandle, dir); +- int /*long*/ itemsList = OS.gtk_container_get_children (listHandle); ++ long /*int*/ itemsList = OS.gtk_container_get_children (listHandle); + if (itemsList != 0) { + int count = OS.g_list_length (itemsList); + for (int i=count - 1; i>=0; i--) { +- int /*long*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); ++ long /*int*/ widget = OS.gtk_bin_get_child (OS.g_list_nth_data (itemsList, i)); + OS.gtk_widget_set_direction (widget, dir); + } + OS.g_list_free (itemsList); +@@ -2120,7 +2120,7 @@ + if (selection == null) error (SWT.ERROR_NULL_ARGUMENT); + if ((style & SWT.READ_ONLY) != 0) return; + if (entryHandle != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle); + int start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.x); + int end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.y); + OS.gtk_editable_set_position (entryHandle, start); +@@ -2178,7 +2178,7 @@ + * fix is to block the firing of these events and fire them ourselves in a consistent manner. + */ + if (hooks (SWT.Verify) || filters (SWT.Verify)) { +- int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle); + string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1)); + if (string == null) return; + } +@@ -2262,9 +2262,9 @@ + switch (key) { + case OS.GDK_KP_Enter: + case OS.GDK_Return: { +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { +- int /*long*/ [] preeditString = new int /*long*/ [1]; ++ long /*int*/ [] preeditString = new long /*int*/ [1]; + OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); + if (preeditString [0] != 0) { + int length = OS.strlen (preeditString [0]); +@@ -2283,7 +2283,7 @@ + event.text = string; + event.start = start; + event.end = end; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Composite.java swt-gtk-3.7//org/eclipse/swt/widgets/Composite.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Composite.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Composite.java 2011-06-13 20:53:32.000000000 +0000 +@@ -47,8 +47,8 @@ + * @see Sample code and further information + */ + public class Composite extends Scrollable { +- public int /*long*/ embeddedHandle; +- int /*long*/ imHandle, socketHandle; ++ public long /*int*/ embeddedHandle; ++ long /*int*/ imHandle, socketHandle; + Layout layout; + Control[] tabList; + int layoutCount, backgroundMode; +@@ -101,15 +101,15 @@ + } + + Control [] _getChildren () { +- int /*long*/ parentHandle = parentingHandle (); +- int /*long*/ list = OS.gtk_container_get_children (parentHandle); ++ long /*int*/ parentHandle = parentingHandle (); ++ long /*int*/ list = OS.gtk_container_get_children (parentHandle); + if (list == 0) return new Control [0]; + int count = OS.g_list_length (list); + Control [] children = new Control [count]; + int i = 0; +- int /*long*/ temp = list; ++ long /*int*/ temp = list; + while (temp != 0) { +- int /*long*/ handle = OS.g_list_data (temp); ++ long /*int*/ handle = OS.g_list_data (temp); + if (handle != 0) { + Widget widget = display.getWidget (handle); + if (widget != null && widget != this) { +@@ -203,7 +203,7 @@ + /* Do nothing - Subclassing is allowed */ + } + +-int /*long*/ childStyle () { ++long /*int*/ childStyle () { + if (scrolledHandle != 0) return 0; + return super.childStyle (); + } +@@ -264,9 +264,9 @@ + if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (fixedHandle, true); + } +- int /*long*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ long /*int*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + if (vadj == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ long /*int*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + if (hadj == 0) error (SWT.ERROR_NO_HANDLES); + scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj); + if (scrolledHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES); +@@ -364,7 +364,7 @@ + Control control = findBackgroundControl (); + if (control != null) { + GCData data = gc.getGCData (); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + Cairo.cairo_save (cairo); + if (control.backgroundImage != null) { +@@ -372,15 +372,15 @@ + Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY); + x += pt.x + offsetX; + y += pt.y + offsetY; +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); +- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system()); +- int /*long*/ drawable = control.backgroundImage.pixmap; +- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID (drawable); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system()); ++ long /*int*/ drawable = control.backgroundImage.pixmap; ++ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID (drawable); + int [] w = new int [1], h = new int [1]; + OS.gdk_drawable_get_size (drawable, w, h); +- int /*long*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]); ++ long /*int*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]); + if (surface == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (surface); ++ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (surface); + if (pattern == 0) error (SWT.ERROR_NO_HANDLES); + Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT); + if ((data.style & SWT.MIRRORED) != 0) { +@@ -398,7 +398,7 @@ + Cairo.cairo_fill (cairo); + Cairo.cairo_restore (cairo); + } else { +- int /*long*/ gdkGC = gc.handle; ++ long /*int*/ gdkGC = gc.handle; + GdkGCValues values = new GdkGCValues (); + OS.gdk_gc_get_values (gdkGC, values); + if (control.backgroundImage != null) { +@@ -456,7 +456,7 @@ + } + } + +-void fixModal(int /*long*/ group, int /*long*/ modalGroup) { ++void fixModal(long /*int*/ group, long /*int*/ modalGroup) { + Control[] controls = _getChildren (); + for (int i = 0; i < controls.length; i++) { + controls[i].fixModal (group, modalGroup); +@@ -495,15 +495,15 @@ + + void fixZOrder () { + if ((state & CANVAS) != 0) return; +- int /*long*/ parentHandle = parentingHandle (); +- int /*long*/ parentWindow = OS.GTK_WIDGET_WINDOW (parentHandle); ++ long /*int*/ parentHandle = parentingHandle (); ++ long /*int*/ parentWindow = OS.GTK_WIDGET_WINDOW (parentHandle); + if (parentWindow == 0) return; +- int /*long*/ [] userData = new int /*long*/ [1]; +- int /*long*/ windowList = OS.gdk_window_get_children (parentWindow); ++ long /*int*/ [] userData = new long /*int*/ [1]; ++ long /*int*/ windowList = OS.gdk_window_get_children (parentWindow); + if (windowList != 0) { +- int /*long*/ windows = windowList; ++ long /*int*/ windows = windowList; + while (windows != 0) { +- int /*long*/ window = OS.g_list_data (windows); ++ long /*int*/ window = OS.g_list_data (windows); + if (window != redrawWindow) { + OS.gdk_window_get_user_data (window, userData); + if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) { +@@ -516,12 +516,12 @@ + } + } + +-int /*long*/ focusHandle () { ++long /*int*/ focusHandle () { + if (socketHandle != 0) return socketHandle; + return super.focusHandle (); + } + +-boolean forceFocus (int /*long*/ focusHandle) { ++boolean forceFocus (long /*int*/ focusHandle) { + if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS); + boolean result = super.forceFocus (focusHandle); + if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS); +@@ -582,7 +582,7 @@ + * NOTE: The current implementation will count + * non-registered children. + */ +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return 0; + int count = OS.g_list_length (list); + OS.g_list_free (list); +@@ -596,7 +596,7 @@ + return new Rectangle (0, 0, 0, 0); + } + forceResize (); +- int /*long*/ clientHandle = clientHandle (); ++ long /*int*/ clientHandle = clientHandle (); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle); + int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle); + return new Rectangle (0, 0, width, height); +@@ -677,8 +677,8 @@ + return tabList; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_button_press_event (widget, event); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_button_press_event (widget, event); + if (result != 0) return result; + if ((state & CANVAS) != 0) { + if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) { +@@ -692,7 +692,7 @@ + return result; + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) { + if ((state & OBSCURED) != 0) return 0; + if ((state & CANVAS) == 0) { + return super.gtk_expose_event (widget, eventPtr); +@@ -703,7 +703,7 @@ + if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0; + GdkEventExpose gdkEvent = new GdkEventExpose (); + OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof); +- int /*long*/ [] rectangles = new int /*long*/ [1]; ++ long /*int*/ [] rectangles = new long /*int*/ [1]; + int [] n_rectangles = new int [1]; + OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles); + GdkRectangle rect = new GdkRectangle (); +@@ -715,7 +715,7 @@ + event.width = rect.width; + event.height = rect.height; + if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x; +- int /*long*/ damageRgn = OS.gdk_region_new (); ++ long /*int*/ damageRgn = OS.gdk_region_new (); + OS.gdk_region_union_with_rect (damageRgn, rect); + GCData data = new GCData (); + data.damageRgn = damageRgn; +@@ -730,8 +730,8 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) return result; + /* + * Feature in GTK. The default behavior when the return key +@@ -751,30 +751,30 @@ + return result; + } + +-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) { ++long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { + if (widget == socketHandle) return 0; + return super.gtk_focus (widget, directionType); + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_in_event (widget, event); ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_in_event (widget, event); + return (state & CANVAS) != 0 ? 1 : result; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_out_event (widget, event); ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_out_event (widget, event); + return (state & CANVAS) != 0 ? 1 : result; + } + +-int /*long*/ gtk_map (int /*long*/ widget) { ++long /*int*/ gtk_map (long /*int*/ widget) { + fixZOrder (); + return 0; + } + +-int /*long*/ gtk_realize (int /*long*/ widget) { +- int /*long*/ result = super.gtk_realize (widget); ++long /*int*/ gtk_realize (long /*int*/ widget) { ++ long /*int*/ result = super.gtk_realize (widget); + if ((style & SWT.NO_BACKGROUND) != 0) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); + if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false); + } + if (socketHandle != 0) { +@@ -783,16 +783,16 @@ + return result; + } + +-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) { ++long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) { + /* Stop GTK scroll child signal for canvas */ + OS.g_signal_stop_emission_by_name (widget, OS.scroll_child); + return 1; + } + +-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) { +- int /*long*/ result = super.gtk_style_set (widget, previousStyle); ++long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) { ++ long /*int*/ result = super.gtk_style_set (widget, previousStyle); + if ((style & SWT.NO_BACKGROUND) != 0) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); + if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false); + } + return result; +@@ -816,7 +816,7 @@ + return hooks (SWT.KeyDown) || hooks (SWT.KeyUp); + } + +-int /*long*/ imHandle () { ++long /*int*/ imHandle () { + return imHandle; + } + +@@ -1111,16 +1111,16 @@ + } + } + +-void moveAbove (int /*long*/ child, int /*long*/ sibling) { ++void moveAbove (long /*int*/ child, long /*int*/ sibling) { + if (child == sibling) return; +- int /*long*/ parentHandle = parentingHandle (); ++ long /*int*/ parentHandle = parentingHandle (); + GtkFixed fixed = new GtkFixed (); + OS.memmove (fixed, parentHandle); +- int /*long*/ children = fixed.children; ++ long /*int*/ children = fixed.children; + if (children == 0) return; +- int /*long*/ [] data = new int /*long*/ [1]; +- int /*long*/ [] widget = new int /*long*/ [1]; +- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children; ++ long /*int*/ [] data = new long /*int*/ [1]; ++ long /*int*/ [] widget = new long /*int*/ [1]; ++ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children; + while (temp != 0) { + OS.memmove (data, temp, OS.PTR_SIZEOF); + OS.memmove (widget, data [0], OS.PTR_SIZEOF); +@@ -1148,20 +1148,20 @@ + OS.memmove (parentHandle, fixed); + } + +-void moveBelow (int /*long*/ child, int /*long*/ sibling) { ++void moveBelow (long /*int*/ child, long /*int*/ sibling) { + if (child == sibling) return; +- int /*long*/ parentHandle = parentingHandle (); ++ long /*int*/ parentHandle = parentingHandle (); + if (sibling == 0 && parentHandle == fixedHandle) { + moveAbove (child, scrolledHandle != 0 ? scrolledHandle : handle); + return; + } + GtkFixed fixed = new GtkFixed (); + OS.memmove (fixed, parentHandle); +- int /*long*/ children = fixed.children; ++ long /*int*/ children = fixed.children; + if (children == 0) return; +- int /*long*/ [] data = new int /*long*/ [1]; +- int /*long*/ [] widget = new int /*long*/ [1]; +- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children; ++ long /*int*/ [] data = new long /*int*/ [1]; ++ long /*int*/ [] widget = new long /*int*/ [1]; ++ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children; + while (temp != 0) { + OS.memmove (data, temp, OS.PTR_SIZEOF); + OS.memmove (widget, data [0], OS.PTR_SIZEOF); +@@ -1193,7 +1193,7 @@ + Control[] children = _getChildren (); + for (int i = 0; i < children.length; i++) { + Control child = children[i]; +- int /*long*/ topHandle = child.topHandle (); ++ long /*int*/ topHandle = child.topHandle (); + int x = OS.GTK_WIDGET_X (topHandle); + int y = OS.GTK_WIDGET_Y (topHandle); + int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle); +@@ -1236,12 +1236,12 @@ + return new Point (width, height); + } + +-int /*long*/ parentingHandle () { ++long /*int*/ parentingHandle () { + if ((state & CANVAS) != 0) return handle; + return fixedHandle != 0 ? fixedHandle : handle; + } + +-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) { ++void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { + Region oldClip = new Region (gc.getDevice ()); + Region newClip = new Region (gc.getDevice ()); + gc.getClipping (oldClip); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Control.java swt-gtk-3.7//org/eclipse/swt/widgets/Control.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Control.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Control.java 2011-06-13 20:53:32.000000000 +0000 +@@ -44,8 +44,8 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public abstract class Control extends Widget implements Drawable { +- int /*long*/ fixedHandle; +- int /*long*/ redrawWindow, enableWindow; ++ long /*int*/ fixedHandle; ++ long /*int*/ redrawWindow, enableWindow; + int drawCount; + Composite parent; + Cursor cursor; +@@ -104,12 +104,12 @@ + void deregister () { + super.deregister (); + if (fixedHandle != 0) display.removeWidget (fixedHandle); +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) display.removeWidget (imHandle); + } + +-void drawBackground (Control control, int /*long*/ window, int /*long*/ region, int x, int y, int width, int height) { +- int /*long*/ gdkGC = OS.gdk_gc_new (window); ++void drawBackground (Control control, long /*int*/ window, long /*int*/ region, int x, int y, int width, int height) { ++ long /*int*/ gdkGC = OS.gdk_gc_new (window); + if (region != 0) OS.gdk_gc_set_clip_region (gdkGC, region); + if (control.backgroundImage != null) { + Point pt = display.map (this, control, 0, 0); +@@ -126,8 +126,8 @@ + } + + boolean drawGripper (int x, int y, int width, int height, boolean vertical) { +- int /*long*/ paintHandle = paintHandle (); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle); ++ long /*int*/ paintHandle = paintHandle (); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle); + if (window == 0) return false; + int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL; + if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x; +@@ -139,16 +139,16 @@ + OS.gtk_widget_set_sensitive (handle, enabled); + } + +-int /*long*/ enterExitHandle () { ++long /*int*/ enterExitHandle () { + return eventHandle (); + } + +-int /*long*/ eventHandle () { ++long /*int*/ eventHandle () { + return handle; + } + +-int /*long*/ eventWindow () { +- int /*long*/ eventHandle = eventHandle (); ++long /*int*/ eventWindow () { ++ long /*int*/ eventHandle = eventHandle (); + OS.gtk_widget_realize (eventHandle); + return OS.GTK_WIDGET_WINDOW (eventHandle); + } +@@ -160,7 +160,7 @@ + if (control.setFocus ()) return; + } + shell.setSavedFocus (focusControl); +- int /*long*/ focusHandle = shell.vboxHandle; ++ long /*int*/ focusHandle = shell.vboxHandle; + OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS); + OS.gtk_widget_grab_focus (focusHandle); + // widget could be disposed at this point +@@ -172,7 +172,7 @@ + if (fixedHandle != 0) fixStyle (fixedHandle); + } + +-void fixStyle (int /*long*/ handle) { ++void fixStyle (long /*int*/ handle) { + /* + * Feature in GTK. Some GTK themes apply a different background to + * the contents of a GtkNotebook. However, in an SWT TabFolder, the +@@ -186,7 +186,7 @@ + */ + if ((state & BACKGROUND) != 0) return; + if ((state & THEME_BACKGROUND) == 0) return; +- int /*long*/ childStyle = parent.childStyle (); ++ long /*int*/ childStyle = parent.childStyle (); + if (childStyle != 0) { + GdkColor color = new GdkColor(); + OS.gtk_style_get_bg (childStyle, 0, color); +@@ -194,11 +194,11 @@ + } + } + +-int /*long*/ focusHandle () { ++long /*int*/ focusHandle () { + return handle; + } + +-int /*long*/ fontHandle () { ++long /*int*/ fontHandle () { + return handle; + } + +@@ -226,7 +226,7 @@ + + void hookEvents () { + /* Connect the keyboard signals */ +- int /*long*/ focusHandle = focusHandle (); ++ long /*int*/ focusHandle = focusHandle (); + int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK; + OS.gtk_widget_add_events (focusHandle, focusMask); + OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false); +@@ -238,7 +238,7 @@ + OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false); + + /* Connect the mouse signals */ +- int /*long*/ eventHandle = eventHandle (); ++ long /*int*/ eventHandle = eventHandle (); + int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK; + OS.gtk_widget_add_events (eventHandle, eventMask); + OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false); +@@ -247,7 +247,7 @@ + OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false); + + /* Connect enter/exit signals */ +- int /*long*/ enterExitHandle = enterExitHandle (); ++ long /*int*/ enterExitHandle = enterExitHandle (); + int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK; + OS.gtk_widget_add_events (enterExitHandle, enterExitMask); + OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false); +@@ -263,7 +263,7 @@ + * The signal is hooked to the fixedHandle to catch events sent to + * lightweight widgets. + */ +- int /*long*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle; ++ long /*int*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle; + OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT_INVERSE], true); + OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true); + OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT_INVERSE], true); +@@ -275,7 +275,7 @@ + } + + /* Connect the paint signal */ +- int /*long*/ paintHandle = paintHandle (); ++ long /*int*/ paintHandle = paintHandle (); + int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK; + OS.gtk_widget_add_events (paintHandle, paintMask); + OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT_INVERSE], false); +@@ -292,7 +292,7 @@ + /* Connect the Input Method signals */ + OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.closures [REALIZE], true); + OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.closures [UNREALIZE], false); +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { + OS.g_signal_connect_closure (imHandle, OS.commit, display.closures [COMMIT], false); + OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.closures [PREEDIT_CHANGED], false); +@@ -300,11 +300,11 @@ + + OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false); + +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true); + } + +-int /*long*/ hoverProc (int /*long*/ widget) { ++long /*int*/ hoverProc (long /*int*/ widget) { + int [] x = new int [1], y = new int [1], mask = new int [1]; + OS.gdk_window_get_pointer (0, x, y, mask); + sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x [0], y [0], false, mask [0]); +@@ -312,14 +312,14 @@ + return 0; + } + +-int /*long*/ topHandle() { ++long /*int*/ topHandle() { + if (fixedHandle != 0) return fixedHandle; + return super.topHandle (); + } + +-int /*long*/ paintHandle () { +- int /*long*/ topHandle = topHandle (); +- int /*long*/ paintHandle = handle; ++long /*int*/ paintHandle () { ++ long /*int*/ topHandle = topHandle (); ++ long /*int*/ paintHandle = handle; + while (paintHandle != topHandle) { + if ((OS.GTK_WIDGET_FLAGS (paintHandle) & OS.GTK_NO_WINDOW) == 0) break; + paintHandle = OS.gtk_widget_get_parent (paintHandle); +@@ -327,8 +327,8 @@ + return paintHandle; + } + +-int /*long*/ paintWindow () { +- int /*long*/ paintHandle = paintHandle (); ++long /*int*/ paintWindow () { ++ long /*int*/ paintHandle = paintHandle (); + OS.gtk_widget_realize (paintHandle); + return OS.GTK_WIDGET_WINDOW (paintHandle); + } +@@ -354,25 +354,25 @@ + checkWidget (); + if (gc == null) error (SWT.ERROR_NULL_ARGUMENT); + if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + OS.gtk_widget_realize (topHandle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle); + GCData data = gc.getGCData (); + OS.gdk_window_process_updates (window, true); + printWidget (gc, data.drawable, OS.gdk_drawable_get_depth (data.drawable), 0, 0); + return true; + } + +-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) { ++void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { + boolean obscured = (state & OBSCURED) != 0; + state &= ~OBSCURED; +- int /*long*/ topHandle = topHandle (); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle); ++ long /*int*/ topHandle = topHandle (); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle); + printWindow (true, this, gc, drawable, depth, window, x, y); + if (obscured) state |= OBSCURED; + } + +-void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) { ++void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) { + if (OS.gdk_drawable_get_depth (window) != depth) return; + GdkRectangle rect = new GdkRectangle (); + int [] width = new int [1], height = new int [1]; +@@ -380,13 +380,13 @@ + rect.width = width [0]; + rect.height = height [0]; + OS.gdk_window_begin_paint_rect (window, rect); +- int /*long*/ [] real_drawable = new int /*long*/ [1]; ++ long /*int*/ [] real_drawable = new long /*int*/ [1]; + int [] x_offset = new int [1], y_offset = new int [1]; + OS.gdk_window_get_internal_paint_info (window, real_drawable, x_offset, y_offset); +- int /*long*/ [] userData = new int /*long*/ [1]; ++ long /*int*/ [] userData = new long /*int*/ [1]; + OS.gdk_window_get_user_data (window, userData); + if (userData [0] != 0) { +- int /*long*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE); ++ long /*int*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE); + GdkEventExpose event = new GdkEventExpose (); + event.type = OS.GDK_EXPOSE; + event.window = OS.g_object_ref (window); +@@ -402,7 +402,7 @@ + if (!first) { + int [] cX = new int [1], cY = new int [1]; + OS.gdk_window_get_position (window, cX, cY); +- int /*long*/ parentWindow = OS.gdk_window_get_parent (window); ++ long /*int*/ parentWindow = OS.gdk_window_get_parent (window); + int [] pW = new int [1], pH = new int [1]; + OS.gdk_drawable_get_size (parentWindow, pW, pH); + srcX = x_offset [0] - cX [0]; +@@ -413,18 +413,18 @@ + destHeight = Math.min (cY [0] + height [0], pH [0]); + } + GCData gcData = gc.getGCData(); +- int /*long*/ cairo = gcData.cairo; ++ long /*int*/ cairo = gcData.cairo; + if (cairo != 0) { +- int /*long*/ xDisplay = OS.GDK_DISPLAY(); +- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); +- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]); +- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY(); ++ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); ++ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]); ++ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]); + if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_save(cairo); + Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight); + Cairo.cairo_clip(cairo); + Cairo.cairo_translate(cairo, destX, destY); +- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface); ++ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(surface); + if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST); + Cairo.cairo_set_source(cairo, pattern); +@@ -440,13 +440,13 @@ + OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight); + } + OS.gdk_window_end_paint (window); +- int /*long*/ children = OS.gdk_window_get_children (window); ++ long /*int*/ children = OS.gdk_window_get_children (window); + if (children != 0) { +- int /*long*/ windows = children; ++ long /*int*/ windows = children; + while (windows != 0) { +- int /*long*/ child = OS.g_list_data (windows); ++ long /*int*/ child = OS.g_list_data (windows); + if (OS.gdk_window_is_visible (child)) { +- int /*long*/ [] data = new int /*long*/ [1]; ++ long /*int*/ [] data = new long /*int*/ [1]; + OS.gdk_window_get_user_data (child, data); + if (data [0] != 0) { + Widget widget = display.findWidget (data [0]); +@@ -560,7 +560,7 @@ + if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED; + } + +-int /*long*/ childStyle () { ++long /*int*/ childStyle () { + return parent.childStyle (); + } + +@@ -620,7 +620,7 @@ + return computeNativeSize (handle, wHint, hHint, changed); + } + +-Point computeNativeSize (int /*long*/ h, int wHint, int hHint, boolean changed) { ++Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) { + int width = wHint, height = hHint; + if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) { + GtkRequisition requisition = new GtkRequisition (); +@@ -646,7 +646,7 @@ + * topHandle. Note that all calls to gtk_widget_size_allocate() + * must be preceded by a call to gtk_widget_size_request(). + */ +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + GtkRequisition requisition = new GtkRequisition (); + gtk_widget_size_request (topHandle, requisition); + GtkAllocation allocation = new GtkAllocation (); +@@ -704,7 +704,7 @@ + */ + public Rectangle getBounds () { + checkWidget(); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + int x = OS.GTK_WIDGET_X (topHandle); + int y = OS.GTK_WIDGET_Y (topHandle); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle); +@@ -769,7 +769,7 @@ + /* Do nothing */ + } + +-void modifyStyle (int /*long*/ handle, int /*long*/ style) { ++void modifyStyle (long /*int*/ handle, long /*int*/ style) { + super.modifyStyle(handle, style); + /* + * Bug in GTK. When changing the style of a control that +@@ -780,8 +780,8 @@ + } + + void moveHandle (int x, int y) { +- int /*long*/ topHandle = topHandle (); +- int /*long*/ parentHandle = parent.parentingHandle (); ++ long /*int*/ topHandle = topHandle (); ++ long /*int*/ parentHandle = parent.parentingHandle (); + /* + * Feature in GTK. Calling gtk_fixed_move() to move a child causes + * the whole parent to redraw. This is a performance problem. The +@@ -799,13 +799,13 @@ + } + + void resizeHandle (int width, int height) { +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + OS.gtk_widget_set_size_request (topHandle, width, height); + if (topHandle != handle) OS.gtk_widget_set_size_request (handle, width, height); + } + + int setBounds (int x, int y, int width, int height, boolean move, boolean resize) { +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + boolean sendMove = move; + if ((parent.style & SWT.MIRRORED) != 0) { + int clientWidth = parent.getClientWidth (); +@@ -929,7 +929,7 @@ + */ + public Point getLocation () { + checkWidget(); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + int x = OS.GTK_WIDGET_X (topHandle); + int y = OS.GTK_WIDGET_Y (topHandle); + if ((parent.style & SWT.MIRRORED) != 0) { +@@ -994,7 +994,7 @@ + */ + public Point getSize () { + checkWidget(); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle); + int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (topHandle); + return new Point (width, height); +@@ -1044,15 +1044,15 @@ + public void setRegion (Region region) { + checkWidget (); + if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle ()); +- int /*long*/ shape_region = (region == null) ? 0 : region.handle; ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle ()); ++ long /*int*/ shape_region = (region == null) ? 0 : region.handle; + OS.gdk_window_shape_combine_region (window, shape_region, 0, 0); + this.region = region; + } + + void setRelations () { +- int /*long*/ parentHandle = parent.parentingHandle (); +- int /*long*/ list = OS.gtk_container_get_children (parentHandle); ++ long /*int*/ parentHandle = parent.parentingHandle (); ++ long /*int*/ list = OS.gtk_container_get_children (parentHandle); + if (list == 0) return; + int count = OS.g_list_length (list); + if (count > 1) { +@@ -1060,7 +1060,7 @@ + * the receiver is the last item in the list, so its predecessor will + * be the second-last item in the list + */ +- int /*long*/ handle = OS.g_list_nth_data (list, count - 2); ++ long /*int*/ handle = OS.g_list_nth_data (list, count - 2); + if (handle != 0) { + Widget widget = display.getWidget (handle); + if (widget != null && widget != this) { +@@ -1108,7 +1108,7 @@ + return true; + } + +-boolean isFocusHandle (int /*long*/ widget) { ++boolean isFocusHandle (long /*int*/ widget) { + return widget == focusHandle (); + } + +@@ -1249,7 +1249,7 @@ + */ + public Point toControl (int x, int y) { + checkWidget (); +- int /*long*/ window = eventWindow (); ++ long /*int*/ window = eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + x -= origin_x [0]; +@@ -1298,7 +1298,7 @@ + */ + public Point toDisplay (int x, int y) { + checkWidget(); +- int /*long*/ window = eventWindow (); ++ long /*int*/ window = eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x; +@@ -2189,7 +2189,7 @@ + boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) { + boolean quit = false, dragging = false; + while (!quit) { +- int /*long*/ eventPtr = 0; ++ long /*int*/ eventPtr = 0; + /* + * There should be an event on the queue already, but + * in cases where there isn't one, stop trying after +@@ -2244,8 +2244,8 @@ + return dragging; + } + +-boolean filterKey (int keyval, int /*long*/ event) { +- int /*long*/ imHandle = imHandle (); ++boolean filterKey (int keyval, long /*int*/ event) { ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { + return OS.gtk_im_context_filter_keypress (imHandle, event); + } +@@ -2267,13 +2267,13 @@ + oldDecorations.fixDecorations (newDecorations, this, menus); + } + +-int /*long*/ fixedMapProc (int /*long*/ widget) { ++long /*int*/ fixedMapProc (long /*int*/ widget) { + OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_MAPPED); +- int /*long*/ widgetList = OS.gtk_container_get_children (widget); ++ long /*int*/ widgetList = OS.gtk_container_get_children (widget); + if (widgetList != 0) { +- int /*long*/ widgets = widgetList; ++ long /*int*/ widgets = widgetList; + while (widgets != 0) { +- int /*long*/ child = OS.g_list_data (widgets); ++ long /*int*/ child = OS.g_list_data (widgets); + if (OS.GTK_WIDGET_VISIBLE (child) && OS.gtk_widget_get_child_visible (child) && !OS.GTK_WIDGET_MAPPED (child)) { + OS.gtk_widget_map (child); + } +@@ -2287,7 +2287,7 @@ + return 0; + } + +-void fixModal(int /*long*/ group, int /*long*/ modalGroup) { ++void fixModal(long /*int*/ group, long /*int*/ modalGroup) { + } + + /** +@@ -2313,7 +2313,7 @@ + return forceFocus (focusHandle ()); + } + +-boolean forceFocus (int /*long*/ focusHandle) { ++boolean forceFocus (long /*int*/ focusHandle) { + if (OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return true; + /* When the control is zero sized it must be realized */ + OS.gtk_widget_realize (focusHandle); +@@ -2321,8 +2321,8 @@ + // widget could be disposed at this point + if (isDisposed ()) return false; + Shell shell = getShell (); +- int /*long*/ shellHandle = shell.shellHandle; +- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle); ++ long /*int*/ shellHandle = shell.shellHandle; ++ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle); + while (handle != 0) { + if (handle == focusHandle) { + /* Cancel any previous ignoreFocus requests */ +@@ -2383,7 +2383,7 @@ + } + + GdkColor getBgColor () { +- int /*long*/ fontHandle = fontHandle (); ++ long /*int*/ fontHandle = fontHandle (); + OS.gtk_widget_realize (fontHandle); + GdkColor color = new GdkColor (); + OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color); +@@ -2391,7 +2391,7 @@ + } + + GdkColor getBaseColor () { +- int /*long*/ fontHandle = fontHandle (); ++ long /*int*/ fontHandle = fontHandle (); + OS.gtk_widget_realize (fontHandle); + GdkColor color = new GdkColor (); + OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color); +@@ -2491,8 +2491,8 @@ + return font != null ? font : defaultFont (); + } + +-int /*long*/ getFontDescription () { +- int /*long*/ fontHandle = fontHandle (); ++long /*int*/ getFontDescription () { ++ long /*int*/ fontHandle = fontHandle (); + OS.gtk_widget_realize (fontHandle); + return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle)); + } +@@ -2517,7 +2517,7 @@ + } + + GdkColor getFgColor () { +- int /*long*/ fontHandle = fontHandle (); ++ long /*int*/ fontHandle = fontHandle (); + OS.gtk_widget_realize (fontHandle); + GdkColor color = new GdkColor (); + OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color); +@@ -2529,7 +2529,7 @@ + } + + GdkColor getTextColor () { +- int /*long*/ fontHandle = fontHandle (); ++ long /*int*/ fontHandle = fontHandle (); + OS.gtk_widget_realize (fontHandle); + GdkColor color = new GdkColor (); + OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color); +@@ -2586,7 +2586,7 @@ + public Monitor getMonitor () { + checkWidget(); + Monitor monitor = null; +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { + int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ()); + GdkRectangle dest = new GdkRectangle (); +@@ -2755,11 +2755,11 @@ + return (state & HIDDEN) == 0; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + return gtk_button_press_event (widget, event, true); + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, boolean sendMouseDown) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event, boolean sendMouseDown) { + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, event, GdkEventButton.sizeof); + if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0; +@@ -2774,10 +2774,10 @@ + if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) { + shell.forceActive(); + } +- int /*long*/ result = 0; ++ long /*int*/ result = 0; + if (gdkEvent.type == OS.GDK_BUTTON_PRESS) { + display.clickCount = 1; +- int /*long*/ nextEvent = OS.gdk_event_peek (); ++ long /*int*/ nextEvent = OS.gdk_event_peek (); + if (nextEvent != 0) { + int eventType = OS.GDK_EVENT_TYPE (nextEvent); + if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2; +@@ -2824,13 +2824,13 @@ + return result; + } + +-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, event, GdkEventButton.sizeof); + return sendMouseEvent (SWT.MouseUp, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1; + } + +-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) { ++long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { + if (text == 0) return 0; + int length = OS.strlen (text); + if (length == 0) return 0; +@@ -2841,7 +2841,7 @@ + return 0; + } + +-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) { + /* + * Feature in GTK. Children of a shell will inherit and display the shell's +@@ -2854,7 +2854,7 @@ + char [] chars = fixMnemonic (toolTipText, false); + buffer = Converter.wcsToMbcs (null, chars, true); + } +- int /*long*/ toolHandle = getShell().handle; ++ long /*int*/ toolHandle = getShell().handle; + OS.gtk_widget_set_tooltip_text (toolHandle, buffer); + } + if (display.currentControl == this) return 0; +@@ -2884,7 +2884,7 @@ + return false; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + GdkEvent event = new GdkEvent (); + OS.memmove (event, gdkEvent, GdkEvent.sizeof); + switch (event.type) { +@@ -2926,7 +2926,7 @@ + } + } else { + display.ignoreFocus = false; +- int /*long*/ grabHandle = OS.gtk_grab_get_current (); ++ long /*int*/ grabHandle = OS.gtk_grab_get_current (); + if (grabHandle != 0) { + if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) { + display.ignoreFocus = true; +@@ -2942,7 +2942,7 @@ + return 0; + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) { + if ((state & OBSCURED) != 0) return 0; + if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0; + GdkEventExpose gdkEvent = new GdkEventExpose (); +@@ -2964,34 +2964,34 @@ + return 0; + } + +-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) { ++long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { + /* Stop GTK traversal for every widget */ + return 1; + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { + // widget could be disposed at this point + if (handle != 0) { + Control oldControl = display.imControl; + if (oldControl != this) { + if (oldControl != null && !oldControl.isDisposed ()) { +- int /*long*/ oldIMHandle = oldControl.imHandle (); ++ long /*int*/ oldIMHandle = oldControl.imHandle (); + if (oldIMHandle != 0) OS.gtk_im_context_reset (oldIMHandle); + } + } + if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) { +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) OS.gtk_im_context_focus_in (imHandle); + } + } + return 0; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + // widget could be disposed at this point + if (handle != 0) { + if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) { +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { + OS.gtk_im_context_focus_out (imHandle); + } +@@ -3000,7 +3000,7 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { + if (!hasFocus ()) return 0; + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, event, GdkEventKey.sizeof); +@@ -3019,16 +3019,16 @@ + return super.gtk_key_press_event (widget, event); + } + +-int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) { + if (!hasFocus ()) return 0; +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { + if (OS.gtk_im_context_filter_keypress (imHandle, event)) return 1; + } + return super.gtk_key_release_event (widget, event); + } + +-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { + if (display.currentControl != this) return 0; + display.removeMouseHoverTimeout (handle); + int result = 0; +@@ -3043,15 +3043,15 @@ + return result; + } + +-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) { ++long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { + int result = 0; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey keyEvent = new GdkEventKey (); + OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof); + if (keyEvent.type == OS.GDK_KEY_PRESS) { + Control focusControl = display.getFocusControl (); +- int /*long*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0; ++ long /*int*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0; + if (focusHandle != 0) { + display.mnemonicControl = this; + OS.gtk_widget_event (focusHandle, eventPtr); +@@ -3064,7 +3064,7 @@ + return result; + } + +-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { + GdkEventMotion gdkEvent = new GdkEventMotion (); + OS.memmove (gdkEvent, event, GdkEventMotion.sizeof); + if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) { +@@ -3074,7 +3074,7 @@ + int state = gdkEvent.state; + if (gdkEvent.is_hint != 0) { + int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1]; +- int /*long*/ window = eventWindow (); ++ long /*int*/ window = eventWindow (); + OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask); + x = pointer_x [0]; + y = pointer_y [0]; +@@ -3084,22 +3084,22 @@ + return result; + } + +-int /*long*/ gtk_popup_menu (int /*long*/ widget) { ++long /*int*/ gtk_popup_menu (long /*int*/ widget) { + if (!hasFocus()) return 0; + int [] x = new int [1], y = new int [1]; + OS.gdk_window_get_pointer (0, x, y, null); + return showMenu (x [0], y [0]) ? 1 : 0; + } + +-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { ++long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { + display.showIMWindow (this); + return 0; + } + +-int /*long*/ gtk_realize (int /*long*/ widget) { +- int /*long*/ imHandle = imHandle (); ++long /*int*/ gtk_realize (long /*int*/ widget) { ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); + OS.gtk_im_context_set_client_window (imHandle, window); + } + if (backgroundImage != null) { +@@ -3108,7 +3108,7 @@ + return 0; + } + +-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { + GdkEventScroll gdkEvent = new GdkEventScroll (); + OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof); + switch (gdkEvent.direction) { +@@ -3124,25 +3124,25 @@ + return 0; + } + +-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) { ++long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) { + if (!hasFocus ()) return 0; + return sendHelpEvent (helpType) ? 1 : 0; + } + +-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) { ++long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) { + if (backgroundImage != null) { + setBackgroundPixmap (backgroundImage.pixmap); + } + return 0; + } + +-int /*long*/ gtk_unrealize (int /*long*/ widget) { +- int /*long*/ imHandle = imHandle (); ++long /*int*/ gtk_unrealize (long /*int*/ widget) { ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) OS.gtk_im_context_set_client_window (imHandle, 0); + return 0; + } + +-int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_visibility_notify_event (long /*int*/ widget, long /*int*/ event) { + /* + * As of GTK 2.17.11, obscured controls no longer send expose + * events. It is no longer necessary to track visiblity notify +@@ -3151,8 +3151,8 @@ + if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) return 0; + GdkEventVisibility gdkEvent = new GdkEventVisibility (); + OS.memmove (gdkEvent, event, GdkEventVisibility.sizeof); +- int /*long*/ paintWindow = paintWindow(); +- int /*long*/ window = gdkEvent.window; ++ long /*int*/ paintWindow = paintWindow(); ++ long /*int*/ window = gdkEvent.window; + if (window == paintWindow) { + if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) { + state |= OBSCURED; +@@ -3171,7 +3171,7 @@ + return 0; + } + +-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { ++void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) { + OS.gtk_widget_size_request (widget, requisition); + } + +@@ -3190,11 +3190,11 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public int /*long*/ internal_new_GC (GCData data) { ++public long /*int*/ internal_new_GC (GCData data) { + checkWidget (); +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + if (window == 0) SWT.error (SWT.ERROR_NO_HANDLES); +- int /*long*/ gdkGC = OS.gdk_gc_new (window); ++ long /*int*/ gdkGC = OS.gdk_gc_new (window); + if (gdkGC == 0) error (SWT.ERROR_NO_HANDLES); + if (data != null) { + int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT; +@@ -3216,7 +3216,7 @@ + return gdkGC; + } + +-int /*long*/ imHandle () { ++long /*int*/ imHandle () { + return 0; + } + +@@ -3235,7 +3235,7 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) { ++public void internal_dispose_GC (long /*int*/ gdkGC, GCData data) { + checkWidget (); + OS.g_object_unref (gdkGC); + } +@@ -3375,7 +3375,7 @@ + void register () { + super.register (); + if (fixedHandle != 0) display.addWidget (fixedHandle, this); +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) display.addWidget (imHandle, this); + } + +@@ -3451,7 +3451,7 @@ + + void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) { + if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return; +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + GdkRectangle rect = new GdkRectangle (); + if (redrawAll) { + int [] w = new int [1], h = new int [1]; +@@ -3505,7 +3505,7 @@ + super.releaseWidget (); + if (display.currentControl == this) display.currentControl = null; + display.removeMouseHoverTimeout (handle); +- int /*long*/ imHandle = imHandle (); ++ long /*int*/ imHandle = imHandle (); + if (imHandle != 0) { + OS.gtk_im_context_reset (imHandle); + OS.gtk_im_context_set_client_window (imHandle, 0); +@@ -3527,7 +3527,7 @@ + region = null; + } + +-void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) { ++void restackWindow (long /*int*/ window, long /*int*/ sibling, boolean above) { + if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) { + OS.gdk_window_restack (window, sibling, above); + } else { +@@ -3540,8 +3540,8 @@ + * When the receiver is not a top level shell, XReconfigureWMWindow () + * behaves the same as XConfigureWindow (). + */ +- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); +- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window); ++ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); ++ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window); + int xScreen = OS.XDefaultScreen (xDisplay); + int flags = OS.CWStackMode | OS.CWSibling; + XWindowChanges changes = new XWindowChanges (); +@@ -3595,7 +3595,7 @@ + } + } + +-boolean sendHelpEvent (int /*long*/ helpType) { ++boolean sendHelpEvent (long /*int*/ helpType) { + Control control = this; + while (control != null) { + if (control.hooks (SWT.Help)) { +@@ -3626,7 +3626,7 @@ + event.x = (int)x; + event.y = (int)y; + } else { +- int /*long*/ window = eventWindow (); ++ long /*int*/ window = eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + event.x = (int)x - origin_x [0]; +@@ -3682,7 +3682,7 @@ + } + boolean set = false; + if (gdkColor == null) { +- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle); + set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0; + } else { + GdkColor oldColor = getBackgroundColor (); +@@ -3699,10 +3699,10 @@ + } + } + +-void setBackgroundColor (int /*long*/ handle, GdkColor color) { ++void setBackgroundColor (long /*int*/ handle, GdkColor color) { + int index = OS.GTK_STATE_NORMAL; +- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle); +- int /*long*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index); ++ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle); ++ long /*int*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index); + if (ptr != 0) OS.g_free (ptr); + ptr = 0; + +@@ -3769,8 +3769,8 @@ + redrawChildren (); + } + +-void setBackgroundPixmap (int /*long*/ pixmap) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); ++void setBackgroundPixmap (long /*int*/ pixmap) { ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); + if (window != 0) OS.gdk_window_set_back_pixmap (window, pixmap, false); + } + +@@ -3824,14 +3824,14 @@ + setCursor (cursor != null ? cursor.handle : 0); + } + +-void setCursor (int /*long*/ cursor) { +- int /*long*/ window = eventWindow (); ++void setCursor (long /*int*/ cursor) { ++ long /*int*/ window = eventWindow (); + if (window != 0) { + OS.gdk_window_set_cursor (window, cursor); + if (!OS.GDK_WINDOWING_X11 ()) { + OS.gdk_flush (); + } else { +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); + OS.XFlush (xDisplay); + } + } +@@ -3899,9 +3899,9 @@ + } + } else { + OS.gtk_widget_realize (handle); +- int /*long*/ parentHandle = parent.eventHandle (); +- int /*long*/ window = parent.eventWindow (); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ parentHandle = parent.eventHandle (); ++ long /*int*/ window = parent.eventWindow (); ++ long /*int*/ topHandle = topHandle (); + GdkWindowAttr attributes = new GdkWindowAttr (); + attributes.x = OS.GTK_WIDGET_X (topHandle); + attributes.y = OS.GTK_WIDGET_Y (topHandle); +@@ -3963,7 +3963,7 @@ + checkWidget(); + if (((state & FONT) == 0) && font == null) return; + this.font = font; +- int /*long*/ fontDesc; ++ long /*int*/ fontDesc; + if (font == null) { + fontDesc = defaultFont ().handle; + } else { +@@ -3978,7 +3978,7 @@ + setFontDescription (fontDesc); + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + OS.gtk_widget_modify_font (handle, font); + } + +@@ -4009,7 +4009,7 @@ + } + boolean set = false; + if (gdkColor == null) { +- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle); + set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0; + } else { + GdkColor oldColor = getForegroundColor (); +@@ -4037,7 +4037,7 @@ + * first sized. The fix is to set the value to (0, 0) as + * expected by SWT. + */ +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + if ((parent.style & SWT.MIRRORED) != 0) { + OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ()); + } else { +@@ -4146,7 +4146,7 @@ + if (this.parent == parent) return true; + if (!isReparentable ()) return false; + OS.gtk_widget_realize (parent.handle); +- int /*long*/ topHandle = topHandle (); ++ long /*int*/ topHandle = topHandle (); + int x = OS.GTK_WIDGET_X (topHandle); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle); + if ((this.parent.style & SWT.MIRRORED) != 0) { +@@ -4165,7 +4165,7 @@ + newDecorations.fixAccelGroup (); + oldDecorations.fixAccelGroup (); + } +- int /*long*/ newParent = parent.parentingHandle(); ++ long /*int*/ newParent = parent.parentingHandle(); + OS.gtk_widget_reparent (topHandle, newParent); + OS.gtk_fixed_move (newParent, topHandle, x, y); + this.parent = parent; +@@ -4179,7 +4179,7 @@ + if (fixedHandle != 0) setBackgroundColor (fixedHandle, null); + } + +-void setParentWindow (int /*long*/ widget) { ++void setParentWindow (long /*int*/ widget) { + } + + boolean setRadioSelection (boolean value) { +@@ -4214,7 +4214,7 @@ + if (redraw) { + if (--drawCount == 0) { + if (redrawWindow != 0) { +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + /* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */ + OS.gdk_window_hide (redrawWindow); + OS.gdk_window_destroy (redrawWindow); +@@ -4225,7 +4225,7 @@ + } else { + if (drawCount++ == 0) { + if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) != 0) { +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + Rectangle rect = getBounds (); + GdkWindowAttr attributes = new GdkWindowAttr (); + attributes.width = rect.width; +@@ -4340,7 +4340,7 @@ + public void setVisible (boolean visible) { + checkWidget(); + if (((state & HIDDEN) == 0) == visible) return; +- int /*long*/ topHandle = topHandle(); ++ long /*int*/ topHandle = topHandle(); + if (visible) { + /* + * It is possible (but unlikely), that application +@@ -4421,11 +4421,11 @@ + } + } + +- int /*long*/ topHandle = topHandle (); +- int /*long*/ siblingHandle = sibling != null ? sibling.topHandle () : 0; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle); ++ long /*int*/ topHandle = topHandle (); ++ long /*int*/ siblingHandle = sibling != null ? sibling.topHandle () : 0; ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle); + if (window != 0) { +- int /*long*/ siblingWindow = 0; ++ long /*int*/ siblingWindow = 0; + if (sibling != null) { + if (above && sibling.enableWindow != 0) { + siblingWindow = enableWindow; +@@ -4433,7 +4433,7 @@ + siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle); + } + } +- int /*long*/ redrawWindow = fixChildren ? parent.redrawWindow : 0; ++ long /*int*/ redrawWindow = fixChildren ? parent.redrawWindow : 0; + if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) { + if (above) { + OS.gdk_window_raise (window); +@@ -4444,7 +4444,7 @@ + OS.gdk_window_lower (window); + } + } else { +- int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow; ++ long /*int*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow; + boolean stack_mode = above; + if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false; + restackWindow (window, siblingW, stack_mode); +@@ -4527,8 +4527,8 @@ + void showWidget () { + // Comment this line to disable zero-sized widgets + state |= ZERO_WIDTH | ZERO_HEIGHT; +- int /*long*/ topHandle = topHandle (); +- int /*long*/ parentHandle = parent.parentingHandle (); ++ long /*int*/ topHandle = topHandle (); ++ long /*int*/ parentHandle = parent.parentingHandle (); + parent.setParentWindow (topHandle); + OS.gtk_container_add (parentHandle, topHandle); + if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle); +@@ -4970,7 +4970,7 @@ + // checkWidget(); + if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return; + if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return; +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + if (flush) display.flushExposes (window, all); + OS.gdk_window_process_updates (window, all); + OS.gdk_flush (); +@@ -4988,7 +4988,7 @@ + /* Do nothing */ + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case EXPOSE_EVENT_INVERSE: { + if ((OS.GTK_VERSION < OS.VERSION (2, 8, 0)) && ((state & OBSCURED) == 0)) { +@@ -4996,10 +4996,10 @@ + if (control != null && control.backgroundImage != null) { + GdkEventExpose gdkEvent = new GdkEventExpose (); + OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof); +- int /*long*/ paintWindow = paintWindow(); +- int /*long*/ window = gdkEvent.window; ++ long /*int*/ paintWindow = paintWindow(); ++ long /*int*/ window = gdkEvent.window; + if (window != paintWindow) break; +- int /*long*/ gdkGC = OS.gdk_gc_new (window); ++ long /*int*/ gdkGC = OS.gdk_gc_new (window); + OS.gdk_gc_set_clip_region (gdkGC, gdkEvent.region); + int[] dest_x = new int[1], dest_y = new int[1]; + OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/DateTime.java swt-gtk-3.7//org/eclipse/swt/widgets/DateTime.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/DateTime.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/DateTime.java 2011-06-13 20:53:32.000000000 +0000 +@@ -439,7 +439,7 @@ + display.addFilter(SWT.MouseDown, clickListener); + } + +-int /*long*/ focusHandle () { ++long /*int*/ focusHandle () { + if (text != null) return text.handle; + return super.focusHandle (); + } +@@ -683,17 +683,17 @@ + } + } + +-int /*long*/ gtk_day_selected (int /*long*/ widget) { ++long /*int*/ gtk_day_selected (long /*int*/ widget) { + sendSelectionEvent (); + return 0; + } + +-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) { ++long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) { + sendSelectionEvent (SWT.DefaultSelection); + return 0; + } + +-int /*long*/ gtk_month_changed (int /*long*/ widget) { ++long /*int*/ gtk_month_changed (long /*int*/ widget) { + /* + * Feature in GTK. "month-changed" signal is emitted when the + * calendar is displayed though the day/month is not changed. +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Decorations.java swt-gtk-3.7//org/eclipse/swt/widgets/Decorations.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Decorations.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Decorations.java 2011-06-13 20:53:32.000000000 +0000 +@@ -102,7 +102,7 @@ + Menu [] menus; + Control savedFocus; + Button defaultButton, saveDefault; +- int /*long*/ accelGroup, vboxHandle; ++ long /*int*/ accelGroup, vboxHandle; + + Decorations () { + /* Do nothing */ +@@ -171,17 +171,17 @@ + sort (bestImages); + images = bestImages; + } +- int /*long*/ pixbufs = 0; ++ long /*int*/ pixbufs = 0; + if (images != null) { + for (int i = 0; i < images.length; i++) { + Image image = images [i]; +- int /*long*/ pixbuf = Display.createPixbuf (image); ++ long /*int*/ pixbuf = Display.createPixbuf (image); + pixbufs = OS.g_list_append (pixbufs, pixbuf); + } + } + OS.gtk_window_set_icon_list (topHandle (), pixbufs); +- int /*long*/ [] data = new int /*long*/ [1]; +- int /*long*/ temp = pixbufs; ++ long /*int*/ [] data = new long /*int*/ [1]; ++ long /*int*/ temp = pixbufs; + while (temp != 0) { + OS.memmove (data, temp, OS.PTR_SIZEOF); + OS.g_object_unref (data [0]); +@@ -232,7 +232,7 @@ + accelGroup = OS.gtk_accel_group_new (); + if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES); + //FIXME - what should we do for Decorations +- int /*long*/ shellHandle = topHandle (); ++ long /*int*/ shellHandle = topHandle (); + OS.gtk_window_add_accel_group (shellHandle, accelGroup); + } + +@@ -243,7 +243,7 @@ + + void destroyAccelGroup () { + if (accelGroup == 0) return; +- int /*long*/ shellHandle = topHandle (); ++ long /*int*/ shellHandle = topHandle (); + OS.gtk_window_remove_accel_group (shellHandle, accelGroup); + //TEMPORARY CODE + // OS.g_object_unref (accelGroup); +@@ -546,7 +546,7 @@ + */ + public void setDefaultButton (Button button) { + checkWidget(); +- int /*long*/ buttonHandle = 0; ++ long /*int*/ buttonHandle = 0; + if (button != null) { + if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); + if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT); +@@ -765,7 +765,7 @@ + * key. + */ + if (!button.isVisible () || !button.isEnabled ()) return true; +- int /*long*/ shellHandle = _getShell ().topHandle (); ++ long /*int*/ shellHandle = _getShell ().topHandle (); + return OS.gtk_window_activate_default (shellHandle); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/DirectoryDialog.java swt-gtk-3.7//org/eclipse/swt/widgets/DirectoryDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/DirectoryDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/DirectoryDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -124,9 +124,9 @@ + } + String openChooserDialog () { + byte [] titleBytes = Converter.wcsToMbcs (null, title, true); +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); +- int /*long*/ handle = 0; ++ long /*int*/ handle = 0; + if (display.getDismissalAlignment() == SWT.RIGHT) { + handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0); + } else { +@@ -134,11 +134,11 @@ + } + if (handle == 0) error (SWT.ERROR_NO_HANDLES); + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { +- int /*long*/ group = OS.gtk_window_get_group(0); ++ long /*int*/ group = OS.gtk_window_get_group(0); + OS.gtk_window_group_add_window (group, handle); + } + OS.gtk_window_set_modal (handle, true); +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); +@@ -156,7 +156,7 @@ + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ long /*int*/ ptr = OS.realpath (buffer, null); + if (ptr != 0) { + OS.gtk_file_chooser_set_current_folder (handle, ptr); + OS.g_free (ptr); +@@ -164,9 +164,9 @@ + } + if (message.length () > 0) { + byte [] buffer = Converter.wcsToMbcs (null, message, true); +- int /*long*/ box = OS.gtk_hbox_new (false, 0); ++ long /*int*/ box = OS.gtk_hbox_new (false, 0); + if (box == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ label = OS.gtk_label_new (buffer); ++ long /*int*/ label = OS.gtk_label_new (buffer); + if (label == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_container_add (box, label); + OS.gtk_widget_show (label); +@@ -182,7 +182,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +@@ -202,13 +202,13 @@ + display.setModalDialog (oldModal); + } + if (response == OS.GTK_RESPONSE_OK) { +- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle); ++ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle); + if (path != 0) { +- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); ++ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); + OS.g_free (path); + if (utf8Ptr != 0) { +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + OS.g_free (utf8Ptr); + if (utf16Ptr != 0) { + int clength = (int)/*64*/items_written [0]; +@@ -227,11 +227,11 @@ + } + String openClassicDialog () { + byte [] titleBytes = Converter.wcsToMbcs (null, title, true); +- int /*long*/ handle = OS.gtk_file_selection_new (titleBytes); ++ long /*int*/ handle = OS.gtk_file_selection_new (titleBytes); + if (parent != null) { +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + OS.gtk_window_set_transient_for (handle, shellHandle); +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); +@@ -247,8 +247,8 @@ + int length = path.length (); + char [] buffer = new char [length + 1]; + path.getChars (0, length, buffer, 0); +- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null); +- int /*long*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null); ++ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null); ++ long /*int*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null); + OS.gtk_file_selection_set_filename (handle, fileNamePtr); + OS.g_free (utf8Ptr); + OS.g_free (fileNamePtr); +@@ -256,12 +256,12 @@ + GtkFileSelection selection = new GtkFileSelection (); + OS.memmove (selection, handle); + OS.gtk_file_selection_hide_fileop_buttons (handle); +- int /*long*/ fileListParent = OS.gtk_widget_get_parent (selection.file_list); ++ long /*int*/ fileListParent = OS.gtk_widget_get_parent (selection.file_list); + OS.gtk_widget_hide (selection.file_list); + OS.gtk_widget_hide (fileListParent); + if (message.length () > 0) { + byte [] buffer = Converter.wcsToMbcs (null, message, true); +- int /*long*/ labelHandle = OS.gtk_label_new (buffer); ++ long /*int*/ labelHandle = OS.gtk_label_new (buffer); + OS.gtk_label_set_line_wrap (labelHandle, true); + OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f); + OS.gtk_container_add (selection.main_vbox, labelHandle); +@@ -277,7 +277,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +@@ -297,11 +297,11 @@ + display.setModalDialog (oldModal); + } + if (response == OS.GTK_RESPONSE_OK) { +- int /*long*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle); +- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null); ++ long /*int*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle); ++ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null); + if (utf8Ptr != 0) { +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + if (utf16Ptr != 0) { + int length = (int)/*64*/items_written [0]; + char [] buffer = new char [length]; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Display.java swt-gtk-3.7//org/eclipse/swt/widgets/Display.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Display.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Display.java 2011-06-13 20:53:32.000000000 +0000 +@@ -98,30 +98,30 @@ + + /* Events Dispatching and Callback */ + int gdkEventCount; +- int /*long*/ [] gdkEvents; ++ long /*int*/ [] gdkEvents; + Widget [] gdkEventWidgets; + int [] dispatchEvents; + Event [] eventQueue; +- int /*long*/ fds; ++ long /*int*/ fds; + int allocated_nfds; + boolean wake; + int [] max_priority = new int [1], timeout = new int [1]; + Callback eventCallback, filterCallback; +- int /*long*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5; ++ long /*int*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5; + Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5; + EventTable eventTable, filterTable; + static String APP_NAME = "SWT"; //$NON-NLS-1$ + static String APP_VERSION = ""; //$NON-NLS-1$ + static final String DISPATCH_EVENT_KEY = "org.eclipse.swt.internal.gtk.dispatchEvent"; //$NON-NLS-1$ + static final String ADD_WIDGET_KEY = "org.eclipse.swt.internal.addWidget"; //$NON-NLS-1$ +- int /*long*/ [] closures; ++ long /*int*/ [] closures; + int [] signalIds; +- int /*long*/ shellMapProcClosure; ++ long /*int*/ shellMapProcClosure; + + /* Widget Table */ + int [] indexTable; + int freeSlot; +- int /*long*/ lastHandle; ++ long /*int*/ lastHandle; + Widget lastWidget; + Widget [] widgetTable; + final static int GROW_SIZE = 1024; +@@ -152,7 +152,7 @@ + + /* Input method resources */ + Control imControl; +- int /*long*/ preeditWindow, preeditLabel; ++ long /*int*/ preeditWindow, preeditLabel; + + /* Sync/Async Widget Communication */ + Synchronizer synchronizer = new Synchronizer (this); +@@ -173,40 +173,40 @@ + int [] timerIds; + Runnable [] timerList; + Callback timerCallback; +- int /*long*/ timerProc; ++ long /*int*/ timerProc; + Callback windowTimerCallback; +- int /*long*/ windowTimerProc; ++ long /*int*/ windowTimerProc; + + /* Caret */ + Caret currentCaret; + Callback caretCallback; + int caretId; +- int /*long*/ caretProc; ++ long /*int*/ caretProc; + + /* Mnemonics */ + Control mnemonicControl; + + /* Mouse hover */ + int mouseHoverId; +- int /*long*/ mouseHoverHandle, mouseHoverProc; ++ long /*int*/ mouseHoverHandle, mouseHoverProc; + Callback mouseHoverCallback; + + /* Menu position callback */ +- int /*long*/ menuPositionProc; ++ long /*int*/ menuPositionProc; + Callback menuPositionCallback; + + /* Tooltip size allocate callback */ +- int /*long*/ sizeAllocateProc; ++ long /*int*/ sizeAllocateProc; + Callback sizeAllocateCallback; +- int /*long*/ sizeRequestProc; ++ long /*int*/ sizeRequestProc; + Callback sizeRequestCallback; + + /* Shell map callback */ +- int /*long*/ shellMapProc; ++ long /*int*/ shellMapProc; + Callback shellMapCallback; + + /* Idle proc callback */ +- int /*long*/ idleProc; ++ long /*int*/ idleProc; + int idleHandle; + Callback idleCallback; + static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$ +@@ -217,29 +217,29 @@ + /* GtkTreeView callbacks */ + int[] treeSelection; + int treeSelectionLength; +- int /*long*/ treeSelectionProc; ++ long /*int*/ treeSelectionProc; + Callback treeSelectionCallback; +- int /*long*/ cellDataProc; ++ long /*int*/ cellDataProc; + Callback cellDataCallback; + + /* Set direction callback */ +- int /*long*/ setDirectionProc; ++ long /*int*/ setDirectionProc; + Callback setDirectionCallback; + static final String GET_DIRECTION_PROC_KEY = "org.eclipse.swt.internal.gtk.getDirectionProc"; //$NON-NLS-1$ + + /* Set emissionProc callback */ +- int /*long*/ emissionProc; ++ long /*int*/ emissionProc; + Callback emissionProcCallback; + static final String GET_EMISSION_PROC_KEY = "org.eclipse.swt.internal.gtk.getEmissionProc"; //$NON-NLS-1$ + + /* Get all children callback */ +- int /*long*/ allChildrenProc, allChildren; ++ long /*int*/ allChildrenProc, allChildren; + Callback allChildrenCallback; + + /* Settings callbacks */ +- int /*long*/ signalProc; ++ long /*int*/ signalProc; + Callback signalCallback; +- int /*long*/ shellHandle; ++ long /*int*/ shellHandle; + boolean settingsChanged, runSettings; + static final int STYLE_SET = 1; + static final int PROPERTY_NOTIFY = 2; +@@ -251,14 +251,14 @@ + Control currentControl; + + /* Flush exposes */ +- int /*long*/ checkIfEventProc; ++ long /*int*/ checkIfEventProc; + Callback checkIfEventCallback; +- int /*long*/ flushWindow; ++ long /*int*/ flushWindow; + boolean flushAll; + GdkRectangle flushRect = new GdkRectangle (); + XExposeEvent exposeEvent = new XExposeEvent (); + XVisibilityEvent visibilityEvent = new XVisibilityEvent (); +- int /*long*/ [] flushData = new int /*long*/ [1]; ++ long /*int*/ [] flushData = new long /*int*/ [1]; + + /* System Resources */ + Font systemFont; +@@ -288,7 +288,7 @@ + int lastEventTime, lastUserEventTime; + + /* Pango layout constructor */ +- int /*long*/ pangoLayoutNewProc; ++ long /*int*/ pangoLayoutNewProc; + + /* Custom Resize */ + double resizeLocationX, resizeLocationY; +@@ -296,16 +296,16 @@ + int resizeMode; + + /* Fixed Subclass */ +- static int /*long*/ fixed_type; +- static int /*long*/ fixed_info_ptr; ++ static long /*int*/ fixed_type; ++ static long /*int*/ fixed_info_ptr; + static Callback fixedClassInitCallback, fixedMapCallback, fixedSizeAllocateCallback; +- static int /*long*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc; ++ static long /*int*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc; + + /* Renderer Subclass */ +- static int /*long*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type; +- static int /*long*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr; ++ static long /*int*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type; ++ static long /*int*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr; + static Callback rendererClassInitCallback, rendererRenderCallback, rendererGetSizeCallback; +- static int /*long*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc; ++ static long /*int*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc; + + /* Key Mappings */ + static final int [] [] KeyTable = { +@@ -553,16 +553,16 @@ + layoutDeferred[layoutDeferredCount++] = comp; + } + +-void addGdkEvent (int /*long*/ event) { ++void addGdkEvent (long /*int*/ event) { + if (gdkEvents == null) { + int length = GROW_SIZE; +- gdkEvents = new int /*long*/ [length]; ++ gdkEvents = new long /*int*/ [length]; + gdkEventWidgets = new Widget [length]; + gdkEventCount = 0; + } + if (gdkEventCount == gdkEvents.length) { + int length = gdkEventCount + GROW_SIZE; +- int /*long*/ [] newEvents = new int /*long*/ [length]; ++ long /*int*/ [] newEvents = new long /*int*/ [length]; + System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount); + gdkEvents = newEvents; + Widget [] newWidgets = new Widget [length]; +@@ -570,7 +570,7 @@ + gdkEventWidgets = newWidgets; + } + Widget widget = null; +- int /*long*/ handle = OS.gtk_get_event_widget (event); ++ long /*int*/ handle = OS.gtk_get_event_widget (event); + if (handle != 0) { + do { + widget = getWidget (handle); +@@ -621,7 +621,7 @@ + eventTable.hook (eventType, listener); + } + +-int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) { ++long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) { + allChildren = OS.g_list_append (allChildren, widget); + if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) { + OS.gtk_container_forall (widget, allChildrenProc, recurse); +@@ -629,7 +629,7 @@ + return 0; + } + +-void addMouseHoverTimeout (int /*long*/ handle) { ++void addMouseHoverTimeout (long /*int*/ handle) { + if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId); + mouseHoverId = OS.gtk_timeout_add (400, mouseHoverProc, handle); + mouseHoverHandle = handle; +@@ -663,7 +663,7 @@ + skinList [skinCount++] = widget; + } + +-void addWidget (int /*long*/ handle, Widget widget) { ++void addWidget (long /*int*/ handle, Widget widget) { + if (handle == 0) return; + if (freeSlot == -1) { + int length = (freeSlot = indexTable.length) + GROW_SIZE; +@@ -736,12 +736,12 @@ + if (!OS.GDK_WINDOWING_X11 ()) { + OS.gdk_flush (); + } else { +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); + OS.XFlush (xDisplay); + } + } + +-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) { ++long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { + Widget widget = getWidget (data); + if (widget == null) return 0; + return widget.cellDataProc (tree_column, cell, tree_model, iter, data); +@@ -764,7 +764,7 @@ + } + } + +-int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*long*/ userData) { ++long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long /*int*/ userData) { + int type = OS.X_EVENT_TYPE (xEvent); + switch (type) { + case OS.VisibilityNotify: +@@ -780,11 +780,11 @@ + default: + return 0; + } +- int /*long*/ window = OS.gdk_window_lookup (OS.X_EVENT_WINDOW (xEvent)); ++ long /*int*/ window = OS.gdk_window_lookup (OS.X_EVENT_WINDOW (xEvent)); + if (window == 0) return 0; + if (flushWindow != 0) { + if (flushAll) { +- int /*long*/ tempWindow = window; ++ long /*int*/ tempWindow = window; + do { + if (tempWindow == flushWindow) break; + } while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0); +@@ -809,7 +809,7 @@ + case OS.VisibilityNotify: { + OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof); + OS.gdk_window_get_user_data (window, flushData); +- int /*long*/ handle = flushData [0]; ++ long /*int*/ handle = flushData [0]; + Widget widget = handle != 0 ? getWidget (handle) : null; + if (widget != null && widget instanceof Control) { + Control control = (Control) widget; +@@ -905,11 +905,11 @@ + OS.g_thread_init (0); + } + OS.gtk_set_locale(); +- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) { ++ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) { + SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$ + } + if (OS.GDK_WINDOWING_X11 ()) xDisplay = OS.GDK_DISPLAY (); +- int /*long*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO); ++ long /*int*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO); + if (ptr != 0) { + int length = OS.strlen (ptr); + byte [] buffer = new byte [length]; +@@ -1008,9 +1008,9 @@ + OS.gdk_window_add_filter (0, filterProc, 0); + + if (OS.GDK_WINDOWING_X11 ()) { +- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW (shellHandle)); ++ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW (shellHandle)); + byte[] atomName = Converter.wcsToMbcs (null, "SWT_Window_" + APP_NAME, true); //$NON-NLS-1$ +- int /*long*/ atom = OS.XInternAtom (OS.GDK_DISPLAY (), atomName, false); ++ long /*int*/ atom = OS.XInternAtom (OS.GDK_DISPLAY (), atomName, false); + OS.XSetSelectionOwner (OS.GDK_DISPLAY (), atom, xWindow, OS.CurrentTime); + OS.XGetSelectionOwner (OS.GDK_DISPLAY (), atom); + } +@@ -1023,9 +1023,9 @@ + } + + Image createImage (String name) { +- int /*long*/ style = OS.gtk_widget_get_default_style (); ++ long /*int*/ style = OS.gtk_widget_get_default_style (); + byte[] buffer = Converter.wcsToMbcs (null, name, true); +- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon ( ++ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon ( + OS.gtk_icon_factory_lookup_default (buffer), style, + OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0); + if (pixbuf == 0) return null; +@@ -1033,7 +1033,7 @@ + int height = OS.gdk_pixbuf_get_height (pixbuf); + int stride = OS.gdk_pixbuf_get_rowstride (pixbuf); + boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf); + byte [] data = new byte [stride * height]; + OS.memmove (data, pixels, data.length); + OS.g_object_unref (pixbuf); +@@ -1058,29 +1058,29 @@ + return new Image (this, imageData); + } + +-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= OS.VERSION (2, 10, 0)) { +- int /*long*/ border = OS.gtk_entry_get_inner_border (handle); ++ long /*int*/ border = OS.gtk_entry_get_inner_border (handle); + if (border != 0) { + OS.memmove (gtkBorder, border, GtkBorder.sizeof); + return gtkBorder; + } +- int /*long*/ [] borderPtr = new int /*long*/ [1]; ++ long /*int*/ [] borderPtr = new long /*int*/ [1]; + OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0); + if (borderPtr[0] != 0) { + OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof); +@@ -1537,7 +1537,7 @@ + return filterTable.hooks (eventType); + } + +-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data) { ++long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data) { + Widget widget = getWidget (data); + if (widget == null) return 0; + return widget.filterProc (xEvent, gdkEvent, data); +@@ -1653,19 +1653,19 @@ + return data; + } + +-int /*long*/ gtk_fixed_get_type () { ++long /*int*/ gtk_fixed_get_type () { + return fixed_type; + } + +-int /*long*/ gtk_cell_renderer_text_get_type () { ++long /*int*/ gtk_cell_renderer_text_get_type () { + return text_renderer_type; + } + +-int /*long*/ gtk_cell_renderer_pixbuf_get_type () { ++long /*int*/ gtk_cell_renderer_pixbuf_get_type () { + return pixbuf_renderer_type; + } + +-int /*long*/ gtk_cell_renderer_toggle_get_type () { ++long /*int*/ gtk_cell_renderer_toggle_get_type () { + return toggle_renderer_type; + } + +@@ -1727,7 +1727,7 @@ + checkDevice (); + int [] buffer = new int [1]; + if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) { +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0); + } + return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT; +@@ -1747,7 +1747,7 @@ + */ + public int getDoubleClickTime () { + checkDevice (); +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + int [] buffer = new int [1]; + OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0); + return buffer [0]; +@@ -1772,8 +1772,8 @@ + return focusControl; + } + if (activeShell == null) return null; +- int /*long*/ shellHandle = activeShell.shellHandle; +- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle); ++ long /*int*/ shellHandle = activeShell.shellHandle; ++ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle); + if (handle == 0) return null; + do { + Widget widget = getWidget (handle); +@@ -1870,12 +1870,12 @@ + */ + Rectangle getWorkArea() { + byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$ +- int /*long*/ atom = OS.gdk_atom_intern (name, true); ++ long /*int*/ atom = OS.gdk_atom_intern (name, true); + if (atom == OS.GDK_NONE) return null; +- int /*long*/[] actualType = new int /*long*/[1]; ++ long /*int*/[] actualType = new long /*int*/[1]; + int[] actualFormat = new int[1]; + int[] actualLength = new int[1]; +- int /*long*/[] data = new int /*long*/[1]; ++ long /*int*/[] data = new long /*int*/[1]; + if (!OS.gdk_property_get (OS.GDK_ROOT_PARENT (), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) { + return null; + } +@@ -1906,7 +1906,7 @@ + checkDevice (); + Monitor [] monitors = null; + Rectangle workArea = getWorkArea(); +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { + int monitorCount = OS.gdk_screen_get_n_monitors (screen); + if (monitorCount > 0) { +@@ -2226,12 +2226,12 @@ + GdkColor gdkColor; + + /* Get Tooltip resources */ +- int /*long*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP); ++ long /*int*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP); + if (tooltipShellHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES); + byte[] gtk_tooltips = Converter.wcsToMbcs (null, "gtk-tooltips", true); //$NON-NLS-1$ + OS.gtk_widget_set_name (tooltipShellHandle, gtk_tooltips); + OS.gtk_widget_realize (tooltipShellHandle); +- int /*long*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle); ++ long /*int*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle); + gdkColor = new GdkColor(); + OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor); + COLOR_INFO_FOREGROUND = gdkColor; +@@ -2241,7 +2241,7 @@ + OS.gtk_widget_destroy (tooltipShellHandle); + + /* Get Shell resources */ +- int /*long*/ style = OS.gtk_widget_get_style (shellHandle); ++ long /*int*/ style = OS.gtk_widget_get_style (shellHandle); + gdkColor = new GdkColor(); + OS.gtk_style_get_black (style, gdkColor); + COLOR_WIDGET_DARK_SHADOW = gdkColor; +@@ -2322,8 +2322,8 @@ + public Font getSystemFont () { + checkDevice (); + if (systemFont != null) return systemFont; +- int /*long*/ style = OS.gtk_widget_get_style (shellHandle); +- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style)); ++ long /*int*/ style = OS.gtk_widget_get_style (shellHandle); ++ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style)); + return systemFont = Font.gtk_new (this, defaultFont); + } + +@@ -2396,10 +2396,10 @@ + return false; + } + +-Widget getWidget (int /*long*/ handle) { ++Widget getWidget (long /*int*/ handle) { + if (handle == 0) return null; + if (lastWidget != null && lastHandle == handle) return lastWidget; +- int /*long*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; ++ long /*int*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1; + if (0 <= index && index < widgetTable.length) { + lastHandle = handle; + return lastWidget = widgetTable [(int)/*64*/index]; +@@ -2407,7 +2407,7 @@ + return null; + } + +-int /*long*/ idleProc (int /*long*/ data) { ++long /*int*/ idleProc (long /*int*/ data) { + boolean result = runAsyncMessages (false); + if (!result) { + synchronized (idleLock) { +@@ -2437,7 +2437,7 @@ + } + + void initializeCallbacks () { +- closures = new int /*long*/ [Widget.LAST_SIGNAL]; ++ closures = new long /*int*/ [Widget.LAST_SIGNAL]; + signalIds = new int [Widget.LAST_SIGNAL]; + + /* Cache signals for GtkWidget */ +@@ -2633,8 +2633,8 @@ + + void initializeSubclasses () { + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { +- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); +- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); ++ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); ++ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); + pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass); + OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc)); + OS.g_type_class_unref (pangoLayoutClass); +@@ -2653,10 +2653,10 @@ + * fix is to for the initializaion by creating + * a temporary GtkEntry. + */ +- int /*long*/ entry = OS.gtk_entry_new (); ++ long /*int*/ entry = OS.gtk_entry_new (); + OS.gtk_widget_destroy (entry); + int [] buffer2 = new int [1]; +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0); + entrySelectOnFocus = buffer2 [0] != 0; + } +@@ -2672,9 +2672,9 @@ + /* Get the window manager name */ + windowManager = ""; //$NON-NLS-1$ + if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) { +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { +- int /*long*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen); ++ long /*int*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen); + if (ptr2 != 0) { + int length = OS.strlen (ptr2); + if (length > 0) { +@@ -2702,7 +2702,7 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) { ++public void internal_dispose_GC (long /*int*/ gdkGC, GCData data) { + OS.g_object_unref (gdkGC); + } + +@@ -2728,10 +2728,10 @@ + * + * @noreference This method is not intended to be referenced by clients. + */ +-public int /*long*/ internal_new_GC (GCData data) { ++public long /*int*/ internal_new_GC (GCData data) { + if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED); +- int /*long*/ root = OS.GDK_ROOT_PARENT (); +- int /*long*/ gdkGC = OS.gdk_gc_new (root); ++ long /*int*/ root = OS.GDK_ROOT_PARENT (); ++ long /*int*/ gdkGC = OS.gdk_gc_new (root); + if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES); + OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS); + if (data != null) { +@@ -2837,7 +2837,7 @@ + Point point = new Point (x, y); + if (from == to) return point; + if (from != null) { +- int /*long*/ window = from.eventWindow (); ++ long /*int*/ window = from.eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + if ((from.style & SWT.MIRRORED) != 0) point.x = from.getClientWidth () - point.x; +@@ -2845,7 +2845,7 @@ + point.y += origin_y [0]; + } + if (to != null) { +- int /*long*/ window = to.eventWindow (); ++ long /*int*/ window = to.eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + point.x -= origin_x [0]; +@@ -2914,7 +2914,7 @@ + return result [0]; + } + +-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) { ++long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) { + Widget widget = getWidget (menu); + if (widget == null) return 0; + return widget.menuPositionProc (menu, x, y, push_in, user_data); +@@ -2966,7 +2966,7 @@ + if (from == to) return rect; + boolean fromRTL = false, toRTL = false; + if (from != null) { +- int /*long*/ window = from.eventWindow (); ++ long /*int*/ window = from.eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + if (fromRTL = (from.style & SWT.MIRRORED) != 0) rect.x = from.getClientWidth() - rect.x; +@@ -2974,7 +2974,7 @@ + rect.y += origin_y [0]; + } + if (to != null) { +- int /*long*/ window = to.eventWindow (); ++ long /*int*/ window = to.eventWindow (); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + rect.x -= origin_x [0]; +@@ -2985,7 +2985,7 @@ + return rect; + } + +-int /*long*/ mouseHoverProc (int /*long*/ handle) { ++long /*int*/ mouseHoverProc (long /*int*/ handle) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.hoverProc (handle); +@@ -3065,13 +3065,13 @@ + if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED); + if (event == null) error (SWT.ERROR_NULL_ARGUMENT); + if (!OS.GDK_WINDOWING_X11()) return false; +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); + int type = event.type; + switch (type) { + case SWT.KeyDown: + case SWT.KeyUp: { + int keyCode = 0; +- int /*long*/ keysym = untranslateKey (event.keyCode); ++ long /*int*/ keysym = untranslateKey (event.keyCode); + if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym); + if (keyCode == 0) { + char key = event.character; +@@ -3153,7 +3153,7 @@ + void putGdkEvents () { + if (gdkEventCount != 0) { + for (int i = 0; i < gdkEventCount; i++) { +- int /*long*/ event = gdkEvents [i]; ++ long /*int*/ event = gdkEvents [i]; + Widget widget = gdkEventWidgets [i]; + if (widget == null || !widget.isDisposed ()) { + OS.gdk_event_put (event); +@@ -3415,8 +3415,8 @@ + + /* Dispose subclass */ + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { +- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); +- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); ++ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT (); ++ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType); + OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc); + OS.g_type_class_unref (pangoLayoutClass); + pangoLayoutNewProc = 0; +@@ -3476,9 +3476,9 @@ + if (filterTable.size () == 0) filterTable = null; + } + +-int /*long*/ removeGdkEvent () { ++long /*int*/ removeGdkEvent () { + if (gdkEventCount == 0) return 0; +- int /*long*/ event = gdkEvents [0]; ++ long /*int*/ event = gdkEvents [0]; + --gdkEventCount; + System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount); + System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount); +@@ -3527,7 +3527,7 @@ + eventTable.unhook (eventType, listener); + } + +-void removeMouseHoverTimeout (int /*long*/ handle) { ++void removeMouseHoverTimeout (long /*int*/ handle) { + if (handle != mouseHoverHandle) return; + if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId); + mouseHoverId = 0; +@@ -3544,7 +3544,7 @@ + } + } + +-Widget removeWidget (int /*long*/ handle) { ++Widget removeWidget (long /*int*/ handle) { + if (handle == 0) return null; + lastWidget = null; + Widget widget = null; +@@ -3747,8 +3747,8 @@ + public void setCursorLocation (int x, int y) { + checkDevice (); + if (OS.GDK_WINDOWING_X11 ()) { +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); +- int /*long*/ xWindow = OS.XDefaultRootWindow (xDisplay); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xWindow = OS.XDefaultRootWindow (xDisplay); + OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y); + } + } +@@ -3816,7 +3816,7 @@ + } + if (key.equals (ADD_WIDGET_KEY)) { + Object [] data = (Object []) value; +- int /*long*/ handle = ((LONG) data [0]).value; ++ long /*int*/ handle = ((LONG) data [0]).value; + Widget widget = (Widget) data [1]; + if (widget != null) { + addWidget (handle, widget); +@@ -3905,10 +3905,10 @@ + this.data = data; + } + +-int /*long*/ setDirectionProc (int /*long*/ widget, int /*long*/ direction) { ++long /*int*/ setDirectionProc (long /*int*/ widget, long /*int*/ direction) { + OS.gtk_widget_set_direction (widget, (int)/*64*/ direction); + if (OS.GTK_IS_MENU_ITEM (widget)) { +- int /*long*/ submenu = OS.gtk_menu_item_get_submenu (widget); ++ long /*int*/ submenu = OS.gtk_menu_item_get_submenu (widget); + if (submenu != 0) { + OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction); + OS.gtk_container_forall (submenu, setDirectionProc, direction); +@@ -3983,9 +3983,9 @@ + OS.gtk_container_add (preeditWindow, preeditLabel); + OS.gtk_widget_show (preeditLabel); + } +- int /*long*/ [] preeditString = new int /*long*/ [1]; +- int /*long*/ [] pangoAttrs = new int /*long*/ [1]; +- int /*long*/ imHandle = control.imHandle (); ++ long /*int*/ [] preeditString = new long /*int*/ [1]; ++ long /*int*/ [] pangoAttrs = new long /*int*/ [1]; ++ long /*int*/ imHandle = control.imHandle (); + OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null); + if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) { + Control widget = control.findBackgroundControl (); +@@ -4039,7 +4039,7 @@ + fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds); + } + max_priority [0] = timeout [0] = 0; +- int /*long*/ context = OS.g_main_context_default (); ++ long /*int*/ context = OS.g_main_context_default (); + boolean result = false; + do { + if (OS.g_main_context_acquire (context)) { +@@ -4050,7 +4050,7 @@ + allocated_nfds = nfds; + fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds); + } +- int /*long*/ poll = OS.g_main_context_get_poll_func (context); ++ long /*int*/ poll = OS.g_main_context_get_poll_func (context); + if (poll != 0) { + if (nfds > 0 || timeout [0] != 0) { + /* +@@ -4144,7 +4144,7 @@ + } + } + +-int /*long*/ timerProc (int /*long*/ i) { ++long /*int*/ timerProc (long /*int*/ i) { + if (timerList == null) return 0; + int index = (int)/*64*/i; + if (0 <= index && index < timerList.length) { +@@ -4156,7 +4156,7 @@ + return 0; + } + +-int /*long*/ caretProc (int /*long*/ clientData) { ++long /*int*/ caretProc (long /*int*/ clientData) { + caretId = 0; + if (currentCaret == null) { + return 0; +@@ -4171,19 +4171,19 @@ + return 0; + } + +-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + Widget widget = getWidget (user_data); + if (widget == null) return 0; + return widget.sizeAllocateProc (handle, arg0, user_data); + } + +-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + Widget widget = getWidget (user_data); + if (widget == null) return 0; + return widget.sizeRequestProc (handle, arg0, user_data); + } + +-int /*long*/ treeSelectionProc (int /*long*/ model, int /*long*/ path, int /*long*/ iter, int /*long*/ data) { ++long /*int*/ treeSelectionProc (long /*int*/ model, long /*int*/ path, long /*int*/ iter, long /*int*/ data) { + Widget widget = getWidget (data); + if (widget == null) return 0; + return widget.treeSelectionProc (model, path, iter, treeSelection, treeSelectionLength++); +@@ -4241,13 +4241,13 @@ + caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0); + } + +-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.shellMapProc (handle, arg0, user_data); + } + +-int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) { ++long /*int*/ signalProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) { + switch((int)/*64*/user_data) { + case STYLE_SET: + settingsChanged = true; +@@ -4257,14 +4257,14 @@ + OS.memmove (gdkEvent, arg1); + if (gdkEvent.type == OS.GDK_PROPERTY_NOTIFY) { + byte[] name = Converter.wcsToMbcs (null, "org.eclipse.swt.filePath.message", true); //$NON-NLS-1$ +- int /*long*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true)); ++ long /*int*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true)); + if (atom == OS.gdk_x11_atom_to_xatom (gdkEvent.atom)) { +- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW( shellHandle)); +- int /*long*/ [] type = new int /*long*/ [1]; ++ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW( shellHandle)); ++ long /*int*/ [] type = new long /*int*/ [1]; + int [] format = new int [1]; + int [] nitems = new int [1]; + int [] bytes_after = new int [1]; +- int /*long*/ [] data = new int /*long*/ [1]; ++ long /*int*/ [] data = new long /*int*/ [1]; + OS.XGetWindowProperty (OS.GDK_DISPLAY (), xWindow, atom, 0, -1, true, OS.AnyPropertyType, + type, format, nitems, bytes_after, data); + +@@ -4396,31 +4396,31 @@ + return 0; + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.windowProc (handle, user_data); + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.windowProc (handle, arg0, user_data); + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.windowProc (handle, arg0, arg1, user_data); + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.windowProc (handle, arg0, arg1, arg2, user_data); + } + +-int /*long*/ windowTimerProc (int /*long*/ handle) { ++long /*int*/ windowTimerProc (long /*int*/ handle) { + Widget widget = getWidget (handle); + if (widget == null) return 0; + return widget.timerProc (handle); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ExpandBar.java swt-gtk-3.7//org/eclipse/swt/widgets/ExpandBar.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ExpandBar.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ExpandBar.java 2011-06-13 20:53:32.000000000 +0000 +@@ -160,14 +160,14 @@ + OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC); + OS.gtk_container_add (fixedHandle, scrolledHandle); + OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle); +- int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle); ++ long /*int*/ viewport = OS.gtk_bin_get_child (scrolledHandle); + OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE); + } else { + OS.gtk_container_add (fixedHandle, handle); + } + OS.gtk_container_set_border_width (handle, 0); + } else { +- int /*long*/ topHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); ++ long /*int*/ topHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + if (topHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (topHandle, true); + if ((style & SWT.V_SCROLL) != 0) { +@@ -241,11 +241,11 @@ + layoutItems (index, true); + } + +-int /*long*/ eventHandle () { ++long /*int*/ eventHandle () { + return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle; + } + +-boolean forceFocus (int /*long*/ focusHandle) { ++boolean forceFocus (long /*int*/ focusHandle) { + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + if (lastFocus != null && lastFocus.setFocus ()) return true; + for (int i = 0; i < itemCount; i++) { +@@ -366,7 +366,7 @@ + return spacing; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, event, GdkEventButton.sizeof); +@@ -387,7 +387,7 @@ + return super.gtk_button_press_event (widget, event); + } + +-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { + if (lastFocus != null) { + GdkEventButton gdkEvent = new GdkEventButton (); +@@ -407,7 +407,7 @@ + return super.gtk_button_release_event (widget, event); + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) { + if ((state & OBSCURED) != 0) return 0; + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { + GdkEventExpose gdkEvent = new GdkEventExpose (); +@@ -426,24 +426,24 @@ + return super.gtk_expose_event (widget, eventPtr); + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { + if (lastFocus != null) lastFocus.redraw (); + } + return super.gtk_focus_in_event(widget, event); + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) { + if (lastFocus != null) lastFocus.redraw (); + } + return super.gtk_focus_out_event (widget, event); + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + if (!hasFocus ()) return 0; +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) return result; + int index = 0; + while (index < itemCount) { +@@ -557,13 +557,13 @@ + } + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { +- int /*long*/ result = super.gtk_size_allocate (widget, allocation); ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { ++ long /*int*/ result = super.gtk_size_allocate (widget, allocation); + layoutItems (0, false); + return result; + } + +-int /*long*/ parentingHandle () { ++long /*int*/ parentingHandle () { + return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle; + } + +@@ -632,7 +632,7 @@ + return result; + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + for (int i = 0; i < itemCount; i++) { +@@ -667,7 +667,7 @@ + ExpandItem item = items [itemCount - 1]; + int maxHeight = item.y + getBandHeight () + spacing; + if (item.expanded) maxHeight += item.height; +- int /*long*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle); ++ long /*int*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, adjustmentHandle); + yCurrentScroll = (int)adjustment.value; +@@ -687,7 +687,7 @@ + OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, policy); + int width = OS.GTK_WIDGET_WIDTH (fixedHandle) - spacing * 2; + if (policy == OS.GTK_POLICY_ALWAYS) { +- int /*long*/ vHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle); ++ long /*int*/ vHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle); + GtkRequisition requisition = new GtkRequisition (); + OS.gtk_widget_size_request (vHandle, requisition); + width -= requisition.width; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ExpandItem.java swt-gtk-3.7//org/eclipse/swt/widgets/ExpandItem.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ExpandItem.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ExpandItem.java 2011-06-13 20:53:32.000000000 +0000 +@@ -39,7 +39,7 @@ + ExpandBar parent; + Control control; + ImageList imageList; +- int /*long*/ clientHandle, boxHandle, labelHandle, imageHandle; ++ long /*int*/ clientHandle, boxHandle, labelHandle, imageHandle; + boolean expanded; + int x, y, width, height; + int imageHeight, imageWidth; +@@ -316,7 +316,7 @@ + return width; + } + +-int /*long*/ gtk_activate (int /*long*/ widget) { ++long /*int*/ gtk_activate (long /*int*/ widget) { + Event event = new Event (); + event.item = this; + int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand; +@@ -324,23 +324,23 @@ + return 0; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + setFocus (); + return 0; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS); + parent.lastFocus = this; + return 0; + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { + parent.layoutItems (0, false); + return 0; + } + +-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { + parent.gtk_enter_notify_event(widget, event); + return 0; + } +@@ -520,7 +520,7 @@ + return result; + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + OS.gtk_widget_modify_font (handle, font); + if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font); + if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font); +@@ -565,7 +565,7 @@ + if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); + imageList = new ImageList (); + int imageIndex = imageList.add (image); +- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex); ++ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); + if (text.length () == 0) OS.gtk_widget_hide (labelHandle); + OS.gtk_widget_show (imageHandle); +@@ -621,7 +621,7 @@ + } + } + +-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) { ++long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { + switch ((int)/*64*/user_data) { + case ACTIVATE_INVERSE: { + expanded = OS.gtk_expander_get_expanded (handle); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/FileDialog.java swt-gtk-3.7//org/eclipse/swt/widgets/FileDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/FileDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/FileDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -45,7 +45,7 @@ + int filterIndex = -1; + boolean overwrite = false; + boolean uriMode; +- int /*long*/ handle; ++ long /*int*/ handle; + static final char SEPARATOR = System.getProperty ("file.separator").charAt (0); + static final char EXTENSION_SEPARATOR = ';'; + static final char FILE_EXTENSION_SEPARATOR = '.'; +@@ -102,7 +102,7 @@ + /* MULTI is only valid if the native dialog's action is Open */ + fullPath = null; + if ((style & SWT.MULTI) != 0) { +- int /*long*/ list = 0; ++ long /*int*/ list = 0; + if (uriMode) { + list = OS.gtk_file_chooser_get_uris (handle); + } else { +@@ -110,11 +110,11 @@ + } + int listLength = OS.g_slist_length (list); + fileNames = new String [listLength]; +- int /*long*/ current = list; ++ long /*int*/ current = list; + int writePos = 0; + for (int i = 0; i < listLength; i++) { +- int /*long*/ name = OS.g_slist_data (current); +- int /*long*/ utf8Ptr = 0; ++ long /*int*/ name = OS.g_slist_data (current); ++ long /*int*/ utf8Ptr = 0; + if (uriMode) { + utf8Ptr = name; + } else { +@@ -122,8 +122,8 @@ + OS.g_free (name); + } + if (utf8Ptr != 0) { +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + OS.g_free (utf8Ptr); + if (utf16Ptr != 0) { + int clength = (int)/*64*/items_written [0]; +@@ -143,19 +143,19 @@ + } + OS.g_slist_free (list); + } else { +- int /*long*/ utf8Ptr = 0; ++ long /*int*/ utf8Ptr = 0; + if (uriMode) { + utf8Ptr = OS.gtk_file_chooser_get_uri (handle); + } else { +- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle); ++ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle); + if (path != 0) { + utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null); + OS.g_free (path); + } + } + if (utf8Ptr != 0) { +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + OS.g_free (utf8Ptr); + if (utf16Ptr != 0) { + int clength = (int)/*64*/items_written [0]; +@@ -169,9 +169,9 @@ + } + } + filterIndex = -1; +- int /*long*/ filter = OS.gtk_file_chooser_get_filter (handle); ++ long /*int*/ filter = OS.gtk_file_chooser_get_filter (handle); + if (filter != 0) { +- int /*long*/ filterNamePtr = OS.gtk_file_filter_get_name (filter); ++ long /*int*/ filterNamePtr = OS.gtk_file_filter_get_name (filter); + if (filterNamePtr != 0) { + int length = OS.strlen (filterNamePtr); + byte[] buffer = new byte [length]; +@@ -219,23 +219,23 @@ + filterIndex = -1; + GtkFileSelection selection = new GtkFileSelection (); + OS.memmove (selection, handle); +- int /*long*/ entry = selection.selection_entry; +- int /*long*/ entryText = OS.gtk_entry_get_text (entry); ++ long /*int*/ entry = selection.selection_entry; ++ long /*int*/ entryText = OS.gtk_entry_get_text (entry); + int entryLength = OS.strlen (entryText); + if (entryLength == 0) { +- int /*long*/ fileList = selection.file_list; +- int /*long*/ listSelection = OS.gtk_tree_view_get_selection (fileList); +- int /*long*/[] model = new int /*long*/[1]; +- int /*long*/ selectedList = OS.gtk_tree_selection_get_selected_rows (listSelection, model); ++ long /*int*/ fileList = selection.file_list; ++ long /*int*/ listSelection = OS.gtk_tree_view_get_selection (fileList); ++ long /*int*/[] model = new long /*int*/[1]; ++ long /*int*/ selectedList = OS.gtk_tree_selection_get_selected_rows (listSelection, model); + if (selectedList == 0) return null; + int listLength = OS.g_list_length (selectedList); + if (listLength == 0) { + OS.g_list_free (selectedList); + return null; + } +- int /*long*/ path = OS.g_list_nth_data (selectedList, 0); +- int /*long*/ [] ptr = new int /*long*/[1]; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ path = OS.g_list_nth_data (selectedList, 0); ++ long /*int*/ [] ptr = new long /*int*/[1]; ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (OS.gtk_tree_model_get_iter (model [0], iter, path)) { + OS.gtk_tree_model_get (model [0], iter, 0, ptr, -1); + } +@@ -252,10 +252,10 @@ + OS.gtk_entry_set_text (entry, buffer); + } + +- int /*long*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle); +- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null); +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); ++ long /*int*/ fileNamePtr = OS.gtk_file_selection_get_filename (handle); ++ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + entryLength = (int)/*64*/items_written [0]; + char [] buffer = new char [entryLength]; + OS.memmove (buffer, utf16Ptr, entryLength * 2); +@@ -272,9 +272,9 @@ + if ((style & SWT.MULTI) == 0) { + fileNames = new String[] {fileName}; + } else { +- int /*long*/ namesPtr = OS.gtk_file_selection_get_selections (handle); +- int /*long*/ namesPtr1 = namesPtr; +- int /*long*/ [] namePtr = new int /*long*/ [1]; ++ long /*int*/ namesPtr = OS.gtk_file_selection_get_selections (handle); ++ long /*int*/ namesPtr1 = namesPtr; ++ long /*int*/ [] namePtr = new long /*int*/ [1]; + OS.memmove (namePtr, namesPtr1, OS.PTR_SIZEOF); + int length = 0; + while (namePtr[0] != 0) { +@@ -283,11 +283,11 @@ + OS.memmove(namePtr, namesPtr1, OS.PTR_SIZEOF); + } + fileNames = new String [length]; +- namePtr = new int /*long*/ [length]; ++ namePtr = new long /*int*/ [length]; + OS.memmove (namePtr, namesPtr, length * OS.PTR_SIZEOF); + for (int i = 0; i < length; i++) { + utf8Ptr = OS.g_filename_to_utf8 (namePtr [i], -1, null, null, null); +- items_written = new int /*long*/ [1]; ++ items_written = new long /*int*/ [1]; + utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null); + buffer = new char [(int)/*64*/items_written [0]]; + OS.memmove (buffer, utf16Ptr, items_written [0] * 2); +@@ -405,7 +405,7 @@ + int action = (style & SWT.SAVE) != 0 ? + OS.GTK_FILE_CHOOSER_ACTION_SAVE : + OS.GTK_FILE_CHOOSER_ACTION_OPEN; +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); + if (display.getDismissalAlignment() == SWT.RIGHT) { + handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0); +@@ -415,10 +415,10 @@ + if (handle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_window_set_modal (handle, true); + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { +- int /*long*/ group = OS.gtk_window_get_group(0); ++ long /*int*/ group = OS.gtk_window_get_group(0); + OS.gtk_window_group_add_window (group, handle); + } +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); +@@ -435,7 +435,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +@@ -465,9 +465,9 @@ + byte [] titleBytes = Converter.wcsToMbcs (null, title, true); + handle = OS.gtk_file_selection_new (titleBytes); + if (parent != null) { +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + OS.gtk_window_set_transient_for (handle, shellHandle); +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); +@@ -484,7 +484,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +@@ -531,7 +531,7 @@ + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ long /*int*/ ptr = OS.realpath (buffer, null); + OS.gtk_file_chooser_set_current_folder (handle, ptr); + OS.g_free (ptr); + } +@@ -562,7 +562,7 @@ + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ long /*int*/ ptr = OS.realpath (buffer, null); + if (ptr != 0) { + if (fileName.length() > 0) { + OS.gtk_file_chooser_set_filename (handle, ptr); +@@ -584,10 +584,10 @@ + /* Set the extension filters */ + if (filterNames == null) filterNames = new String [0]; + if (filterExtensions == null) filterExtensions = new String [0]; +- int /*long*/ initialFilter = 0; ++ long /*int*/ initialFilter = 0; + for (int i = 0; i < filterExtensions.length; i++) { + if (filterExtensions [i] != null) { +- int /*long*/ filter = OS.gtk_file_filter_new (); ++ long /*int*/ filter = OS.gtk_file_filter_new (); + if (filterNames.length > i && filterNames [i] != null) { + byte [] name = Converter.wcsToMbcs (null, filterNames [i], true); + OS.gtk_file_filter_set_name (filter, name); +@@ -643,8 +643,8 @@ + int length = fullPath.length (); + char [] buffer = new char [length + 1]; + fullPath.getChars (0, length, buffer, 0); +- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null); +- int /*long*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null); ++ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null); ++ long /*int*/ fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null); + OS.gtk_file_selection_set_filename (handle, fileNamePtr); + OS.g_free (utf8Ptr); + OS.g_free (fileNamePtr); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/FontDialog.java swt-gtk-3.7//org/eclipse/swt/widgets/FontDialog.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/FontDialog.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/FontDialog.java 2011-06-13 20:53:32.000000000 +0000 +@@ -133,28 +133,28 @@ + * + */ + public FontData open () { +- int /*long*/ handle; ++ long /*int*/ handle; + byte [] titleBytes; + titleBytes = Converter.wcsToMbcs (null, title, true); + Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); + handle = OS.gtk_font_selection_dialog_new (titleBytes); + if (parent!=null) { +- int /*long*/ shellHandle = parent.topHandle (); ++ long /*int*/ shellHandle = parent.topHandle (); + OS.gtk_window_set_transient_for(handle, shellHandle); +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); + } + } + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { +- int /*long*/ group = OS.gtk_window_get_group(0); ++ long /*int*/ group = OS.gtk_window_get_group(0); + OS.gtk_window_group_add_window (group, handle); + } + OS.gtk_window_set_modal (handle, true); + if (fontData != null) { + Font font = new Font (display, fontData); +- int /*long*/ fontName = OS.pango_font_description_to_string (font.handle); ++ long /*int*/ fontName = OS.pango_font_description_to_string (font.handle); + int length = OS.strlen (fontName); + byte [] buffer = new byte [length + 1]; + OS.memmove (buffer, fontName, length); +@@ -169,7 +169,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +@@ -190,12 +190,12 @@ + } + boolean success = response == OS.GTK_RESPONSE_OK; + if (success) { +- int /*long*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle); ++ long /*int*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle); + int length = OS.strlen (fontName); + byte [] buffer = new byte [length + 1]; + OS.memmove (buffer, fontName, length); + OS.g_free (fontName); +- int /*long*/ fontDesc = OS.pango_font_description_from_string (buffer); ++ long /*int*/ fontDesc = OS.pango_font_description_from_string (buffer); + Font font = Font.gtk_new (display, fontDesc); + fontData = font.getFontData () [0]; + OS.pango_font_description_free (fontDesc); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Group.java swt-gtk-3.7//org/eclipse/swt/widgets/Group.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Group.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Group.java 2011-06-13 20:53:32.000000000 +0000 +@@ -41,7 +41,7 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Group extends Composite { +- int /*long*/ clientHandle, labelHandle; ++ long /*int*/ clientHandle, labelHandle; + String text = ""; + + /** +@@ -96,7 +96,7 @@ + if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); + } + +-int /*long*/ clientHandle () { ++long /*int*/ clientHandle () { + return clientHandle; + } + +@@ -157,7 +157,7 @@ + OS.gtk_widget_set_sensitive (labelHandle, enabled); + } + +-int /*long*/ eventHandle () { ++long /*int*/ eventHandle () { + return fixedHandle; + } + +@@ -201,7 +201,7 @@ + return mnemonicMatch (labelHandle, key); + } + +-int /*long*/ parentingHandle() { ++long /*int*/ parentingHandle() { + return fixedHandle; + } + +@@ -227,7 +227,7 @@ + setBackgroundColor(fixedHandle, color); + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + OS.gtk_widget_modify_font (labelHandle, font); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ImageList.java swt-gtk-3.7//org/eclipse/swt/widgets/ImageList.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ImageList.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ImageList.java 2011-06-13 20:53:32.000000000 +0000 +@@ -15,13 +15,13 @@ + import org.eclipse.swt.graphics.*; + + class ImageList { +- int /*long*/ [] pixbufs; ++ long /*int*/ [] pixbufs; + int width = -1, height = -1; + Image [] images; + + public ImageList() { + images = new Image [4]; +- pixbufs = new int /*long*/ [4]; ++ pixbufs = new long /*int*/ [4]; + } + + public int add (Image image) { +@@ -41,7 +41,7 @@ + Image [] newImages = new Image [images.length + 4]; + System.arraycopy (images, 0, newImages, 0, images.length); + images = newImages; +- int /*long*/ [] newPixbufs = new int /*long*/ [pixbufs.length + 4]; ++ long /*int*/ [] newPixbufs = new long /*int*/ [pixbufs.length + 4]; + System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length); + pixbufs = newPixbufs; + } +@@ -62,7 +62,7 @@ + return images [index]; + } + +-int /*long*/ getPixbuf (int index) { ++long /*int*/ getPixbuf (int index) { + return pixbufs [index]; + } + +@@ -74,7 +74,7 @@ + return -1; + } + +-int indexOf (int /*long*/ pixbuf) { ++int indexOf (long /*int*/ pixbuf) { + if (pixbuf == 0) return -1; + for (int index=0; index= count && end >= count) return; + start = Math.min (count - 1, Math.max (0, start)); + end = Math.min (count - 1, Math.max (0, end)); +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int index=start; index<=end; index++) { + OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); +@@ -338,9 +338,9 @@ + public void deselect (int [] indices) { + checkWidget(); + if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int i=0; i=start; index--) { + OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); +@@ -1048,8 +1048,8 @@ + if (!(0 <= start && start <= end && end < count)) { + error (SWT.ERROR_INVALID_RANGE); + } +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + int last = -1; + for (int i=0; i= count) return; + start = Math.max (0, start); + end = Math.min (end, count - 1); +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int index=start; index<=end; index++) { + OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); + OS.gtk_tree_selection_select_iter (selection, iter); + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_set_cursor (handle, path, 0, false); + OS.gtk_tree_path_free (path); + } +@@ -1206,9 +1206,9 @@ + if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); + int length = indices.length; + if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int i=0; i= OS.VERSION (2, 10, 0))) { + /* + * Popup-menu to the status icon should be aligned to +@@ -240,7 +240,7 @@ + } + } + +-void addAccelerators (int /*long*/ accelGroup) { ++void addAccelerators (long /*int*/ accelGroup) { + MenuItem [] items = getItems (); + for (int i = 0; i < items.length; i++) { + MenuItem item = items[i]; +@@ -306,7 +306,7 @@ + if ((style & SWT.BAR) != 0) { + handle = OS.gtk_menu_bar_new (); + if (handle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ vboxHandle = parent.vboxHandle; ++ long /*int*/ vboxHandle = parent.vboxHandle; + OS.gtk_container_add (vboxHandle, handle); + OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START); + } else { +@@ -315,9 +315,9 @@ + } + } + +-void createIMMenu (int /*long*/ imHandle) { ++void createIMMenu (long /*int*/ imHandle) { + boolean showInputMethod = false; +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + if (settings != 0) { + int [] buffer = new int [1]; + OS.g_object_get (settings, OS.gtk_show_input_method_menu, buffer, 0); +@@ -349,7 +349,7 @@ + OS.gtk_widget_show (imItem); + OS.gtk_menu_shell_insert (handle, imItem, -1); + } +- int /*long*/ imSubmenu = OS.gtk_menu_new (); ++ long /*int*/ imSubmenu = OS.gtk_menu_new (); + OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu); + OS.gtk_menu_item_set_submenu (imItem, imSubmenu); + } +@@ -375,7 +375,7 @@ + if (!OS.GTK_WIDGET_MAPPED (handle)) { + return new Rectangle (0, 0, 0, 0); + } +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + int x = origin_x [0] + OS.GTK_WIDGET_X (handle); +@@ -439,13 +439,13 @@ + */ + public MenuItem getItem (int index) { + checkWidget(); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM); + int count = OS.g_list_length (list); + if (imSeparator != 0) count--; + if (imItem != 0) count--; + if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); +- int /*long*/ data = OS.g_list_nth_data (list, index); ++ long /*int*/ data = OS.g_list_nth_data (list, index); + OS.g_list_free (list); + if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM); + return (MenuItem) display.getWidget (data); +@@ -463,7 +463,7 @@ + */ + public int getItemCount () { + checkWidget(); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return 0; + int count = OS.g_list_length (list); + OS.g_list_free (list); +@@ -490,7 +490,7 @@ + */ + public MenuItem [] getItems () { + checkWidget(); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return new MenuItem [0]; + int count = OS.g_list_length (list); + if (imSeparator != 0) count--; +@@ -498,7 +498,7 @@ + MenuItem [] items = new MenuItem [count]; + int index = 0; + for (int i=0; i + */ + public int open () { +- int /*long*/ parentHandle = (parent != null) ? parent.topHandle() : 0; ++ long /*int*/ parentHandle = (parent != null) ? parent.topHandle() : 0; + int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT; + if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) { + dialogFlags |= OS.GTK_DIALOG_MODAL; +@@ -154,7 +154,7 @@ + handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer); + if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); + if (parentHandle != 0) { +- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle); ++ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle); + if (pixbufs != 0) { + OS.gtk_window_set_icon_list (handle, pixbufs); + OS.g_list_free (pixbufs); +@@ -172,7 +172,7 @@ + * dialog to the same window group as of the shells. + */ + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { +- int /*long*/ group = OS.gtk_window_get_group(0); ++ long /*int*/ group = OS.gtk_window_get_group(0); + OS.gtk_window_group_add_window (group, handle); + } + +@@ -181,7 +181,7 @@ + display.setModalDialog (this); + } + int signalId = 0; +- int /*long*/ hookId = 0; ++ long /*int*/ hookId = 0; + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); + hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Monitor.java swt-gtk-3.7//org/eclipse/swt/widgets/Monitor.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Monitor.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Monitor.java 2011-06-13 20:53:32.000000000 +0000 +@@ -22,7 +22,7 @@ + * @since 3.0 + */ + public final class Monitor { +- int /*long*/ handle; ++ long /*int*/ handle; + int x, y, width, height; + int clientX, clientY, clientWidth, clientHeight; + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ProgressBar.java swt-gtk-3.7//org/eclipse/swt/widgets/ProgressBar.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ProgressBar.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ProgressBar.java 2011-06-13 20:53:32.000000000 +0000 +@@ -161,8 +161,8 @@ + return SWT.NORMAL; + } + +-int /*long*/ gtk_realize (int /*long*/ widget) { +- int /*long*/ result = super.gtk_realize (widget); ++long /*int*/ gtk_realize (long /*int*/ widget) { ++ long /*int*/ result = super.gtk_realize (widget); + if (result != 0) return result; + /* + * Bug in GTK. When a progress bar has been unrealized after being +@@ -271,7 +271,7 @@ + //NOT IMPLEMENTED + } + +-int /*long*/ timerProc (int /*long*/ widget) { ++long /*int*/ timerProc (long /*int*/ widget) { + if (isVisible ()) OS.gtk_progress_bar_pulse (handle); + return 1; + } +@@ -294,7 +294,7 @@ + * but unexpected. The fix is to force all + * outstanding redraws to be delivered. + */ +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + OS.gdk_window_process_updates (window, false); + OS.gdk_flush (); + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Sash.java swt-gtk-3.7//org/eclipse/swt/widgets/Sash.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Sash.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Sash.java 2011-06-13 20:53:32.000000000 +0000 +@@ -40,7 +40,7 @@ + public class Sash extends Control { + boolean dragging; + int startX, startY, lastX, lastY; +- int /*long*/ defaultCursor; ++ long /*int*/ defaultCursor; + + private final static int INCREMENT = 1; + private final static int PAGE_INCREMENT = 9; +@@ -144,12 +144,12 @@ + + void drawBand (int x, int y, int width, int height) { + if ((style & SWT.SMOOTH) != 0) return; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parent.paintHandle()); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parent.paintHandle()); + if (window == 0) return; + byte [] bits = {-86, 85, -86, 85, -86, 85, -86, 85}; +- int /*long*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8); +- int /*long*/ gc = OS.gdk_gc_new (window); +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8); ++ long /*int*/ gc = OS.gdk_gc_new (window); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + GdkColor color = new GdkColor (); + OS.gdk_color_white (colormap, color); + OS.gdk_gc_set_foreground (gc, color); +@@ -162,8 +162,8 @@ + OS.g_object_unref (gc); + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr); + if (result != 0) return result; + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof); +@@ -171,7 +171,7 @@ + if (button != 1) return 0; + if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0; + if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (widget); + int [] origin_x = new int [1], origin_y = new int [1]; + OS.gdk_window_get_origin (window, origin_x, origin_y); + startX = (int) (gdkEvent.x_root - origin_x [0]); +@@ -209,8 +209,8 @@ + return result; + } + +-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_button_release_event (widget, eventPtr); ++long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_button_release_event (widget, eventPtr); + if (result != 0) return result; + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof); +@@ -239,8 +239,8 @@ + return result; + } + +-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_focus_in_event (widget, event); ++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_focus_in_event (widget, event); + if (result != 0) return result; + // widget could be disposed at this point + if (handle != 0) { +@@ -250,8 +250,8 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); + if (result != 0) return result; + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +@@ -286,9 +286,9 @@ + if (newX == lastX && newY == lastY) return result; + + /* Ensure that the pointer image does not change */ +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + int grabMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK; +- int /*long*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor; ++ long /*int*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor; + int ptrGrabResult = OS.gdk_pointer_grab (window, false, grabMask, window, gdkCursor, OS.GDK_CURRENT_TIME); + + /* The event must be sent because its doit flag is used. */ +@@ -325,8 +325,8 @@ + return result; + } + +-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_motion_notify_event (widget, eventPtr); ++long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_motion_notify_event (widget, eventPtr); + if (result != 0) return result; + if (!dragging) return 0; + GdkEventMotion gdkEvent = new GdkEventMotion (); +@@ -388,7 +388,7 @@ + return result; + } + +-int /*long*/ gtk_realize (int /*long*/ widget) { ++long /*int*/ gtk_realize (long /*int*/ widget) { + setCursor (cursor != null ? cursor.handle : 0); + return super.gtk_realize (widget); + } +@@ -429,7 +429,7 @@ + eventTable.unhook (SWT.DefaultSelection,listener); + } + +-void setCursor (int /*long*/ cursor) { ++void setCursor (long /*int*/ cursor) { + super.setCursor (cursor != 0 ? cursor : defaultCursor); + } + +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Scale.java swt-gtk-3.7//org/eclipse/swt/widgets/Scale.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Scale.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Scale.java 2011-06-13 20:53:32.000000000 +0000 +@@ -126,7 +126,7 @@ + fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (fixedHandle, true); +- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0); ++ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0); + if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES); + if ((style & SWT.HORIZONTAL) != 0) { + handle = OS.gtk_hscale_new (hAdjustment); +@@ -158,7 +158,7 @@ + */ + public int getIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.step_increment; +@@ -176,7 +176,7 @@ + */ + public int getMaximum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.upper; +@@ -194,7 +194,7 @@ + */ + public int getMinimum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.lower; +@@ -214,7 +214,7 @@ + */ + public int getPageIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.page_increment; +@@ -232,13 +232,13 @@ + */ + public int getSelection () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.value; + } + +-int /*long*/ gtk_value_changed (int /*long*/ adjustment) { ++long /*int*/ gtk_value_changed (long /*int*/ adjustment) { + sendSelectionEvent (SWT.Selection); + return 0; + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Scrollable.java swt-gtk-3.7//org/eclipse/swt/widgets/Scrollable.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Scrollable.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Scrollable.java 2011-06-13 20:53:32.000000000 +0000 +@@ -33,7 +33,7 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public abstract class Scrollable extends Control { +- int /*long*/ scrolledHandle; ++ long /*int*/ scrolledHandle; + ScrollBar horizontalBar, verticalBar; + + /** +@@ -74,7 +74,7 @@ + super (parent, style); + } + +-int /*long*/ clientHandle () { ++long /*int*/ clientHandle () { + return handle; + } + +@@ -116,7 +116,7 @@ + trimWidth += vScrollBarWidth (); + if (scrolledHandle != 0) { + if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) { +- int /*long*/ style = OS.gtk_widget_get_style (scrolledHandle); ++ long /*int*/ style = OS.gtk_widget_get_style (scrolledHandle); + int xthickness = OS.gtk_style_get_xthickness (style); + int ythickness = OS.gtk_style_get_ythickness (style); + trimX -= xthickness; +@@ -195,7 +195,7 @@ + public Rectangle getClientArea () { + checkWidget (); + forceResize (); +- int /*long*/ clientHandle = clientHandle (); ++ long /*int*/ clientHandle = clientHandle (); + int x = OS.GTK_WIDGET_X (clientHandle); + int y = OS.GTK_WIDGET_Y (clientHandle); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle); +@@ -233,8 +233,8 @@ + return verticalBar; + } + +-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_scroll_event (widget, eventPtr); ++long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_scroll_event (widget, eventPtr); + + /* + * Feature in GTK. Scrolled windows do not scroll if the scrollbars +@@ -268,7 +268,7 @@ + + int hScrollBarWidth() { + if (horizontalBar==null) return 0; +- int /*long*/ hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle); ++ long /*int*/ hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle); + if (hBarHandle==0) return 0; + GtkRequisition requisition = new GtkRequisition(); + OS.gtk_widget_size_request(hBarHandle, requisition); +@@ -321,9 +321,9 @@ + super.redrawWidget (x, y, width, height, redrawAll, all, trim); + if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return; + if (!trim) return; +- int /*long*/ topHandle = topHandle (), paintHandle = paintHandle (); ++ long /*int*/ topHandle = topHandle (), paintHandle = paintHandle (); + if (topHandle == paintHandle) return; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle); + GdkRectangle rect = new GdkRectangle (); + if (redrawAll) { + rect.width = OS.GTK_WIDGET_WIDTH (topHandle); +@@ -371,7 +371,7 @@ + if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle); + } + +-int /*long*/ topHandle () { ++long /*int*/ topHandle () { + if (fixedHandle != 0) return fixedHandle; + if (scrolledHandle != 0) return scrolledHandle; + return super.topHandle (); +@@ -383,7 +383,7 @@ + + int vScrollBarWidth() { + if (verticalBar == null) return 0; +- int /*long*/ vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle); ++ long /*int*/ vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle); + if (vBarHandle == 0) return 0; + GtkRequisition requisition = new GtkRequisition(); + OS.gtk_widget_size_request (vBarHandle, requisition); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ScrollBar.java swt-gtk-3.7//org/eclipse/swt/widgets/ScrollBar.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ScrollBar.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ScrollBar.java 2011-06-13 20:53:32.000000000 +0000 +@@ -84,7 +84,7 @@ + */ + public class ScrollBar extends Widget { + Scrollable parent; +- int /*long*/ adjustmentHandle; ++ long /*int*/ adjustmentHandle; + int detail; + boolean dragSent; + +@@ -355,7 +355,7 @@ + } + Rectangle rect = new Rectangle(x, y, width, height); + int [] origin_x = new int [1], origin_y = new int [1]; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parent.scrolledHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parent.scrolledHandle); + if (window != 0) OS.gdk_window_get_origin (window, origin_x, origin_y); + rect.x += origin_x [0]; + rect.y += origin_y [0]; +@@ -416,7 +416,7 @@ + } + Rectangle rect = new Rectangle(x, y, width, height); + int [] origin_x = new int [1], origin_y = new int [1]; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parent.scrolledHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parent.scrolledHandle); + if (window != 0) OS.gdk_window_get_origin (window, origin_x, origin_y); + rect.x += origin_x [0]; + rect.y += origin_y [0]; +@@ -446,7 +446,7 @@ + */ + public boolean getVisible () { + checkWidget (); +- int /*long*/ scrolledHandle = parent.scrolledHandle; ++ long /*int*/ scrolledHandle = parent.scrolledHandle; + int [] hsp = new int [1], vsp = new int [1]; + OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp); + if ((style & SWT.HORIZONTAL) != 0) { +@@ -456,20 +456,20 @@ + } + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr); + if (result != 0) return result; + detail = OS.GTK_SCROLL_NONE; + dragSent = false; + return result; + } + +-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) { ++long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) { + detail = (int)/*64*/scroll; + return 0; + } + +-int /*long*/ gtk_value_changed (int /*long*/ adjustment) { ++long /*int*/ gtk_value_changed (long /*int*/ adjustment) { + Event event = new Event (); + dragSent = detail == OS.GTK_SCROLL_JUMP; + switch (detail) { +@@ -496,7 +496,7 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + GdkEvent gtkEvent = new GdkEvent (); + OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof); + switch (gtkEvent.type) { +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Shell.java swt-gtk-3.7//org/eclipse/swt/widgets/Shell.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Shell.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Shell.java 2011-06-13 20:53:32.000000000 +0000 +@@ -118,7 +118,7 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Shell extends Decorations { +- int /*long*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup; ++ long /*int*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup; + boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center; + int oldX, oldY, oldWidth, oldHeight; + int minWidth, minHeight; +@@ -254,7 +254,7 @@ + this (display, null, style, 0, false); + } + +-Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean embedded) { ++Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) { + super (); + checkSubclass (); + if (display == null) display = Display.getCurrent (); +@@ -359,7 +359,7 @@ + this (parent != null ? parent.display : null, parent, style, 0, false); + } + +-public static Shell gtk_new (Display display, int /*long*/ handle) { ++public static Shell gtk_new (Display display, long /*int*/ handle) { + return new Shell (display, null, SWT.NO_TRIM, handle, true); + } + +@@ -382,7 +382,7 @@ + * + * @since 3.3 + */ +-public static Shell internal_new (Display display, int /*long*/ handle) { ++public static Shell internal_new (Display display, long /*int*/ handle) { + return new Shell (display, null, SWT.NO_TRIM, handle, false); + } + +@@ -453,7 +453,7 @@ + if (display.ignoreTrim) return; + int width = OS.GTK_WIDGET_WIDTH (shellHandle); + int height = OS.GTK_WIDGET_HEIGHT (shellHandle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + GdkRectangle rect = new GdkRectangle (); + OS.gdk_window_get_frame_extents (window, rect); + int trimWidth = Math.max (0, rect.width - width); +@@ -508,7 +508,7 @@ + if (!force) { + if (activeShell == null) return; + if (!display.activePending) { +- int /*long*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle); ++ long /*int*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle); + if (focusHandle != 0 && !OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return; + } + } +@@ -536,10 +536,10 @@ + * window. The fix is to use XSetInputFocus() to force + * the focus. + */ +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) { +- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); +- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window); ++ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); ++ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window); + OS.gdk_error_trap_push (); + /* Use CurrentTime instead of the last event time to ensure that the shell becomes active */ + OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime); +@@ -589,7 +589,7 @@ + if (!opened) resized = false; + } + +-int /*long*/ childStyle () { ++long /*int*/ childStyle () { + return 0; + } + +@@ -693,7 +693,7 @@ + } else { + vboxHandle = OS.gtk_bin_get_child (shellHandle); + if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ children = OS.gtk_container_get_children (vboxHandle); ++ long /*int*/ children = OS.gtk_container_get_children (vboxHandle); + if (OS.g_list_length (children) > 0) { + scrolledHandle = OS.g_list_data (children); + } +@@ -713,7 +713,7 @@ + OS.gtk_widget_realize (shellHandle); + } + +-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) { ++long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) { + int eventType = OS.X_EVENT_TYPE (xEvent); + if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0; + XFocusChangeEvent xFocusEvent = new XFocusChangeEvent(); +@@ -806,7 +806,7 @@ + OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false); + OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false); + OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.closures [MOVE_FOCUS], false); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + OS.gdk_window_add_filter (window, display.filterProc, shellHandle); + if (isCustomResize ()) { + int mask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK; +@@ -847,7 +847,7 @@ + /* Do nothing */ + } + +-int /*long*/ topHandle () { ++long /*int*/ topHandle () { + return shellHandle; + } + +@@ -878,15 +878,15 @@ + } + } + +-int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) { ++long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) { + int clientWidth = 0; + if ((style & SWT.MIRRORED) != 0) clientWidth = getClientWidth (); +- int /*long*/ result = super.fixedSizeAllocateProc (widget, allocationPtr); ++ long /*int*/ result = super.fixedSizeAllocateProc (widget, allocationPtr); + if ((style & SWT.MIRRORED) != 0) moveChildren (clientWidth); + return result; + } + +-void fixStyle (int /*long*/ handle) { ++void fixStyle (long /*int*/ handle) { + } + + void forceResize () { +@@ -1148,7 +1148,7 @@ + return result; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + if (widget == shellHandle) { + if (isCustomResize ()) { + if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) { +@@ -1172,7 +1172,7 @@ + return super.gtk_button_press_event (widget, event); + } + +-int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) { + int [] x = new int [1], y = new int [1]; + OS.gtk_window_get_position (shellHandle, x, y); + if (!moved || oldX != x [0] || oldY != y [0]) { +@@ -1185,25 +1185,25 @@ + return 0; + } + +-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) { + if (isEnabled()) closeWidget (); + return 1; + } + +-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { + if (widget != shellHandle) { + return super.gtk_enter_notify_event (widget, event); + } + return 0; + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) { + if (widget == shellHandle) { + if (isCustomResize ()) { + GdkEventExpose gdkEventExpose = new GdkEventExpose (); + OS.memmove (gdkEventExpose, event, GdkEventExpose.sizeof); +- int /*long*/ style = OS.gtk_widget_get_style (widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (widget); ++ long /*int*/ style = OS.gtk_widget_get_style (widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (widget); + int [] width = new int [1]; + int [] height = new int [1]; + OS.gdk_drawable_get_size (window, width, height); +@@ -1227,7 +1227,7 @@ + return super.gtk_expose_event (widget, event); + } + +-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) { ++long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { + switch ((int)/*64*/directionType) { + case OS.GTK_DIR_TAB_FORWARD: + case OS.GTK_DIR_TAB_BACKWARD: +@@ -1244,13 +1244,13 @@ + return super.gtk_focus (widget, directionType); + } + +-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { + if (widget == shellHandle) { + if (isCustomResize ()) { + GdkEventCrossing gdkEvent = new GdkEventCrossing (); + OS.memmove (gdkEvent, event, GdkEventCrossing.sizeof); + if ((gdkEvent.state & OS.GDK_BUTTON1_MASK) == 0) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + OS.gdk_window_set_cursor (window, 0); + display.resizeMode = 0; + } +@@ -1260,17 +1260,17 @@ + return super.gtk_leave_notify_event (widget, event); + } + +-int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ directionType) { ++long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) { + Control control = display.getFocusControl (); + if (control != null) { +- int /*long*/ focusHandle = control.focusHandle (); ++ long /*int*/ focusHandle = control.focusHandle (); + OS.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType); + } + OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus); + return 1; + } + +-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { + if (widget == shellHandle) { + if (isCustomResize ()) { + GdkEventMotion gdkEvent = new GdkEventMotion (); +@@ -1329,8 +1329,8 @@ + } else { + int mode = getResizeMode (gdkEvent.x, gdkEvent.y); + if (mode != display.resizeMode) { +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); +- int /*long*/ cursor = OS.gdk_cursor_new (mode); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ cursor = OS.gdk_cursor_new (mode); + OS.gdk_window_set_cursor (window, cursor); + OS.gdk_cursor_destroy (cursor); + display.resizeMode = mode; +@@ -1342,7 +1342,7 @@ + return super.gtk_motion_notify_event (widget, event); + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { + if (widget == shellHandle) { + /* Stop menu mnemonics when the shell is disabled */ + if ((state & DISABLED) != 0) return 1; +@@ -1350,8 +1350,8 @@ + if (menuBar != null && !menuBar.isDisposed ()) { + Control focusControl = display.getFocusControl (); + if (focusControl != null && (focusControl.hooks (SWT.KeyDown) || focusControl.filters (SWT.KeyDown))) { +- int /*long*/ [] accel = new int /*long*/ [1]; +- int /*long*/ setting = OS.gtk_settings_get_default (); ++ long /*int*/ [] accel = new long /*int*/ [1]; ++ long /*int*/ setting = OS.gtk_settings_get_default (); + OS.g_object_get (setting, OS.gtk_menu_bar_accel, accel, 0); + if (accel [0] != 0) { + int [] keyval = new int [1]; +@@ -1374,7 +1374,7 @@ + return super.gtk_key_press_event (widget, event); + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { + int width = OS.GTK_WIDGET_WIDTH (shellHandle); + int height = OS.GTK_WIDGET_HEIGHT (shellHandle); + if (!resized || oldWidth != width || oldHeight != height) { +@@ -1385,9 +1385,9 @@ + return 0; + } + +-int /*long*/ gtk_realize (int /*long*/ widget) { +- int /*long*/ result = super.gtk_realize (widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++long /*int*/ gtk_realize (long /*int*/ widget) { ++ long /*int*/ result = super.gtk_realize (widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) { + int decorations = 0; + if ((style & SWT.NO_TRIM) == 0) { +@@ -1413,7 +1413,7 @@ + return result; + } + +-int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) { + GdkEventWindowState gdkEvent = new GdkEventWindowState (); + OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof); + minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0; +@@ -1681,13 +1681,13 @@ + return result; + } + +-void setCursor (int /*long*/ cursor) { ++void setCursor (long /*int*/ cursor) { + if (enableWindow != 0) { + OS.gdk_window_set_cursor (enableWindow, cursor); + if (!OS.GDK_WINDOWING_X11 ()) { + OS.gdk_flush (); + } else { +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); + OS.XFlush (xDisplay); + } + } +@@ -1720,9 +1720,9 @@ + enableWindow = 0; + } + } else { +- int /*long*/ parentHandle = shellHandle; ++ long /*int*/ parentHandle = shellHandle; + OS.gtk_widget_realize (parentHandle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (parentHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (parentHandle); + Rectangle rect = getBounds (); + GdkWindowAttr attributes = new GdkWindowAttr (); + attributes.width = rect.width; +@@ -1737,7 +1737,7 @@ + if (!OS.GDK_WINDOWING_X11 ()) { + OS.gdk_flush (); + } else { +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); + OS.XFlush (xDisplay); + } + } +@@ -1811,7 +1811,7 @@ + if ((state & FOREIGN_HANDLE) != 0) return; + int width = OS.gdk_screen_width () * 5 / 8; + int height = OS.gdk_screen_height () * 5 / 8; +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { + if (OS.gdk_screen_get_n_monitors (screen) > 1) { + int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ()); +@@ -1846,13 +1846,13 @@ + if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT); + } + if (menuBar != null) { +- int /*long*/ menuHandle = menuBar.handle; ++ long /*int*/ menuHandle = menuBar.handle; + OS.gtk_widget_hide (menuHandle); + destroyAccelGroup (); + } + menuBar = menu; + if (menuBar != null) { +- int /*long*/ menuHandle = menu.handle; ++ long /*int*/ menuHandle = menu.handle; + OS.gtk_widget_show (menuHandle); + createAccelGroup (); + menuBar.addAccelerators (accelGroup); +@@ -2105,7 +2105,7 @@ + if (mapped) setZOrder (sibling, above, false, false); + } + +-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + mapped = true; + display.dispatchEvents = null; + return 0; +@@ -2130,12 +2130,12 @@ + if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle); + } + +-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + int offset = 16; + int [] x = new int [1], y = new int [1]; + OS.gdk_window_get_pointer (0, x, y, null); + y [0] += offset; +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { + int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]); + GdkRectangle dest = new GdkRectangle (); +@@ -2153,7 +2153,7 @@ + return 0; + } + +-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) { ++long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + OS.gtk_widget_hide (handle); + return 0; + } +@@ -2200,7 +2200,7 @@ + + void updateModal () { + if (OS.GTK_IS_PLUG (shellHandle)) return; +- int /*long*/ group = 0; ++ long /*int*/ group = 0; + boolean isModalShell = false; + if (display.getModalDialog () == null) { + Shell modal = getModalShell (); +@@ -2379,16 +2379,16 @@ + tooltipsHandle = 0; + if (group != 0) OS.g_object_unref (group); + group = modalGroup = 0; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle); + OS.gdk_window_remove_filter(window, display.filterProc, shellHandle); + lastActive = null; + } + +-void setToolTipText (int /*long*/ tipWidget, String string) { ++void setToolTipText (long /*int*/ tipWidget, String string) { + setToolTipText (tipWidget, tipWidget, string); + } + +-void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String string) { ++void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String string) { + if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) { + byte [] buffer = null; + if (string != null && string.length () > 0) { +@@ -2404,12 +2404,12 @@ + * 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which + * contain the proper x and y coordinates. + */ +- int /*long*/ eventPtr = 0; +- int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget); ++ long /*int*/ eventPtr = 0; ++ long /*int*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget); + if (tipWindow != 0) { + int [] x = new int [1], y = new int [1]; +- int /*long*/ window = OS.gdk_window_at_pointer (x, y); +- int /*long*/ [] user_data = new int /*long*/ [1]; ++ long /*int*/ window = OS.gdk_window_at_pointer (x, y); ++ long /*int*/ [] user_data = new long /*int*/ [1]; + if (window != 0) OS.gdk_window_get_user_data (window, user_data); + if (tipWidget == user_data [0]) { + eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY); +@@ -2455,7 +2455,7 @@ + if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) { + OS.gtk_tooltips_force_window (tooltipsHandle); + } +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle); + if (tipWindow != 0 && tipWindow != tooltipWindow) { + OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle); + tooltipWindow = tipWindow; +@@ -2471,9 +2471,9 @@ + if (tipWindow != 0) { + if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) { + int [] x = new int [1], y = new int [1]; +- int /*long*/ window = OS.gdk_window_at_pointer (x, y); ++ long /*int*/ window = OS.gdk_window_at_pointer (x, y); + if (window != 0) { +- int /*long*/ [] user_data = new int /*long*/ [1]; ++ long /*int*/ [] user_data = new long /*int*/ [1]; + OS.gdk_window_get_user_data (window, user_data); + if (tipWidget == user_data [0]) { + /* +@@ -2487,7 +2487,7 @@ + int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle); + OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null); + OS.gtk_widget_hide (tipWindow); +- int /*long*/ data = OS.gtk_tooltips_data_get (tipWidget); ++ long /*int*/ data = OS.gtk_tooltips_data_get (tipWidget); + OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data); + OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null); + if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Slider.java swt-gtk-3.7//org/eclipse/swt/widgets/Slider.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Slider.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Slider.java 2011-06-13 20:53:32.000000000 +0000 +@@ -153,7 +153,7 @@ + fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (fixedHandle, true); +- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); + if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES); + if ((style & SWT.HORIZONTAL) != 0) { + handle = OS.gtk_hscrollbar_new (hAdjustment); +@@ -175,20 +175,20 @@ + OS.gtk_container_add (fixedHandle, handle); + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr); + if (result != 0) return result; + detail = OS.GTK_SCROLL_NONE; + dragSent = false; + return result; + } + +-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) { ++long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) { + detail = (int)/*64*/scroll; + return 0; + } + +-int /*long*/ gtk_value_changed (int /*long*/ adjustment) { ++long /*int*/ gtk_value_changed (long /*int*/ adjustment) { + Event event = new Event (); + dragSent = detail == OS.GTK_SCROLL_JUMP; + switch (detail) { +@@ -214,7 +214,7 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + GdkEvent gtkEvent = new GdkEvent (); + OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof); + switch (gtkEvent.type) { +@@ -247,13 +247,13 @@ + + void register () { + super.register (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + display.addWidget (hAdjustment, this); + } + + void deregister () { + super.deregister (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + display.removeWidget (hAdjustment); + } + +@@ -284,7 +284,7 @@ + */ + public int getIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.step_increment; +@@ -302,7 +302,7 @@ + */ + public int getMaximum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.upper; +@@ -320,7 +320,7 @@ + */ + public int getMinimum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.lower; +@@ -340,7 +340,7 @@ + */ + public int getPageIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.page_increment; +@@ -358,7 +358,7 @@ + */ + public int getSelection () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.value; +@@ -376,7 +376,7 @@ + */ + public int getThumb () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + return (int) adjustment.page_size; +@@ -443,7 +443,7 @@ + */ + public void setMaximum (int value) { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int minimum = (int) adjustment.lower; +@@ -473,7 +473,7 @@ + public void setMinimum (int value) { + checkWidget (); + if (value < 0) return; +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int maximum = (int) adjustment.upper; +@@ -556,7 +556,7 @@ + public void setThumb (int value) { + checkWidget (); + if (value < 1) return; +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower)); +@@ -597,7 +597,7 @@ + if (increment < 1) return; + if (pageIncrement < 1) return; + thumb = Math.min (thumb, maximum - minimum); +- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Spinner.java swt-gtk-3.7//org/eclipse/swt/widgets/Spinner.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Spinner.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Spinner.java 2011-06-13 20:53:32.000000000 +0000 +@@ -45,7 +45,7 @@ + public class Spinner extends Composite { + static final int MIN_ARROW_WIDTH = 6; + int lastEventTime = 0; +- int /*long*/ gdkEventKey = 0; ++ long /*int*/ gdkEventKey = 0; + int fixStart = -1, fixEnd = -1; + double climbRate = 1; + +@@ -203,8 +203,8 @@ + if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0; + int[] w = new int [1], h = new int [1]; + OS.gtk_widget_realize (handle); +- int /*long*/ layout = OS.gtk_entry_get_layout (handle); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ layout = OS.gtk_entry_get_layout (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -222,7 +222,7 @@ + string = buffer.toString (); + } + byte [] buffer1 = Converter.wcsToMbcs (null, string, false); +- int /*long*/ ptr = OS.pango_layout_get_text (layout); ++ long /*int*/ ptr = OS.pango_layout_get_text (layout); + int length = OS.strlen (ptr); + byte [] buffer2 = new byte [length]; + OS.memmove (buffer2, ptr, length); +@@ -240,7 +240,7 @@ + public Rectangle computeTrim (int x, int y, int width, int height) { + checkWidget (); + int xborder = 0, yborder = 0; +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + if ((this.style & SWT.BORDER) != 0) { + xborder += OS.gtk_style_get_xthickness (style); + yborder += OS.gtk_style_get_ythickness (style); +@@ -252,7 +252,7 @@ + xborder += property [0]; + yborder += property [0]; + } +- int /*long*/ fontDesc = OS.gtk_style_get_font_desc (style); ++ long /*int*/ fontDesc = OS.gtk_style_get_font_desc (style); + int fontSize = OS.pango_font_description_get_size (fontDesc); + int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH); + arrowSize = arrowSize - arrowSize % 2; +@@ -291,7 +291,7 @@ + fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_fixed_set_has_window (fixedHandle, true); +- int /*long*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0); ++ long /*int*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0); + if (adjustment == 0) error (SWT.ERROR_NO_HANDLES); + handle = OS.gtk_spin_button_new (adjustment, climbRate, 0); + if (handle == 0) error (SWT.ERROR_NO_HANDLES); +@@ -320,23 +320,23 @@ + + void deregister () { + super.deregister (); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) display.removeWidget (imContext); + } + +-int /*long*/ eventWindow () { ++long /*int*/ eventWindow () { + return paintWindow (); + } + +-int /*long*/ enterExitHandle () { ++long /*int*/ enterExitHandle () { + return fixedHandle; + } + +-boolean filterKey (int keyval, int /*long*/ event) { ++boolean filterKey (int keyval, long /*int*/ event) { + int time = OS.gdk_event_get_time (event); + if (time != lastEventTime) { + lastEventTime = time; +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + return OS.gtk_im_context_filter_keypress (imContext, event); + } +@@ -355,7 +355,7 @@ + * filter has to be called by SWT. + */ + if (gdkEventKey != 0 && gdkEventKey != -1) { +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + OS.gtk_im_context_filter_keypress (imContext, gdkEventKey); + gdkEventKey = -1; +@@ -371,7 +371,7 @@ + + public int getBorderWidth () { + checkWidget(); +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + if ((this.style & SWT.BORDER) != 0) { + return OS.gtk_style_get_xthickness (style); + } +@@ -395,7 +395,7 @@ + */ + public int getIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -416,7 +416,7 @@ + */ + public int getMaximum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -437,7 +437,7 @@ + */ + public int getMinimum () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -459,7 +459,7 @@ + */ + public int getPageIncrement () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -480,7 +480,7 @@ + */ + public int getSelection () { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int digits = OS.gtk_spin_button_get_digits (handle); +@@ -505,7 +505,7 @@ + */ + public String getText () { + checkWidget (); +- int /*long*/ str = OS.gtk_entry_get_text (handle); ++ long /*int*/ str = OS.gtk_entry_get_text (handle); + if (str == 0) return ""; + int length = OS.strlen (str); + byte [] buffer = new byte [length]; +@@ -552,26 +552,26 @@ + } + + String getDecimalSeparator () { +- int /*long*/ ptr = OS.localeconv_decimal_point (); ++ long /*int*/ ptr = OS.localeconv_decimal_point (); + int length = OS.strlen (ptr); + byte [] buffer = new byte [length]; + OS.memmove (buffer, ptr, length); + return new String (Converter.mbcsToWcs (null, buffer)); + } + +-int /*long*/ gtk_activate (int /*long*/ widget) { ++long /*int*/ gtk_activate (long /*int*/ widget) { + sendSelectionEvent (SWT.DefaultSelection); + return 0; + } + +-int /*long*/ gtk_changed (int /*long*/ widget) { +- int /*long*/ str = OS.gtk_entry_get_text (handle); ++long /*int*/ gtk_changed (long /*int*/ widget) { ++ long /*int*/ str = OS.gtk_entry_get_text (handle); + int length = OS.strlen (str); + if (length > 0) { +- int /*long*/ [] endptr = new int /*long*/ [1]; ++ long /*int*/ [] endptr = new long /*int*/ [1]; + double value = OS.g_strtod (str, endptr); + if (endptr [0] == str + length) { +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) { +@@ -588,7 +588,7 @@ + * is to post the modify event when the user is typing. + */ + boolean keyPress = false; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +@@ -607,7 +607,7 @@ + return 0; + } + +-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) { ++long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { + if (text == 0) return 0; + if (!OS.gtk_editable_get_editable (handle)) return 0; + int length = OS.strlen (text); +@@ -645,9 +645,9 @@ + return 0; + } + +-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) { ++long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); + int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); +@@ -670,17 +670,17 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + if (cursor != null) setCursor (cursor.handle); + return super.gtk_event_after (widget, gdkEvent); + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + fixIM (); + return super.gtk_focus_out_event (widget, event); + } + +-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) { ++long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { + // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; + if (new_text == 0 || new_text_length == 0) return 0; + byte [] buffer = new byte [(int)/*64*/new_text_length]; +@@ -688,7 +688,7 @@ + String oldText = new String (Converter.mbcsToWcs (null, buffer)); + int [] pos = new int [1]; + OS.memmove (pos, position, 4); +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); + int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]); + String newText = verifyText (oldText, start, start); +@@ -720,15 +720,15 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) fixIM (); + if (gdkEventKey == -1) result = 1; + gdkEventKey = 0; + return result; + } + +-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { ++long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL); + OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL); +@@ -736,7 +736,7 @@ + return 0; + } + +-int /*long*/ gtk_value_changed (int /*long*/ widget) { ++long /*int*/ gtk_value_changed (long /*int*/ widget) { + sendSelectionEvent (SWT.Selection); + return 0; + } +@@ -749,7 +749,7 @@ + OS.g_signal_connect_closure (handle, OS.value_changed, display.closures [VALUE_CHANGED], false); + OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false); + OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false); + int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ()); +@@ -758,13 +758,13 @@ + } + } + +-int /*long*/ imContext () { ++long /*int*/ imContext () { + return OS.GTK_ENTRY_IM_CONTEXT (handle); + } + +-int /*long*/ paintWindow () { +- int /*long*/ window = super.paintWindow (); +- int /*long*/ children = OS.gdk_window_get_children (window); ++long /*int*/ paintWindow () { ++ long /*int*/ window = super.paintWindow (); ++ long /*int*/ children = OS.gdk_window_get_children (window); + if (children != 0) window = OS.g_list_data (children); + OS.g_list_free (children); + return window; +@@ -789,7 +789,7 @@ + + void register () { + super.register (); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) display.addWidget (imContext, this); + } + +@@ -876,14 +876,14 @@ + OS.gtk_widget_modify_base (handle, 0, color); + } + +-void setCursor (int /*long*/ cursor) { +- int /*long*/ defaultCursor = 0; ++void setCursor (long /*int*/ cursor) { ++ long /*int*/ defaultCursor = 0; + if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM); + super.setCursor (cursor != 0 ? cursor : defaultCursor); + if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor); + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + } + +@@ -902,7 +902,7 @@ + public void setIncrement (int value) { + checkWidget (); + if (value < 1) return; +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + double newValue = value; +@@ -928,7 +928,7 @@ + */ + public void setMaximum (int value) { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + double newValue = value; +@@ -955,7 +955,7 @@ + */ + public void setMinimum (int value) { + checkWidget (); +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + double newValue = value; +@@ -982,7 +982,7 @@ + public void setPageIncrement (int value) { + checkWidget (); + if (value < 1) return; +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + double newValue = value; +@@ -1069,7 +1069,7 @@ + if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT); + int digits = OS.gtk_spin_button_get_digits (handle); + if (value == digits) return; +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + int diff = Math.abs (value - digits); +@@ -1139,7 +1139,7 @@ + * depending upon the value of digits. + */ + climbRate = 1.0 / factor; +- int /*long*/ adjustment = OS.gtk_spin_button_get_adjustment(handle); ++ long /*int*/ adjustment = OS.gtk_spin_button_get_adjustment(handle); + OS.gtk_spin_button_configure (handle, adjustment, climbRate, digits); + OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED); + } +@@ -1153,9 +1153,9 @@ + switch (key) { + case OS.GDK_KP_Enter: + case OS.GDK_Return: { +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { +- int /*long*/ [] preeditString = new int /*long*/ [1]; ++ long /*int*/ [] preeditString = new long /*int*/ [1]; + OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); + if (preeditString [0] != 0) { + int length = OS.strlen (preeditString [0]); +@@ -1174,7 +1174,7 @@ + event.text = string; + event.start = start; + event.end = end; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +@@ -1195,7 +1195,7 @@ + index = 0; + } + if (string.length () > 0) { +- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); ++ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle); + GtkAdjustment adjustment = new GtkAdjustment (); + OS.memmove (adjustment, hAdjustment); + if (adjustment.lower < 0 && string.charAt (0) == '-') index++; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/TabFolder.java swt-gtk-3.7//org/eclipse/swt/widgets/TabFolder.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/TabFolder.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/TabFolder.java 2011-06-13 20:53:32.000000000 +0000 +@@ -100,8 +100,8 @@ + if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); + } + +-int /*long*/ childStyle () { +- int /*long*/ rcStyle = OS.gtk_widget_get_modifier_style (handle); ++long /*int*/ childStyle () { ++ long /*int*/ rcStyle = OS.gtk_widget_get_modifier_style (handle); + if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0; + OS.gtk_widget_realize (handle); + return OS.gtk_widget_get_style (handle); +@@ -139,7 +139,7 @@ + addListener(SWT.DefaultSelection,typedListener); + } + +-int /*long*/ clientHandle () { ++long /*int*/ clientHandle () { + int index = OS.gtk_notebook_get_current_page (handle); + if (index != -1 && items [index] != null) { + return items [index].pageHandle; +@@ -164,7 +164,7 @@ + public Rectangle computeTrim (int x, int y, int width, int height) { + checkWidget(); + forceResize (); +- int /*long*/ clientHandle = clientHandle (); ++ long /*int*/ clientHandle = clientHandle (); + int clientX = OS.GTK_WIDGET_X (clientHandle); + int clientY = OS.GTK_WIDGET_Y (clientHandle); + x -= clientX; +@@ -201,7 +201,7 @@ + } + + void createItem (TabItem item, int index) { +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + int itemCount = 0; + if (list != 0) { + itemCount = OS.g_list_length (list); +@@ -213,15 +213,15 @@ + System.arraycopy (items, 0, newItems, 0, items.length); + items = newItems; + } +- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 0); ++ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 0); + if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); ++ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); + if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ imageHandle = OS.gtk_image_new (); ++ long /*int*/ imageHandle = OS.gtk_image_new (); + if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_container_add (boxHandle, imageHandle); + OS.gtk_container_add (boxHandle, labelHandle); +- int /*long*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); ++ long /*int*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); + if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE); + OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index); +@@ -283,7 +283,7 @@ + } + } + +-int /*long*/ eventHandle () { ++long /*int*/ eventHandle () { + return handle; + } + +@@ -305,7 +305,7 @@ + public TabItem getItem (int index) { + checkWidget(); + if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM); + int itemCount = OS.g_list_length (list); + OS.g_list_free (list); +@@ -334,7 +334,7 @@ + public TabItem getItem(Point point) { + checkWidget(); + if (point == null) error (SWT.ERROR_NULL_ARGUMENT); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return null; + int itemCount = OS.g_list_length (list); + OS.g_list_free (list); +@@ -358,7 +358,7 @@ + */ + public int getItemCount () { + checkWidget(); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return 0; + int itemCount = OS.g_list_length (list); + OS.g_list_free (list); +@@ -428,11 +428,11 @@ + return OS.gtk_notebook_get_current_page (handle); + } + +-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) { ++long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) { + return 0; + } + +-int /*long*/ gtk_switch_page (int /*long*/ widget, int /*long*/ page, int /*long*/ page_num) { ++long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) { + int index = OS.gtk_notebook_get_current_page (handle); + if (index != -1) { + Control control = items [index].getControl (); +@@ -477,7 +477,7 @@ + public int indexOf (TabItem item) { + checkWidget(); + if (item == null) error (SWT.ERROR_NULL_ARGUMENT); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return -1; + int count = OS.g_list_length (list); + OS.g_list_free (list); +@@ -494,7 +494,7 @@ + Control child = children [i]; + int index = 0; + int count = 0; +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list != 0) { + count = OS.g_list_length (list); + OS.g_list_free (list); +@@ -519,7 +519,7 @@ + boolean mnemonicHit (char key) { + int itemCount = getItemCount (); + for (int i=0; i index || index > count - 1) return _getBackground (); +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1); + if (ptr [0] == 0) return _getBackground (); +@@ -148,13 +148,13 @@ + } + + boolean _getChecked () { +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1); + return ptr [0] != 0; + } + + Color _getForeground () { +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1); + if (ptr [0] == 0) return parent.getForeground (); + GdkColor gdkColor = new GdkColor (); +@@ -165,7 +165,7 @@ + Color _getForeground (int index) { + int count = Math.max (1, parent.columnCount); + if (0 > index || index > count - 1) return _getForeground (); +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1); + if (ptr [0] == 0) return _getForeground (); +@@ -177,7 +177,7 @@ + Image _getImage (int index) { + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return null; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1); + if (ptr [0] == 0) return null; +@@ -190,7 +190,7 @@ + String _getText (int index) { + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return ""; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1); + if (ptr [0] == 0) return ""; +@@ -269,14 +269,14 @@ + // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem + checkWidget (); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + + boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; +@@ -357,15 +357,15 @@ + public Rectangle getBounds (int index) { + checkWidget(); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.columnCount) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + GdkRectangle rect = new GdkRectangle (); + OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); +@@ -549,18 +549,18 @@ + public Rectangle getImageBounds (int index) { + checkWidget (); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.columnCount) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + GdkRectangle rect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); + OS.gtk_tree_path_free (path); +@@ -675,19 +675,19 @@ + if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); + // TODO fully test on early and later versions of GTK + // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.columnCount) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + + boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; +@@ -735,12 +735,12 @@ + + void redraw () { + if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + GdkRectangle rect = new GdkRectangle (); + OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect); + OS.gtk_tree_path_free (path); +- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle); ++ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle); + rect.x = 0; + int [] w = new int [1], h = new int [1]; + OS.gdk_drawable_get_size (window, w, h); +@@ -845,16 +845,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -918,7 +918,7 @@ + if (oldFont == font) return; + this.font = font; + if (oldFont != null && oldFont.equals (font)) return; +- int /*long*/ fontHandle = font != null ? font.handle : 0; ++ long /*int*/ fontHandle = font != null ? font.handle : 0; + OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1); + /* + * Bug in GTK. When using fixed-height-mode, +@@ -969,7 +969,7 @@ + if (oldFont != null && oldFont.equals (font)) return; + + int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; +- int /*long*/ fontHandle = font != null ? font.handle : 0; ++ long /*int*/ fontHandle = font != null ? font.handle : 0; + OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1); + /* + * Bug in GTK. When using fixed-height-mode, +@@ -987,16 +987,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -1092,16 +1092,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -1134,7 +1134,7 @@ + * GTK+'s "inconsistent" state does not match SWT's concept of grayed. + * Render checked+grayed as "inconsistent", unchecked+grayed as blank. + */ +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1); + OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1); + cached = true; +@@ -1164,7 +1164,7 @@ + } + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return; +- int /*long*/ pixbuf = 0; ++ long /*int*/ pixbuf = 0; + if (image != null) { + ImageList imageList = parent.imageList; + if (imageList == null) imageList = parent.imageList = new ImageList (); +@@ -1192,10 +1192,10 @@ + if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) { + if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) { + if (image != null) { +- int /*long*/parentHandle = parent.handle; +- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index); ++ long /*int*/parentHandle = parent.handle; ++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index); + int [] w = new int [1]; +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column); + OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w); + if (w[0] < image.getBounds().width) { + /* +@@ -1203,7 +1203,7 @@ + * are relying on the fact that it is done as part of modifying + * the style. + */ +- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle); ++ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle); + parent.modifyStyle (parentHandle, style); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Table.java swt-gtk-3.7//org/eclipse/swt/widgets/Table.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Table.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Table.java 2011-06-13 20:53:32.000000000 +0000 +@@ -68,9 +68,9 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Table extends Composite { +- int /*long*/ modelHandle, checkRenderer; ++ long /*int*/ modelHandle, checkRenderer; + int itemCount, columnCount, lastIndexOf, sortDirection; +- int /*long*/ ignoreCell; ++ long /*int*/ ignoreCell; + TableItem [] items; + TableColumn [] columns; + TableItem currentItem; +@@ -170,9 +170,9 @@ + return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0); + } + +-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) { ++long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { + if (cell == ignoreCell) return 0; +- int /*long*/ path = OS.gtk_tree_model_get_path (tree_model, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (tree_model, iter); + int [] index = new int [1]; + OS.memmove (index, OS.gtk_tree_path_get_indices (path), 4); + TableItem item = _getItem (index[0]); +@@ -223,7 +223,7 @@ + setData = checkData (item); + } + } +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + if (setData) { + ptr [0] = 0; + if (isPixbuf) { +@@ -332,7 +332,7 @@ + addListener (SWT.DefaultSelection, typedListener); + } + +-int calculateWidth (int /*long*/ column, int /*long*/ iter) { ++int calculateWidth (long /*int*/ column, long /*int*/ iter) { + OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false); + /* + * Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size() +@@ -348,11 +348,11 @@ + int [] w = new int [1]; + OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0); + width += 2 * w [0]; +- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column); ++ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column); + if (list == 0) return 0; +- int /*long*/ temp = list; ++ long /*int*/ temp = list; + while (temp != 0) { +- int /*long*/ renderer = OS.g_list_data (temp); ++ long /*int*/ renderer = OS.g_list_data (temp); + if (renderer != 0) { + OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null); + width += w [0]; +@@ -524,18 +524,18 @@ + modelIndex++; + } + if (modelIndex == modelLength) { +- int /*long*/ oldModel = modelHandle; +- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time +- int /*long*/ newModel = OS.gtk_list_store_newv (types.length, types); ++ long /*int*/ oldModel = modelHandle; ++ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time ++ long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types); + if (newModel == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + for (int i=0; i 0) { + TableColumn checkColumn = columns [0]; +@@ -609,7 +609,7 @@ + OS.gtk_fixed_set_has_window (fixedHandle, true); + scrolledHandle = OS.gtk_scrolled_window_new (0, 0); + if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ [] types = getColumnTypes (1); ++ long /*int*/ [] types = getColumnTypes (1); + modelHandle = OS.gtk_list_store_newv (types.length, types); + if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES); + handle = OS.gtk_tree_view_new_with_model (modelHandle); +@@ -624,7 +624,7 @@ + OS.gtk_container_add (scrolledHandle, handle); + + int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE; +- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle); + OS.gtk_tree_selection_set_mode (selectionHandle, mode); + OS.gtk_tree_view_set_headers_visible (handle, false); + int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER; +@@ -669,11 +669,11 @@ + } else { + createColumn (column, index); + } +- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 3); ++ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 3); + if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); ++ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); + if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ imageHandle = OS.gtk_image_new (); ++ long /*int*/ imageHandle = OS.gtk_image_new (); + if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_container_add (boxHandle, imageHandle); + OS.gtk_container_add (boxHandle, labelHandle); +@@ -682,7 +682,7 @@ + column.labelHandle = labelHandle; + column.imageHandle = imageHandle; + OS.gtk_tree_view_column_set_widget (column.handle, boxHandle); +- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle); ++ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle); + while (widget != handle) { + if (OS.GTK_IS_BUTTON (widget)) { + column.buttonHandle = widget; +@@ -748,7 +748,7 @@ + items [index] = item; + } + +-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) { ++void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) { + OS.gtk_tree_view_column_clear (columnHandle); + if ((style & SWT.CHECK) != 0 && check) { + OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false); +@@ -771,9 +771,9 @@ + OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle); + } + } +- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new (); ++ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new (); + if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new (); ++ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new (); + if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); + + if (ownerDraw) { +@@ -877,7 +877,7 @@ + checkWidget(); + if (index < 0 || index >= itemCount) return; + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle); + OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); +@@ -902,7 +902,7 @@ + public void deselect (int start, int end) { + checkWidget(); + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int index=start; index<=end; index++) { + if (index < 0 || index >= itemCount) continue; +@@ -933,7 +933,7 @@ + checkWidget(); + if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int i=0; i 0) { +- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); ++ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + for (int i = 0; i < columnCount; i++) { + if (columns [i].handle == columnHandle) { + columnIndex = i; +@@ -2602,18 +2602,18 @@ + return result; + } + +-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) { ++long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { + TableItem item = null; +- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); ++ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + if (iter != 0) { +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + int [] buffer = new int [1]; + OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4); + int index = buffer [0]; + item = _getItem (index); + OS.gtk_tree_path_free (path); + } +- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); ++ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + int columnIndex = 0; + if (columnCount > 0) { + for (int i = 0; i < columnCount; i++) { +@@ -2627,7 +2627,7 @@ + if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { + drawFlags = (int)/*64*/flags; + drawState = SWT.FOREGROUND; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1); + if (ptr [0] == 0) { + int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex; +@@ -2638,7 +2638,7 @@ + if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED; + + GdkRectangle rect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); + OS.gtk_tree_path_free (path); + +@@ -2652,7 +2652,7 @@ + } + + //send out measure before erase +- int /*long*/ textRenderer = getTextRenderer (columnHandle); ++ long /*int*/ textRenderer = getTextRenderer (columnHandle); + if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null); + + +@@ -2690,7 +2690,7 @@ + if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED; + if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED; + if ((drawState & SWT.SELECTED) != 0) { +- int /*long*/ style = OS.gtk_widget_get_style (widget); ++ long /*int*/ style = OS.gtk_widget_get_style (widget); + //TODO - parity and sorted + byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true); + OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height); +@@ -2701,7 +2701,7 @@ + } + } + } +- int /*long*/ result = 0; ++ long /*int*/ result = 0; + if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) { + GC gc = new GC (this); + gc.setBackground (item.getBackground (columnIndex)); +@@ -2711,7 +2711,7 @@ + gc.dispose (); + } + if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) { +- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); ++ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); + GtkCellRendererClass klass = new GtkCellRendererClass (); + OS.memmove (klass, g_class); + if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) { +@@ -2723,7 +2723,7 @@ + if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) { + if (hooks (SWT.PaintItem)) { + GdkRectangle rect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); + OS.gtk_tree_path_free (path); + ignoreSize = true; +@@ -2774,8 +2774,8 @@ + for (int i=0; i 1)) return; + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + for (int i=0; i 0) { + byte [] buffer = Converter.wcsToMbcs (null, message, true); +- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); ++ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); + OS.pango_layout_get_size (layout, w, h); + OS.g_object_unref (layout); + width = Math.max (width, OS.PANGO_PIXELS (w [0])); +@@ -416,7 +416,7 @@ + int xborder = 0, yborder = 0; + if ((style & SWT.SINGLE) != 0) { + if ((style & SWT.BORDER) != 0) { +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + xborder += OS.gtk_style_get_xthickness (style); + yborder += OS.gtk_style_get_ythickness (style); + } +@@ -461,7 +461,7 @@ + if ((style & SWT.SINGLE) != 0) { + OS.gtk_editable_copy_clipboard (handle); + } else { +- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); ++ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); + OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard); + } + } +@@ -483,7 +483,7 @@ + if ((style & SWT.SINGLE) != 0) { + OS.gtk_editable_cut_clipboard (handle); + } else { +- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); ++ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); + OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle)); + } + } +@@ -491,7 +491,7 @@ + void deregister () { + super.deregister (); + if (bufferHandle != 0) display.removeWidget (bufferHandle); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) display.removeWidget (imContext); + } + +@@ -519,9 +519,9 @@ + if ((style & SWT.SINGLE) != 0) { + int [] index = new int [1]; + int [] trailing = new int [1]; +- int /*long*/ layout = OS.gtk_entry_get_layout (handle); ++ long /*int*/ layout = OS.gtk_entry_get_layout (handle); + OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing); +- int /*long*/ ptr = OS.pango_layout_get_text (layout); ++ long /*int*/ ptr = OS.pango_layout_get_text (layout); + position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; + } else { + byte [] p = new byte [ITER_SIZEOF]; +@@ -540,15 +540,15 @@ + return super.dragDetect (x, y, filter, dragOnTimeout, consume); + } + +-int /*long*/ eventWindow () { ++long /*int*/ eventWindow () { + return paintWindow (); + } + +-boolean filterKey (int keyval, int /*long*/ event) { ++boolean filterKey (int keyval, long /*int*/ event) { + int time = OS.gdk_event_get_time (event); + if (time != lastEventTime) { + lastEventTime = time; +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + return OS.gtk_im_context_filter_keypress (imContext, event); + } +@@ -567,7 +567,7 @@ + * filter has to be called by SWT. + */ + if (gdkEventKey != 0 && gdkEventKey != -1) { +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + OS.gtk_im_context_filter_keypress (imContext, gdkEventKey); + gdkEventKey = -1; +@@ -584,7 +584,7 @@ + public int getBorderWidth () { + checkWidget(); + if ((style & SWT.MULTI) != 0) return super.getBorderWidth (); +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + if ((this.style & SWT.BORDER) != 0) { + return OS.gtk_style_get_xthickness (style); + } +@@ -608,7 +608,7 @@ + checkWidget (); + if ((style & SWT.SINGLE) != 0) return 0; + byte [] position = new byte [ITER_SIZEOF]; +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); + return OS.gtk_text_iter_get_line (position); + } +@@ -636,7 +636,7 @@ + } + int [] offset_x = new int [1], offset_y = new int [1]; + OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y); +- int /*long*/ layout = OS.gtk_entry_get_layout (handle); ++ long /*int*/ layout = OS.gtk_entry_get_layout (handle); + PangoRectangle pos = new PangoRectangle (); + OS.pango_layout_index_to_pos (layout, index, pos); + int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth (); +@@ -644,7 +644,7 @@ + return new Point (x, y); + } + byte [] position = new byte [ITER_SIZEOF]; +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); + GdkRectangle rect = new GdkRectangle (); + OS.gtk_text_view_get_iter_location (handle, position, rect); +@@ -670,15 +670,15 @@ + public int getCaretPosition () { + checkWidget (); + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (handle)); + } + byte [] position = new byte [ITER_SIZEOF]; +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark); + byte [] zero = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true); + int result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (position)); + OS.g_free (ptr); + return result; +@@ -697,13 +697,13 @@ + public int getCharCount () { + checkWidget (); + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + return (int)/*64*/OS.g_utf16_strlen (ptr, -1); + } + byte [] startIter = new byte [ITER_SIZEOF]; + byte [] endIter = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + int result = (int)/*64*/OS.g_utf16_strlen(ptr, -1); + OS.g_free (ptr); + return result; +@@ -871,16 +871,16 @@ + if ((style & SWT.SINGLE) != 0) { + int [] index = new int [1]; + int [] trailing = new int [1]; +- int /*long*/ layout = OS.gtk_entry_get_layout (handle); ++ long /*int*/ layout = OS.gtk_entry_get_layout (handle); + OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing); +- int /*long*/ ptr = OS.pango_layout_get_text (layout); ++ long /*int*/ ptr = OS.pango_layout_get_text (layout); + position = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0]; + } else { + byte [] p = new byte [ITER_SIZEOF]; + OS.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y); + byte [] zero = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, p, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, p, true); + position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (p)); + OS.g_free (ptr); + } +@@ -911,7 +911,7 @@ + int [] start = new int [1]; + int [] end = new int [1]; + OS.gtk_editable_get_selection_bounds (handle, start, end); +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]); + end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]); + return new Point (start [0], end [0]); +@@ -921,7 +921,7 @@ + OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter); + byte [] zero = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); + int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (startIter)); + int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (endIter)); + OS.g_free (ptr); +@@ -982,7 +982,7 @@ + + int getTabWidth (int tabs) { + byte[] buffer = Converter.wcsToMbcs(null, " ", true); +- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); ++ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); + int [] width = new int [1]; + int [] height = new int [1]; + OS.pango_layout_get_size (layout, width, height); +@@ -1062,7 +1062,7 @@ + */ + public char [] getTextChars () { + checkWidget (); +- int /*long*/ address; ++ long /*int*/ address; + if ((style & SWT.SINGLE) != 0) { + address = OS.gtk_entry_get_text (handle); + } else { +@@ -1157,13 +1157,13 @@ + return lineTop [0]; + } + +-int /*long*/ gtk_activate (int /*long*/ widget) { ++long /*int*/ gtk_activate (long /*int*/ widget) { + sendSelectionEvent (SWT.DefaultSelection); + return 0; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_button_press_event (widget, event); ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_button_press_event (widget, event); + if (result != 0) return result; + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, event, GdkEventButton.sizeof); +@@ -1178,7 +1178,7 @@ + } + + +-int /*long*/ gtk_changed (int /*long*/ widget) { ++long /*int*/ gtk_changed (long /*int*/ widget) { + /* + * Feature in GTK. When the user types, GTK positions + * the caret after sending the changed signal. This +@@ -1187,7 +1187,7 @@ + * is to post the modify event when the user is typing. + */ + boolean keyPress = false; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +@@ -1205,14 +1205,14 @@ + } + if ((style & SWT.SEARCH) != 0) { + if ((style & SWT.ICON_CANCEL) != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + OS.gtk_entry_set_icon_sensitive (handle, OS.GTK_ENTRY_ICON_SECONDARY, OS.g_utf16_strlen (ptr, -1) > 0); + } + } + return 0; + } + +-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) { ++long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) { + if (text == 0) return 0; + if ((style & SWT.SINGLE) != 0) { + if (!OS.gtk_editable_get_editable (handle)) return 0; +@@ -1254,7 +1254,7 @@ + return 0; + } + +-int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*long*/ iter2) { ++long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) { + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; + byte [] startIter = new byte [ITER_SIZEOF]; + byte [] endIter = new byte [ITER_SIZEOF]; +@@ -1264,7 +1264,7 @@ + int end = OS.gtk_text_iter_get_offset (endIter); + byte [] zero = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true); + start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); + end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); + OS.g_free (ptr); +@@ -1296,9 +1296,9 @@ + return 0; + } + +-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) { ++long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) { + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1); + int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos); + int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos); +@@ -1328,7 +1328,7 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + if (cursor != null) setCursor (cursor.handle); + /* + * Feature in GTK. The gtk-entry-select-on-focus property is a global +@@ -1344,7 +1344,7 @@ + GdkEventFocus gdkEventFocus = new GdkEventFocus (); + OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof); + if (gdkEventFocus.in == 0) { +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0); + } + break; +@@ -1353,29 +1353,29 @@ + return super.gtk_event_after (widget, gdkEvent); + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) { + if ((state & OBSCURED) != 0) return 0; +- int /*long*/ result = super.gtk_expose_event (widget, event); ++ long /*int*/ result = super.gtk_expose_event (widget, event); + if ((style & SWT.SINGLE) != 0 && message.length () > 0) { +- int /*long*/ str = OS.gtk_entry_get_text (handle); ++ long /*int*/ str = OS.gtk_entry_get_text (handle); + if (!OS.GTK_WIDGET_HAS_FOCUS (handle) && OS.strlen (str) == 0) { + GdkEventExpose gdkEvent = new GdkEventExpose (); + OS.memmove (gdkEvent, event, GdkEventExpose.sizeof); +- int /*long*/ window = paintWindow (); ++ long /*int*/ window = paintWindow (); + int [] w = new int [1], h = new int [1]; + OS.gdk_drawable_get_size (window, w, h); + GtkBorder innerBorder = Display.getEntryInnerBorder (handle); + int width = w [0] - innerBorder.left - innerBorder.right; + int height = h [0] - innerBorder.top - innerBorder.bottom; +- int /*long*/ context = OS.gtk_widget_get_pango_context (handle); +- int /*long*/ lang = OS.pango_context_get_language (context); +- int /*long*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang); ++ long /*int*/ context = OS.gtk_widget_get_pango_context (handle); ++ long /*int*/ lang = OS.pango_context_get_language (context); ++ long /*int*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang); + int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics)); + int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics)); + OS.pango_font_metrics_unref (metrics); + byte [] buffer = Converter.wcsToMbcs (null, message, true); +- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); +- int /*long*/ line = OS.pango_layout_get_line (layout, 0); ++ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); ++ long /*int*/ line = OS.pango_layout_get_line (layout, 0); + PangoRectangle rect = new PangoRectangle (); + OS.pango_layout_line_get_extents (line, null, rect); + rect.y = OS.PANGO_PIXELS (rect.y); +@@ -1398,8 +1398,8 @@ + case SWT.CENTER: x = (width - rect.width) / 2; break; + case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break; + } +- int /*long*/ gc = OS.gdk_gc_new (window); +- int /*long*/ style = OS.gtk_widget_get_style (handle); ++ long /*int*/ gc = OS.gdk_gc_new (window); ++ long /*int*/ style = OS.gtk_widget_get_style (handle); + GdkColor textColor = new GdkColor (); + OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor); + GdkColor baseColor = new GdkColor (); +@@ -1412,13 +1412,13 @@ + return result; + } + +-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) { + fixIM (); + return super.gtk_focus_out_event (widget, event); + } + +-int /*long*/ gtk_grab_focus (int /*long*/ widget) { +- int /*long*/ result = super.gtk_grab_focus (widget); ++long /*int*/ gtk_grab_focus (long /*int*/ widget) { ++ long /*int*/ result = super.gtk_grab_focus (widget); + /* + * Feature in GTK. GtkEntry widgets select their text on focus in, + * clearing the previous selection. This behavior is controlled by +@@ -1427,13 +1427,13 @@ + * the entry has done focus in processing. + */ + if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) { +- int /*long*/ settings = OS.gtk_settings_get_default (); ++ long /*int*/ settings = OS.gtk_settings_get_default (); + OS.g_object_set (settings, OS.gtk_entry_select_on_focus, false, 0); + } + return result; + } + +-int /*long*/ gtk_icon_release (int /*long*/ widget, int /*long*/ icon_pos, int /*long*/ event) { ++long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) { + Event e = new Event(); + if (icon_pos == OS.GTK_ENTRY_ICON_PRIMARY) { + e.detail = SWT.ICON_SEARCH; +@@ -1445,7 +1445,7 @@ + return 0; + } + +-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) { ++long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) { + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; + if (new_text == 0 || new_text_length == 0) return 0; + byte [] buffer = new byte [(int)/*64*/new_text_length]; +@@ -1453,7 +1453,7 @@ + String oldText = new String (Converter.mbcsToWcs (null, buffer)); + int [] pos = new int [1]; + OS.memmove (pos, position, 4); +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1); + /* Use the selection when the text was deleted */ + int start = pos [0], end = pos [0]; +@@ -1493,15 +1493,15 @@ + return 0; + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ result = super.gtk_key_press_event (widget, event); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ result = super.gtk_key_press_event (widget, event); + if (result != 0) fixIM (); + if (gdkEventKey == -1) result = 1; + gdkEventKey = 0; + return result; + } + +-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { ++long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { + if ((style & SWT.RIGHT_TO_LEFT) != 0) { + OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL); + OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL); +@@ -1509,7 +1509,7 @@ + return 0; + } + +-int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter, int /*long*/ text, int /*long*/ length) { ++long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) { + if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; + byte [] position = new byte [ITER_SIZEOF]; + OS.memmove (position, iter, position.length); +@@ -1522,7 +1522,7 @@ + } + byte [] zero = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true); + start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start); + end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end); + OS.g_free(ptr); +@@ -1562,7 +1562,7 @@ + OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.closures [DELETE_RANGE], false); + OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false); + } +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { + OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false); + int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ()); +@@ -1571,7 +1571,7 @@ + } + } + +-int /*long*/ imContext () { ++long /*int*/ imContext () { + if ((style & SWT.SINGLE) != 0) { + return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0; + } +@@ -1612,15 +1612,15 @@ + } + OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length); + OS.gtk_text_buffer_place_cursor (bufferHandle, start); +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_view_scroll_mark_onscreen (handle, mark); + } + } + +-int /*long*/ paintWindow () { ++long /*int*/ paintWindow () { + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ window = super.paintWindow (); +- int /*long*/ children = OS.gdk_window_get_children (window); ++ long /*int*/ window = super.paintWindow (); ++ long /*int*/ children = OS.gdk_window_get_children (window); + if (children != 0) { + /* + * When search or cancel icons are added to Text, those +@@ -1656,7 +1656,7 @@ + if ((style & SWT.SINGLE) != 0) { + OS.gtk_editable_paste_clipboard (handle); + } else { +- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); ++ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); + OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle)); + } + } +@@ -1664,7 +1664,7 @@ + void register () { + super.register (); + if (bufferHandle != 0) display.addWidget (bufferHandle, this); +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) display.addWidget (imContext, this); + } + +@@ -1679,7 +1679,7 @@ + * it around until ownership of the clipboard is lost. + */ + if ((style & SWT.MULTI) != 0) { +- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); ++ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE); + OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle)); + } + } +@@ -1776,8 +1776,8 @@ + byte [] end = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0); + OS.gtk_text_buffer_get_end_iter (bufferHandle, end); +- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle); +- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); ++ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); + OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start); + OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end); + } +@@ -1788,8 +1788,8 @@ + OS.gtk_widget_modify_base (handle, 0, color); + } + +-void setCursor (int /*long*/ cursor) { +- int /*long*/ defaultCursor = 0; ++void setCursor (long /*int*/ cursor) { ++ long /*int*/ defaultCursor = 0; + if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM); + super.setCursor (cursor != 0 ? cursor : defaultCursor); + if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor); +@@ -1868,7 +1868,7 @@ + } + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + super.setFontDescription (font); + setTabStops (tabs); + } +@@ -1946,19 +1946,19 @@ + public void setSelection (int start) { + checkWidget (); + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + OS.gtk_editable_set_position (handle, start); + } else { + byte [] startIter = new byte [ITER_SIZEOF]; + byte [] endIter = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + OS.g_free (ptr); + OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start); + OS.gtk_text_buffer_place_cursor (bufferHandle, startIter); +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_view_scroll_mark_onscreen (handle, mark); + } + } +@@ -1991,7 +1991,7 @@ + public void setSelection (int start, int end) { + checkWidget (); + if ((style & SWT.SINGLE) != 0) { +- int /*long*/ ptr = OS.gtk_entry_get_text (handle); ++ long /*int*/ ptr = OS.gtk_entry_get_text (handle); + start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); + OS.gtk_editable_set_position (handle, start); +@@ -2000,14 +2000,14 @@ + byte [] startIter = new byte [ITER_SIZEOF]; + byte [] endIter = new byte [ITER_SIZEOF]; + OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter); +- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); ++ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true); + start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start); + end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end); + OS.g_free (ptr); + OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start); + OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end); +- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle); +- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); ++ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); + OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter); + OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter); + } +@@ -2073,7 +2073,7 @@ + void setTabStops (int tabs) { + if ((style & SWT.SINGLE) != 0) return; + int tabWidth = getTabWidth (tabs); +- int /*long*/ tabArray = OS.pango_tab_array_new (1, false); ++ long /*int*/ tabArray = OS.pango_tab_array_new (1, false); + OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth); + OS.gtk_text_view_set_tabs (handle, tabArray); + OS.pango_tab_array_free (tabArray); +@@ -2169,7 +2169,7 @@ + OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT); + OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0); + OS.gtk_text_buffer_place_cursor (bufferHandle, position); +- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_view_scroll_mark_onscreen (handle, mark); + } + sendEvent (SWT.Modify); +@@ -2246,7 +2246,7 @@ + public void showSelection () { + checkWidget (); + if ((style & SWT.SINGLE) != 0) return; +- int /*long*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); ++ long /*int*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle); + OS.gtk_text_view_scroll_mark_onscreen (handle, mark); + mark = OS.gtk_text_buffer_get_insert (bufferHandle); + OS.gtk_text_view_scroll_mark_onscreen (handle, mark); +@@ -2257,9 +2257,9 @@ + switch (key) { + case OS.GDK_KP_Enter: + case OS.GDK_Return: { +- int /*long*/ imContext = imContext (); ++ long /*int*/ imContext = imContext (); + if (imContext != 0) { +- int /*long*/ [] preeditString = new int /*long*/ [1]; ++ long /*int*/ [] preeditString = new long /*int*/ [1]; + OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null); + if (preeditString [0] != 0) { + int length = OS.strlen (preeditString [0]); +@@ -2293,7 +2293,7 @@ + event.text = string; + event.start = start; + event.end = end; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventKey gdkEvent = new GdkEventKey (); + OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/ToolBar.java swt-gtk-3.7//org/eclipse/swt/widgets/ToolBar.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/ToolBar.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/ToolBar.java 2011-06-13 20:53:32.000000000 +0000 +@@ -188,11 +188,11 @@ + return result; + } + +-int /*long*/ eventHandle () { ++long /*int*/ eventHandle () { + return fixedHandle; + } + +-int /*long*/ enterExitHandle() { ++long /*int*/ enterExitHandle() { + return handle; + } + +@@ -210,7 +210,7 @@ + } + } + +-boolean forceFocus (int /*long*/ focusHandle) { ++boolean forceFocus (long /*int*/ focusHandle) { + if (lastFocus != null && lastFocus.setFocus ()) return true; + ToolItem [] items = getItems (); + for (int i = 0; i < items.length; i++) { +@@ -279,7 +279,7 @@ + */ + public int getItemCount () { + checkWidget(); +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return 0; + int itemCount = OS.g_list_length (list); + OS.g_list_free (list); +@@ -308,13 +308,13 @@ + } + + ToolItem [] _getItems () { +- int /*long*/ list = OS.gtk_container_get_children (handle); ++ long /*int*/ list = OS.gtk_container_get_children (handle); + if (list == 0) return new ToolItem [0]; + int count = OS.g_list_length (list); + ToolItem [] items = new ToolItem [count]; + int index = 0; + for (int i=0; i= OS.VERSION (2, 10, 0)) { + GdkRectangle area = new GdkRectangle (); + OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0); +@@ -337,7 +337,7 @@ + y = area.y + area.height / 2; + } else { + OS.gtk_widget_realize (itemHandle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (itemHandle); + int [] px = new int [1], py = new int [1]; + OS.gdk_window_get_origin (window, px, py); + x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2; +@@ -457,20 +457,20 @@ + public boolean getVisible () { + checkWidget (); + if ((style & SWT.BALLOON) != 0) return OS.GTK_WIDGET_VISIBLE (handle); +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + return OS.GTK_WIDGET_VISIBLE (tipWindow); + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { + sendSelectionEvent (SWT.Selection, null, true); + setVisible (false); + return 0; + } + +-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) { + if ((state & OBSCURED) != 0) return 0; +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); +- int /*long*/ gdkGC = OS.gdk_gc_new (window); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); ++ long /*int*/ gdkGC = OS.gdk_gc_new (window); + OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2); + int x = BORDER + PADDING; + int y = BORDER + PADDING; +@@ -484,8 +484,8 @@ + case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break; + } + if (buffer != null) { +- int /*long*/ style = OS.gtk_widget_get_default_style (); +- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon ( ++ long /*int*/ style = OS.gtk_widget_get_default_style (); ++ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon ( + OS.gtk_icon_factory_lookup_default (buffer), + style, + OS.GTK_TEXT_DIR_NONE, +@@ -515,11 +515,11 @@ + return 0; + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { + Point point = getLocation (); + int x = point.x; + int y = point.y; +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + OS.gtk_widget_realize (widget); + int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (widget)); + GdkRectangle dest = new GdkRectangle (); +@@ -538,7 +538,7 @@ + OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK); + OS.g_signal_connect_closure (handle, OS.button_press_event, display.closures [BUTTON_PRESS_EVENT], false); + } else { +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + if (tipWindow != 0) { + OS.g_signal_connect_closure (tipWindow, OS.size_allocate, display.closures [SIZE_ALLOCATE], false); + OS.gtk_widget_add_events (tipWindow, OS.GDK_BUTTON_PRESS_MASK); +@@ -569,7 +569,7 @@ + void register () { + super.register (); + if ((style & SWT.BALLOON) == 0) { +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + if (tipWindow != 0) display.addWidget (tipWindow, this); + } + } +@@ -656,7 +656,7 @@ + if ((style & SWT.BALLOON) != 0) { + if (OS.GTK_WIDGET_VISIBLE (handle)) configure (); + } else { +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + if (OS.GTK_WIDGET_VISIBLE (tipWindow)) { + OS.gtk_window_move (tipWindow, x, y); + } +@@ -748,13 +748,13 @@ + if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) { + OS.pango_layout_set_auto_dir (layoutText, false); + } +- int /*long*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD); ++ long /*int*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD); + PangoAttribute attribute = new PangoAttribute (); + OS.memmove (attribute, boldAttr, PangoAttribute.sizeof); + attribute.start_index = 0; + attribute.end_index = buffer.length; + OS.memmove (boldAttr, attribute, PangoAttribute.sizeof); +- int /*long*/ attrList = OS.pango_attr_list_new (); ++ long /*int*/ attrList = OS.pango_attr_list_new (); + OS.pango_attr_list_insert (attrList, boldAttr); + OS.pango_layout_set_attributes (layoutText, attrList); + OS.pango_attr_list_unref (attrList); +@@ -788,13 +788,13 @@ + configure (); + OS.gtk_widget_show (handle); + } else { +- int /*long*/ vboxHandle = parent.vboxHandle; ++ long /*int*/ vboxHandle = parent.vboxHandle; + StringBuffer string = new StringBuffer (text); + if (text.length () > 0) string.append ("\n\n"); + string.append (message); + byte [] buffer = Converter.wcsToMbcs (null, string.toString(), true); + OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null); +- int /*long*/ data = OS.gtk_tooltips_data_get (vboxHandle); ++ long /*int*/ data = OS.gtk_tooltips_data_get (vboxHandle); + OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data); + OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null); + } +@@ -803,17 +803,17 @@ + if ((style & SWT.BALLOON) != 0) { + OS.gtk_widget_hide (handle); + } else { +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + OS.gtk_widget_hide (tipWindow); + } + } + } + +-int /*long*/ timerProc (int /*long*/ widget) { ++long /*int*/ timerProc (long /*int*/ widget) { + if ((style & SWT.BALLOON) != 0) { + OS.gtk_widget_hide (handle); + } else { +- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); ++ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle); + OS.gtk_widget_hide (tipWindow); + } + return 0; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/TouchSource.java swt-gtk-3.7//org/eclipse/swt/widgets/TouchSource.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/TouchSource.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/TouchSource.java 2011-06-13 20:53:32.000000000 +0000 +@@ -38,7 +38,7 @@ + * @since 3.7 + */ + public final class TouchSource { +- int /*long*/ handle; ++ long /*int*/ handle; + boolean direct; + Rectangle bounds; + +@@ -49,7 +49,7 @@ + * @param height height of the source in pixels. + * @param width width of the source in pixels. + */ +-TouchSource (int /*long*/ handle, boolean direct, Rectangle bounds) { ++TouchSource (long /*int*/ handle, boolean direct, Rectangle bounds) { + this.handle = handle; + this.direct = direct; + this.bounds = bounds; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Tracker.java swt-gtk-3.7//org/eclipse/swt/widgets/Tracker.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Tracker.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Tracker.java 2011-06-13 20:53:32.000000000 +0000 +@@ -42,7 +42,7 @@ + public class Tracker extends Widget { + Composite parent; + Cursor cursor; +- int /*long*/ lastCursor, window; ++ long /*int*/ lastCursor, window; + boolean tracking, cancelled, grabbed, stippled; + Rectangle [] rectangles = new Rectangle [0], proportions = rectangles; + Rectangle bounds; +@@ -306,14 +306,14 @@ + } + + void drawRectangles (Rectangle [] rects) { +- int /*long*/ window = OS.GDK_ROOT_PARENT (); ++ long /*int*/ window = OS.GDK_ROOT_PARENT (); + if (parent != null) { + window = OS.GTK_WIDGET_WINDOW (parent.paintHandle()); + } + if (window == 0) return; +- int /*long*/ gc = OS.gdk_gc_new (window); ++ long /*int*/ gc = OS.gdk_gc_new (window); + if (gc == 0) return; +- int /*long*/ colormap = OS.gdk_colormap_get_system (); ++ long /*int*/ colormap = OS.gdk_colormap_get_system (); + GdkColor color = new GdkColor (); + OS.gdk_color_white (colormap, color); + OS.gdk_gc_set_foreground (gc, color); +@@ -366,17 +366,17 @@ + } + + boolean grab () { +- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0; ++ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0; + int result = OS.gdk_pointer_grab (window, false, OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK, window, cursor, OS.GDK_CURRENT_TIME); + return result == OS.GDK_GRAB_SUCCESS; + } + +-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { ++long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { + return gtk_mouse (OS.GDK_BUTTON_RELEASE, widget, event); + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); + if (result != 0) return result; + GdkEventKey keyEvent = new GdkEventKey (); + OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof); +@@ -510,8 +510,8 @@ + return result; + } + +-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0; ++long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0; + if (cursor != lastCursor) { + ungrab (); + grabbed = grab (); +@@ -520,7 +520,7 @@ + return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr); + } + +-int /*long*/ gtk_mouse (int eventType, int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPtr) { + int [] newX = new int [1], newY = new int [1]; + OS.gdk_window_get_pointer (window, newX, newY, null); + if (oldX != newX [0] || oldY != newY [0]) { +@@ -710,7 +710,7 @@ + GdkEvent gdkEvent = new GdkEvent(); + while (tracking) { + if (parent != null && parent.isDisposed ()) break; +- int /*long*/ eventPtr; ++ long /*int*/ eventPtr; + while (true) { + eventPtr = OS.gdk_event_get (); + if (eventPtr != 0) { +@@ -720,7 +720,7 @@ + } + } + OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof); +- int /*long*/ widget = OS.gtk_get_event_widget (eventPtr); ++ long /*int*/ widget = OS.gtk_get_event_widget (eventPtr); + switch (gdkEvent.type) { + case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break; + case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break; +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/TrayItem.java swt-gtk-3.7//org/eclipse/swt/widgets/TrayItem.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/TrayItem.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/TrayItem.java 2011-06-13 20:53:32.000000000 +0000 +@@ -40,8 +40,8 @@ + Tray parent; + ToolTip toolTip; + String toolTipText; +- int /*long*/ imageHandle; +- int /*long*/ tooltipsHandle; ++ long /*int*/ imageHandle; ++ long /*int*/ tooltipsHandle; + ImageList imageList; + + /** +@@ -164,20 +164,20 @@ + OS.gtk_container_add (handle, imageHandle); + OS.gtk_widget_show (handle); + OS.gtk_widget_show (imageHandle); +- int /*long*/ id = OS.gtk_plug_get_id (handle); ++ long /*int*/ id = OS.gtk_plug_get_id (handle); + int monitor = 0; +- int /*long*/ screen = OS.gdk_screen_get_default (); ++ long /*int*/ screen = OS.gdk_screen_get_default (); + if (screen != 0) { + monitor = OS.gdk_screen_get_number (screen); + } + byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true); +- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true); +- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom); +- int /*long*/ xDisplay = OS.GDK_DISPLAY (); +- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom); ++ long /*int*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true); ++ long /*int*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom); ++ long /*int*/ xDisplay = OS.GDK_DISPLAY (); ++ long /*int*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom); + byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true); +- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true); +- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom); ++ long /*int*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true); ++ long /*int*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom); + XClientMessageEvent event = new XClientMessageEvent (); + event.type = OS.ClientMessage; + event.window = trayWindow; +@@ -186,7 +186,7 @@ + event.data [0] = OS.GDK_CURRENT_TIME; + event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK; + event.data [2] = id; +- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof); ++ long /*int*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof); + OS.memmove (clientEvent, event, XClientMessageEvent.sizeof); + OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent); + OS.g_free (clientEvent); +@@ -254,7 +254,7 @@ + return toolTipText; + } + +-int /*long*/ gtk_activate (int /*long*/ widget) { ++long /*int*/ gtk_activate (long /*int*/ widget) { + sendSelectionEvent (SWT.Selection); + /* + * Feature in GTK. GTK will generate a single-click event before sending +@@ -262,10 +262,10 @@ + * the single-click as the current event and for the double-click in the + * event queue. + */ +- int /*long*/ nextEvent = OS.gdk_event_peek (); ++ long /*int*/ nextEvent = OS.gdk_event_peek (); + if (nextEvent != 0) { + int nextEventType = OS.GDK_EVENT_TYPE (nextEvent); +- int /*long*/ currEvent = OS.gtk_get_current_event (); ++ long /*int*/ currEvent = OS.gtk_get_current_event (); + int currEventType = 0; + if (currEvent != 0) { + currEventType = OS.GDK_EVENT_TYPE (currEvent); +@@ -279,7 +279,7 @@ + return 0; + } + +-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) { ++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) { + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof); + if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0; +@@ -295,13 +295,13 @@ + return 0; + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { + if (image != null && image.mask != 0) { + if (OS.gdk_drawable_get_depth (image.mask) == 1) { + int xoffset = (int) Math.floor (OS.GTK_WIDGET_X (widget) + ((OS.GTK_WIDGET_WIDTH (widget) - OS.GTK_WIDGET_REQUISITION_WIDTH (widget)) * 0.5) + 0.5); + int yoffset = (int) Math.floor (OS.GTK_WIDGET_Y (widget) + ((OS.GTK_WIDGET_HEIGHT (widget) - OS.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5); + Rectangle b = image.getBounds(); +- int /*long*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height); ++ long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height); + if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES); + GdkImage gdkImage = new GdkImage(); + OS.memmove (gdkImage, gdkImagePtr); +@@ -320,7 +320,7 @@ + } + } + OS.gtk_widget_realize (handle); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + OS.gdk_window_shape_combine_region (window, region.handle, 0, 0); + region.dispose (); + } +@@ -328,7 +328,7 @@ + return 0; + } + +-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) { ++long /*int*/ gtk_status_icon_popup_menu (long /*int*/ widget, long /*int*/ button, long /*int*/ activate_time) { + /* + * GTK provides a MenuPositionFunc for GtkStatusIcon in order + * to set the popup-menu aligned to the tray. +@@ -476,7 +476,7 @@ + } else { + imageList.put (imageIndex, image); + } +- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex); ++ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); + if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { + OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf); + OS.gtk_status_icon_set_visible (handle, true); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/TreeColumn.java swt-gtk-3.7//org/eclipse/swt/widgets/TreeColumn.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/TreeColumn.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/TreeColumn.java 2011-06-13 20:53:32.000000000 +0000 +@@ -38,7 +38,7 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class TreeColumn extends Item { +- int /*long*/ labelHandle, imageHandle, buttonHandle; ++ long /*int*/ labelHandle, imageHandle, buttonHandle; + Tree parent; + int modelIndex, lastButton, lastTime, lastX, lastWidth; + boolean customDraw, useFixedWidth; +@@ -326,7 +326,7 @@ + return OS.gtk_tree_view_column_get_width (handle); + } + +-int /*long*/ gtk_clicked (int /*long*/ widget) { ++long /*int*/ gtk_clicked (long /*int*/ widget) { + /* + * There is no API to get a double click on a table column. Normally, when + * the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS +@@ -336,7 +336,7 @@ + */ + boolean doubleClick = false; + boolean postEvent = true; +- int /*long*/ eventPtr = OS.gtk_get_current_event (); ++ long /*int*/ eventPtr = OS.gtk_get_current_event (); + if (eventPtr != 0) { + GdkEventButton gdkEvent = new GdkEventButton (); + OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof); +@@ -368,7 +368,7 @@ + return 0; + } + +-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { ++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + GdkEvent event = new GdkEvent (); + OS.memmove (event, gdkEvent, GdkEvent.sizeof); + switch (event.type) { +@@ -384,11 +384,11 @@ + return 0; + } + +-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) { ++long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) { + return parent.gtk_mnemonic_activate (widget, arg1); + } + +-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { ++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { + useFixedWidth = false; + int x = OS.GTK_WIDGET_X (widget); + int width = OS.GTK_WIDGET_WIDTH (widget); +@@ -435,7 +435,7 @@ + if ((parent.style & SWT.VIRTUAL) != 0) { + //NOT DONE + } else { +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) { + do { + width = Math.max (width, parent.calculateWidth (handle, iter, true)); +@@ -542,7 +542,7 @@ + parent.createRenderers (handle, modelIndex, index == 0, style); + } + +-void setFontDescription (int /*long*/ font) { ++void setFontDescription (long /*int*/ font) { + OS.gtk_widget_modify_font (labelHandle, font); + OS.gtk_widget_modify_font (imageHandle, font); + } +@@ -557,7 +557,7 @@ + } + int imageIndex = headerImageList.indexOf (image); + if (imageIndex == -1) imageIndex = headerImageList.add (image); +- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex); ++ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex); + OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); + OS.gtk_widget_show (imageHandle); + } else { +@@ -701,14 +701,14 @@ + */ + if (width != 0) { + if (buttonHandle != 0) { +- int /*long*/ window = OS.gtk_widget_get_parent_window (buttonHandle); ++ long /*int*/ window = OS.gtk_widget_get_parent_window (buttonHandle); + if (window != 0) { +- int /*long*/ windowList = OS.gdk_window_get_children (window); ++ long /*int*/ windowList = OS.gdk_window_get_children (window); + if (windowList != 0) { +- int /*long*/ windows = windowList; +- int /*long*/ [] userData = new int /*long*/ [1]; ++ long /*int*/ windows = windowList; ++ long /*int*/ [] userData = new long /*int*/ [1]; + while (windows != 0) { +- int /*long*/ child = OS.g_list_data (windows); ++ long /*int*/ child = OS.g_list_data (windows); + OS.gdk_window_get_user_data (child, userData); + if (userData[0] == buttonHandle) { + OS.gdk_window_lower (child); +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/TreeItem.java swt-gtk-3.7//org/eclipse/swt/widgets/TreeItem.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/TreeItem.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/TreeItem.java 2011-06-13 20:53:32.000000000 +0000 +@@ -181,7 +181,7 @@ + this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true); + } + +-TreeItem (Tree parent, int /*long*/ parentIter, int style, int index, boolean create) { ++TreeItem (Tree parent, long /*int*/ parentIter, int style, int index, boolean create) { + super (parent, style); + this.parent = parent; + if (create) { +@@ -212,7 +212,7 @@ + } + + Color _getBackground () { +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1); + if (ptr [0] == 0) return parent.getBackground (); + GdkColor gdkColor = new GdkColor (); +@@ -223,7 +223,7 @@ + Color _getBackground (int index) { + int count = Math.max (1, parent.columnCount); + if (0 > index || index > count - 1) return _getBackground (); +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1); + if (ptr [0] == 0) return _getBackground (); +@@ -233,13 +233,13 @@ + } + + boolean _getChecked () { +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1); + return ptr [0] != 0; + } + + Color _getForeground () { +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1); + if (ptr [0] == 0) return parent.getForeground (); + GdkColor gdkColor = new GdkColor (); +@@ -250,7 +250,7 @@ + Color _getForeground (int index) { + int count = Math.max (1, parent.columnCount); + if (0 > index || index > count - 1) return _getForeground (); +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1); + if (ptr [0] == 0) return _getForeground (); +@@ -262,7 +262,7 @@ + Image _getImage (int index) { + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return null; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1); + if (ptr [0] == 0) return null; +@@ -275,7 +275,7 @@ + String _getText (int index) { + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return ""; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; + OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1); + if (ptr [0] == 0) return ""; //$NON-NLS-1$ +@@ -423,15 +423,15 @@ + // TODO fully test on early and later versions of GTK + checkWidget(); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.columnCount) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + GdkRectangle rect = new GdkRectangle (); + OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); +@@ -494,14 +494,14 @@ + // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem + checkWidget (); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0); + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + + boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; +@@ -594,7 +594,7 @@ + */ + public boolean getExpanded () { + checkWidget(); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path); + OS.gtk_tree_path_free (path); + return answer; +@@ -746,18 +746,18 @@ + // TODO fully test on early and later versions of GTK + checkWidget (); + if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED); +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.getColumnCount ()) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + GdkRectangle rect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect); + if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x; +@@ -908,12 +908,12 @@ + */ + public TreeItem getParentItem () { + checkWidget(); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + TreeItem item = null; + int depth = OS.gtk_tree_path_get_depth (path); + if (depth > 1) { + OS.gtk_tree_path_up (path); +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) { + item = parent._getItem (iter); + } +@@ -971,19 +971,19 @@ + if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); + // TODO fully test on early and later versions of GTK + // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (index >= 0 && index < parent.columnCount) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return new Rectangle (0, 0, 0, 0); +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column); + if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0); + +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + OS.gtk_widget_realize (parentHandle); + + boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0; +@@ -1066,8 +1066,8 @@ + if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); + int index = -1; + boolean isParent = false; +- int /*long*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle); +- int /*long*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle); ++ long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle); + int depth = OS.gtk_tree_path_get_depth (parentPath); + if (depth > 1 && OS.gtk_tree_path_up(parentPath)) { + if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true; +@@ -1075,9 +1075,9 @@ + OS.gtk_tree_path_free (currentPath); + OS.gtk_tree_path_free (parentPath); + if (!isParent) return index; +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle); + if (depth > 1) { +- int /*long*/ indices = OS.gtk_tree_path_get_indices (path); ++ long /*int*/ indices = OS.gtk_tree_path_get_indices (path); + if (indices != 0) { + int[] temp = new int[depth]; + OS.memmove (temp, indices, 4 * temp.length); +@@ -1089,13 +1089,13 @@ + } + + void redraw () { +- int /*long*/ parentHandle = parent.handle; ++ long /*int*/ parentHandle = parent.handle; + if ((OS.GTK_WIDGET_FLAGS (parentHandle) & OS.GTK_REALIZED) != 0) { +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + GdkRectangle rect = new GdkRectangle (); + OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect); + OS.gtk_tree_path_free (path); +- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle); ++ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle); + rect.x = 0; + int [] w = new int [1], h = new int [1]; + OS.gdk_drawable_get_size (window, w, h); +@@ -1136,15 +1136,15 @@ + */ + public void removeAll () { + checkWidget (); +- int /*long*/ modelHandle = parent.modelHandle; ++ long /*int*/ modelHandle = parent.modelHandle; + int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle); + if (length == 0) return; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (iter == 0) error (SWT.ERROR_NO_HANDLES); + if (parent.fixAccessibility ()) { + parent.ignoreAccessibility = true; + } +- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle); + int [] value = new int [1]; + while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) { + OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1); +@@ -1249,16 +1249,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -1309,7 +1309,7 @@ + */ + public void setExpanded (boolean expanded) { + checkWidget(); +- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle); + if (expanded) { + OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW); + OS.gtk_tree_view_expand_row (parent.handle, path, false); +@@ -1351,7 +1351,7 @@ + if (oldFont == font) return; + this.font = font; + if (oldFont != null && oldFont.equals (font)) return; +- int /*long*/ fontHandle = font != null ? font.handle : 0; ++ long /*int*/ fontHandle = font != null ? font.handle : 0; + OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1); + /* + * Bug in GTK. When using fixed-height-mode, +@@ -1402,7 +1402,7 @@ + if (oldFont != null && oldFont.equals (font)) return; + + int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; +- int /*long*/ fontHandle = font != null ? font.handle : 0; ++ long /*int*/ fontHandle = font != null ? font.handle : 0; + OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1); + /* + * Bug in GTK. When using fixed-height-mode, +@@ -1420,16 +1420,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -1527,16 +1527,16 @@ + boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; + if (!customDraw) { + if ((parent.style & SWT.VIRTUAL) == 0) { +- int /*long*/ parentHandle = parent.handle; +- int /*long*/ column = 0; ++ long /*int*/ parentHandle = parent.handle; ++ long /*int*/ column = 0; + if (parent.columnCount > 0) { + column = parent.columns [index].handle; + } else { + column = OS.gtk_tree_view_get_column (parentHandle, index); + } + if (column == 0) return; +- int /*long*/ textRenderer = parent.getTextRenderer (column); +- int /*long*/ imageRenderer = parent.getPixbufRenderer (column); ++ long /*int*/ textRenderer = parent.getTextRenderer (column); ++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column); + OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0); + OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0); + } +@@ -1569,7 +1569,7 @@ + * GTK+'s "inconsistent" state does not match SWT's concept of grayed. + * Render checked+grayed as "inconsistent", unchecked+grayed as blank. + */ +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1); + OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1); + cached = true; +@@ -1601,7 +1601,7 @@ + } + int count = Math.max (1, parent.getColumnCount ()); + if (0 > index || index > count - 1) return; +- int /*long*/ pixbuf = 0; ++ long /*int*/ pixbuf = 0; + if (image != null) { + ImageList imageList = parent.imageList; + if (imageList == null) imageList = parent.imageList = new ImageList (); +@@ -1631,10 +1631,10 @@ + if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) { + if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) { + if (image != null) { +- int /*long*/parentHandle = parent.handle; +- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index); ++ long /*int*/parentHandle = parent.handle; ++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index); + int [] w = new int [1]; +- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column); ++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column); + OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w); + if (w[0] < image.getBounds().width) { + /* +@@ -1642,7 +1642,7 @@ + * are relying on the fact that it is done as part of modifying + * the style. + */ +- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle); ++ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle); + parent.modifyStyle (parentHandle, style); + } + } +diff -ur swt-gtk-3.7.orig//org/eclipse/swt/widgets/Tree.java swt-gtk-3.7//org/eclipse/swt/widgets/Tree.java +--- swt-gtk-3.7.orig//org/eclipse/swt/widgets/Tree.java 2011-06-13 20:52:36.000000000 +0000 ++++ swt-gtk-3.7//org/eclipse/swt/widgets/Tree.java 2011-06-13 20:53:32.000000000 +0000 +@@ -75,9 +75,9 @@ + * @noextend This class is not intended to be subclassed by clients. + */ + public class Tree extends Composite { +- int /*long*/ modelHandle, checkRenderer; ++ long /*int*/ modelHandle, checkRenderer; + int columnCount, sortDirection; +- int /*long*/ ignoreCell; ++ long /*int*/ ignoreCell; + TreeItem[] items; + TreeColumn [] columns; + TreeColumn sortColumn; +@@ -155,14 +155,14 @@ + } + } + +-TreeItem _getItem (int /*long*/ iter) { ++TreeItem _getItem (long /*int*/ iter) { + int id = getId (iter, true); + if (items [id] != null) return items [id]; +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + int depth = OS.gtk_tree_path_get_depth (path); + int [] indices = new int [depth]; + OS.memmove (indices, OS.gtk_tree_path_get_indices (path), 4*depth); +- int /*long*/ parentIter = 0; ++ long /*int*/ parentIter = 0; + if (depth > 1) { + OS.gtk_tree_path_up (path); + parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); +@@ -174,8 +174,8 @@ + return items [id]; + } + +-TreeItem _getItem (int /*long*/ parentIter, int index) { +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++TreeItem _getItem (long /*int*/ parentIter, int index) { ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index); + int id = getId (iter, true); + OS.g_free (iter); +@@ -183,7 +183,7 @@ + return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false); + } + +-int getId (int /*long*/ iter, boolean queryModel) { ++int getId (long /*int*/ iter, boolean queryModel) { + if (queryModel) { + int[] value = new int[1]; + OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1); +@@ -219,7 +219,7 @@ + return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0); + } + +-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) { ++long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) { + if (cell == ignoreCell) return 0; + TreeItem item = _getItem (iter); + if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle); +@@ -246,7 +246,7 @@ + * fix is to only provide the data if the row is visible. + */ + if (OS.GTK_VERSION < OS.VERSION (2, 3, 2)) { +- int /*long*/ path = OS.gtk_tree_model_get_path (tree_model, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (tree_model, iter); + OS.gtk_widget_realize (handle); + GdkRectangle visible = new GdkRectangle (); + OS.gtk_tree_view_get_visible_rect (handle, visible); +@@ -268,7 +268,7 @@ + setData = checkData (item); + } + } +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + if (setData) { + if (isPixbuf) { + ptr [0] = 0; +@@ -406,7 +406,7 @@ + addListener (SWT.Collapse, typedListener); + } + +-int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) { ++int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) { + OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false); + /* + * Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size() +@@ -420,7 +420,7 @@ + + int width = 0; + int [] w = new int [1]; +- int /*long*/ path = 0; ++ long /*int*/ path = 0; + + if (OS.gtk_tree_view_get_expander_column (handle) == column) { + /* indent */ +@@ -435,11 +435,11 @@ + } + OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0); + width += 2 * w [0]; +- int /*long*/ list = OS.gtk_tree_view_column_get_cell_renderers (column); ++ long /*int*/ list = OS.gtk_tree_view_column_get_cell_renderers (column); + if (list == 0) return 0; +- int /*long*/ temp = list; ++ long /*int*/ temp = list; + while (temp != 0) { +- int /*long*/ renderer = OS.g_list_data (temp); ++ long /*int*/ renderer = OS.g_list_data (temp); + if (renderer != 0) { + OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null); + width += w [0]; +@@ -452,7 +452,7 @@ + if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter); + boolean expanded = OS.gtk_tree_view_row_expanded (handle, path); + if (expanded) { +- int /*long*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter); + while (valid) { + width = Math.max (width, calculateWidth (column, childIter, true)); +@@ -498,8 +498,8 @@ + clear (0, index, all); + } + +-void clear (int /*long*/ parentIter, int index, boolean all) { +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++void clear (long /*int*/ parentIter, int index, boolean all) { ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index); + int[] value = new int[1]; + OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1); +@@ -534,10 +534,10 @@ + checkWidget (); + clearAll (all, 0); + } +-void clearAll (boolean all, int /*long*/ parentIter) { ++void clearAll (boolean all, long /*int*/ parentIter) { + int length = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter); + if (length == 0) return; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter); + int[] value = new int[1]; + while (valid) { +@@ -563,13 +563,13 @@ + return size; + } + +-void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int newStart, int /*long*/ [] types, int /*long*/ oldParent, int /*long*/ newParent, int modelLength) { +- int /*long*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ()); ++void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int newStart, long /*int*/ [] types, long /*int*/ oldParent, long /*int*/ newParent, int modelLength) { ++ long /*int*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ()); + if (OS.gtk_tree_model_iter_children (oldModel, iter, oldParent)) { +- int /*long*/ [] oldItems = new int /*long*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)]; ++ long /*int*/ [] oldItems = new long /*int*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)]; + int oldIndex = 0; + do { +- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (newItem == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_tree_store_append (newModel, newItem, newParent); + int [] index = new int [1]; +@@ -578,9 +578,9 @@ + if (index [0] != -1) { + item = items [index [0]]; + if (item != null) { +- int /*long*/ oldItem = item.handle; ++ long /*int*/ oldItem = item.handle; + oldItems[oldIndex++] = oldItem; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + for (int j = 0; j < FIRST_COLUMN; j++) { + OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1); + OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1); +@@ -605,7 +605,7 @@ + } + } while (OS.gtk_tree_model_iter_next(oldModel, iter)); + for (int i = 0; i < oldItems.length; i++) { +- int /*long*/ oldItem = oldItems [i]; ++ long /*int*/ oldItem = oldItems [i]; + if (oldItem != 0) { + OS.gtk_tree_store_remove (oldModel, oldItem); + OS.g_free (oldItem); +@@ -638,17 +638,17 @@ + modelIndex++; + } + if (modelIndex == modelLength) { +- int /*long*/ oldModel = modelHandle; +- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time +- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types); ++ long /*int*/ oldModel = modelHandle; ++ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time ++ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types); + if (newModel == 0) error (SWT.ERROR_NO_HANDLES); +- copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, modelLength); ++ copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength); + OS.gtk_tree_view_set_model (handle, newModel); + OS.g_object_unref (oldModel); + modelHandle = newModel; + } + } +- int /*long*/ columnHandle = OS.gtk_tree_view_column_new (); ++ long /*int*/ columnHandle = OS.gtk_tree_view_column_new (); + if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES); + if (index == 0 && columnCount > 0) { + TreeColumn checkColumn = columns [0]; +@@ -704,7 +704,7 @@ + OS.gtk_fixed_set_has_window (fixedHandle, true); + scrolledHandle = OS.gtk_scrolled_window_new (0, 0); + if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ [] types = getColumnTypes (1); ++ long /*int*/ [] types = getColumnTypes (1); + modelHandle = OS.gtk_tree_store_newv (types.length, types); + if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES); + handle = OS.gtk_tree_view_new_with_model (modelHandle); +@@ -719,7 +719,7 @@ + OS.gtk_container_add (scrolledHandle, handle); + + int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE; +- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle); + OS.gtk_tree_selection_set_mode (selectionHandle, mode); + OS.gtk_tree_view_set_headers_visible (handle, false); + int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER; +@@ -769,11 +769,11 @@ + } else { + createColumn (column, index); + } +- int /*long*/ boxHandle = OS.gtk_hbox_new (false, 3); ++ long /*int*/ boxHandle = OS.gtk_hbox_new (false, 3); + if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); ++ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null); + if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ imageHandle = OS.gtk_image_new (); ++ long /*int*/ imageHandle = OS.gtk_image_new (); + if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES); + OS.gtk_container_add (boxHandle, imageHandle); + OS.gtk_container_add (boxHandle, labelHandle); +@@ -782,7 +782,7 @@ + column.labelHandle = labelHandle; + column.imageHandle = imageHandle; + OS.gtk_tree_view_column_set_widget (column.handle, boxHandle); +- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle); ++ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle); + while (widget != handle) { + if (OS.GTK_IS_BUTTON (widget)) { + column.buttonHandle = widget; +@@ -816,7 +816,7 @@ + } + } + +-void createItem (TreeItem item, int /*long*/ parentIter, int index) { ++void createItem (TreeItem item, long /*int*/ parentIter, int index) { + int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter); + if (index == -1) index = count; + if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); +@@ -836,7 +836,7 @@ + modelChanged = true; + } + +-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) { ++void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) { + OS.gtk_tree_view_column_clear (columnHandle); + if ((style & SWT.CHECK) != 0 && check) { + OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false); +@@ -859,9 +859,9 @@ + OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle); + } + } +- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new (); ++ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new (); + if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES); +- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new (); ++ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new (); + if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); + + if (ownerDraw) { +@@ -971,7 +971,7 @@ + if (item == null) error (SWT.ERROR_NULL_ARGUMENT); + if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + OS.gtk_tree_selection_unselect_iter (selection, item.handle); + OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); +@@ -989,7 +989,7 @@ + public void deselectAll() { + checkWidget(); + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + OS.gtk_tree_selection_unselect_all (selection); + OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); +@@ -1003,7 +1003,7 @@ + index++; + } + if (index == columnCount) return; +- int /*long*/ columnHandle = column.handle; ++ long /*int*/ columnHandle = column.handle; + if (columnCount == 1) { + firstCustomDraw = column.customDraw; + } +@@ -1011,11 +1011,11 @@ + columns [columnCount] = null; + OS.gtk_tree_view_remove_column (handle, columnHandle); + if (columnCount == 0) { +- int /*long*/ oldModel = modelHandle; +- int /*long*/[] types = getColumnTypes (1); +- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types); ++ long /*int*/ oldModel = modelHandle; ++ long /*int*/[] types = getColumnTypes (1); ++ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types); + if (newModel == 0) error (SWT.ERROR_NO_HANDLES); +- copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, FIRST_COLUMN + CELL_TYPES); ++ copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES); + OS.gtk_tree_view_set_model (handle, newModel); + OS.g_object_unref (oldModel); + modelHandle = newModel; +@@ -1025,7 +1025,7 @@ + for (int i=0; i 0) { +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, 0); + while (valid) { + if (item.handle == iter) { +@@ -1101,7 +1101,7 @@ + OS.g_free (iter); + } + } +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + OS.gtk_tree_store_remove (modelHandle, item.handle); + OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); +@@ -1111,10 +1111,10 @@ + boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) { + boolean selected = false; + if (filter) { +- int /*long*/ [] path = new int /*long*/ [1]; ++ long /*int*/ [] path = new long /*int*/ [1]; + if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) { + if (path [0] != 0) { +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true; + OS.gtk_tree_path_free (path [0]); + } +@@ -1127,7 +1127,7 @@ + return dragDetect; + } + +-int /*long*/ eventWindow () { ++long /*int*/ eventWindow () { + return paintWindow (); + } + +@@ -1165,13 +1165,13 @@ + checkWidget (); + forceResize (); + OS.gtk_widget_realize (handle); +- int /*long*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle); +- int /*long*/ binWindow = OS.gtk_tree_view_get_bin_window (handle); ++ long /*int*/ fixedWindow = OS.GTK_WIDGET_WINDOW (fixedHandle); ++ long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle); + int [] binX = new int [1], binY = new int [1]; + OS.gdk_window_get_origin (binWindow, binX, binY); + int [] fixedX = new int [1], fixedY = new int [1]; + OS.gdk_window_get_origin (fixedWindow, fixedX, fixedY); +- int /*long*/ clientHandle = clientHandle (); ++ long /*int*/ clientHandle = clientHandle (); + int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle); + int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle); + return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height); +@@ -1271,13 +1271,13 @@ + public int [] getColumnOrder () { + checkWidget (); + if (columnCount == 0) return new int [0]; +- int /*long*/ list = OS.gtk_tree_view_get_columns (handle); ++ long /*int*/ list = OS.gtk_tree_view_get_columns (handle); + if (list == 0) return new int [0]; + int i = 0, count = OS.g_list_length (list); + int [] order = new int [count]; +- int /*long*/ temp = list; ++ long /*int*/ temp = list; + while (temp != 0) { +- int /*long*/ column = OS.g_list_data (temp); ++ long /*int*/ column = OS.g_list_data (temp); + if (column != 0) { + for (int j=0; j (rect.y + rect.height)) { +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1); + itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, iter); +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_get_cell_area (handle, path, 0, rect); + expanded = OS.gtk_tree_view_row_expanded (handle, path); + OS.gtk_tree_path_free (path); +@@ -1998,8 +1998,8 @@ + return super.gtk_expose_event (widget, eventPtr); + } + +-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { +- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr); ++long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) { ++ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr); + if (result != 0) return result; + if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) { + /* +@@ -2023,14 +2023,14 @@ + return result; + } + +-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { +- int /*long*/ window = OS.GDK_EVENT_WINDOW (event); ++long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { ++ long /*int*/ window = OS.GDK_EVENT_WINDOW (event); + if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0; + return super.gtk_motion_notify_event (widget, event); + } + +-int /*long*/ gtk_popup_menu (int /*long*/ widget) { +- int /*long*/ result = super.gtk_popup_menu (widget); ++long /*int*/ gtk_popup_menu (long /*int*/ widget) { ++ long /*int*/ result = super.gtk_popup_menu (widget); + /* + * Bug in GTK. The context menu for the typeahead in GtkTreeViewer + * opens in the bottom right corner of the screen when Shift+F10 +@@ -2043,10 +2043,10 @@ + return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result; + } + +-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) { ++long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) { + if (path == 0) return 0; + TreeItem item = null; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) { + int [] index = new int [1]; + OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1); +@@ -2073,7 +2073,7 @@ + return 0; + } + +-int /*long*/ gtk_start_interactive_search(int /*long*/ widget) { ++long /*int*/ gtk_start_interactive_search(long /*int*/ widget) { + if (!searchEnabled()) { + OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search); + return 1; +@@ -2081,7 +2081,7 @@ + return 0; + } + +-int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) { ++long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { + int [] index = new int [1]; + OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1); + TreeItem item = items [index [0]]; +@@ -2119,7 +2119,7 @@ + return 0; + } + +-int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) { ++long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) { + int [] index = new int [1]; + OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1); + TreeItem item = items [index [0]]; +@@ -2161,11 +2161,11 @@ + return 0; + } + +-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) { +- int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr); ++long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { ++ long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr); + if (path == 0) return 0; + TreeItem item = null; +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof()); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof()); + if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) { + item = _getItem (iter); + } +@@ -2181,7 +2181,7 @@ + return 0; + } + +-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { ++void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) { + /* + * Bug in GTK. For some reason, gtk_widget_size_request() fails + * to include the height of the tree view items when there are +@@ -2192,17 +2192,17 @@ + super.gtk_widget_size_request (widget, requisition); + return; + } +- int /*long*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns; ++ long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns; + boolean fixVisible = columns != 0; + while (list != 0) { +- int /*long*/ column = OS.g_list_data (list); ++ long /*int*/ column = OS.g_list_data (list); + if (OS.gtk_tree_view_column_get_visible (column)) { + fixVisible = false; + break; + } + list = OS.g_list_next (list); + } +- int /*long*/ columnHandle = 0; ++ long /*int*/ columnHandle = 0; + if (fixVisible) { + columnHandle = OS.g_list_data (columns); + OS.gtk_tree_view_column_set_visible (columnHandle, true); +@@ -2215,13 +2215,13 @@ + } + + void hideFirstColumn () { +- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0); ++ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0); + OS.gtk_tree_view_column_set_visible (firstColumn, false); + } + + void hookEvents () { + super.hookEvents (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle); + OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false); + OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false); + OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false); +@@ -2290,10 +2290,10 @@ + if (item == null) error (SWT.ERROR_NULL_ARGUMENT); + if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); + int index = -1; +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); + int depth = OS.gtk_tree_path_get_depth (path); + if (depth == 1) { +- int /*long*/ indices = OS.gtk_tree_path_get_indices (path); ++ long /*int*/ indices = OS.gtk_tree_path_get_indices (path); + if (indices != 0) { + int[] temp = new int[1]; + OS.memmove (temp, indices, 4); +@@ -2306,7 +2306,7 @@ + + boolean mnemonicHit (char key) { + for (int i=0; i end) return; + int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter); + if (!(0 <= start && start <= end && end < itemCount)) { + error (SWT.ERROR_INVALID_RANGE); + } +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); +- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + if (iter == 0) error (SWT.ERROR_NO_HANDLES); + if (fixAccessibility ()) { + ignoreAccessibility = true; +@@ -2466,7 +2466,7 @@ + if (item != null && !item.isDisposed ()) item.release (false); + } + items = new TreeItem[4]; +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + if (fixAccessibility ()) { + ignoreAccessibility = true; +@@ -2550,19 +2550,19 @@ + eventTable.unhook (SWT.Collapse, listener); + } + +-int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) { +- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); ++long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ widget, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) { ++ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); + GtkCellRendererClass klass = new GtkCellRendererClass (); + OS.memmove (klass, g_class); +- int /*long*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height); ++ long /*int*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height); + if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) { +- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); ++ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + TreeItem item = null; + if (iter != 0) item = _getItem (iter); + if (item != null) { + int columnIndex = 0; + if (columnCount > 0) { +- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); ++ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + for (int i = 0; i < columnCount; i++) { + if (columns [i].handle == columnHandle) { + columnIndex = i; +@@ -2589,8 +2589,8 @@ + event.gc = gc; + event.width = contentWidth [0]; + event.height = contentHeight [0]; +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + if (OS.gtk_tree_selection_path_is_selected (selection, path)) { + event.detail = SWT.SELECTED; + } +@@ -2607,11 +2607,11 @@ + return result; + } + +-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) { ++long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { + TreeItem item = null; +- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); ++ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2); + if (iter != 0) item = _getItem (iter); +- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); ++ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1); + int columnIndex = 0; + if (columnCount > 0) { + for (int i = 0; i < columnCount; i++) { +@@ -2625,7 +2625,7 @@ + if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) { + drawFlags = (int)/*64*/flags; + drawState = SWT.FOREGROUND; +- int /*long*/ [] ptr = new int /*long*/ [1]; ++ long /*int*/ [] ptr = new long /*int*/ [1]; + OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1); + if (ptr [0] == 0) { + int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex; +@@ -2636,7 +2636,7 @@ + if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED; + + GdkRectangle rect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect); + OS.gtk_tree_path_free (path); + +@@ -2650,7 +2650,7 @@ + } + + //send out measure before erase +- int /*long*/ textRenderer = getTextRenderer (columnHandle); ++ long /*int*/ textRenderer = getTextRenderer (columnHandle); + if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null); + + if (hooks (SWT.EraseItem)) { +@@ -2687,7 +2687,7 @@ + if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED; + if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED; + if ((drawState & SWT.SELECTED) != 0) { +- int /*long*/ style = OS.gtk_widget_get_style (widget); ++ long /*int*/ style = OS.gtk_widget_get_style (widget); + //TODO - parity and sorted + byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true); + OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height); +@@ -2698,7 +2698,7 @@ + } + } + } +- int /*long*/ result = 0; ++ long /*int*/ result = 0; + if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) { + GC gc = new GC (this); + gc.setBackground (item.getBackground (columnIndex)); +@@ -2708,7 +2708,7 @@ + gc.dispose (); + } + if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) { +- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); ++ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell)); + GtkCellRendererClass klass = new GtkCellRendererClass (); + OS.memmove (klass, g_class); + if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) { +@@ -2721,7 +2721,7 @@ + if (hooks (SWT.PaintItem)) { + GdkRectangle rect = new GdkRectangle (); + GdkRectangle clipRect = new GdkRectangle (); +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect); + OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect); + OS.gtk_tree_path_free (path); +@@ -2785,8 +2785,8 @@ + for (int i=0; i 1)) return; + boolean fixColumn = showFirstColumn (); +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); + boolean first = true; + for (int i = 0; i < length; i++) { +@@ -3195,7 +3195,7 @@ + if (item == null) continue; + if (item.isDisposed ()) break; + if (item.parent != this) continue; +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); + showItem (path, false); + if (first) { + OS.gtk_tree_view_set_cursor (handle, path, 0, false); +@@ -3288,7 +3288,7 @@ + if (item == null) error (SWT.ERROR_NULL_ARGUMENT); + if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); + if (item.parent != this) return; +- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); ++ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle); + showItem (path, false); + OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f); + if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) { +@@ -3363,10 +3363,10 @@ + */ + int columnCount = Math.max (1, this.columnCount); + for (int i=0; i 1) { + int [] indices = new int [depth - 1]; +- int /*long*/ indicesPtr = OS.gtk_tree_path_get_indices (path); ++ long /*int*/ indicesPtr = OS.gtk_tree_path_get_indices (path); + OS.memmove (indices, indicesPtr, indices.length * 4); +- int /*long*/ tempPath = OS.gtk_tree_path_new (); ++ long /*int*/ tempPath = OS.gtk_tree_path_new (); + for (int i=0; i