debian/0000755000000000000000000000000012163212507007165 5ustar debian/libswt-gtk-3-java.links0000644000000000000000000000016412163212507013376 0ustar usr/lib/java/swt-gtk-3.8.2.jar usr/share/java/swt-gtk-3.8.jar usr/lib/java/swt-gtk-3.8.2.jar usr/share/java/swt.jar debian/libswt-gtk-3-jni.lintian-overrides0000644000000000000000000000023612163212507015553 0ustar libswt-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-atk-gtk-*.so libswt-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-gtk-*.so debian/README.Debian0000644000000000000000000000133412163212507011227 0ustar 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 debian/watch0000644000000000000000000000015112163212507010213 0ustar version=3 http://mirror.cc.vt.edu/pub/eclipse/eclipse/downloads/drops/R-(.*)/swt-(.*)-gtk-linux-x86\.zip debian/rules0000755000000000000000000000165312163212507010252 0ustar #!/usr/bin/make -f export DEB_CFLAGS_MAINT_APPEND=-fPIC include /usr/share/dpkg/buildflags.mk CFLAGS+=$(CPPFLAGS) export DEB_LDFLAGS := $(LDFLAGS) include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/javahelper/java-vars.mk include /usr/share/gcj/debian_defaults DEB_PATCHDIRS = debian/patches/common BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) ifeq (64,$(BITS)) DEB_PATCHDIRS += debian/patches/64 endif # Must be included after setting DEB_PATCHDIRS include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni AWT_LIB_DIR := $(JAVA_ARCH) export AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(AWT_LIB_DIR) makecleanbuildir::patch DEB_MAKE_MAKEFILE = debian/Makefile ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) common-binary-post-install-arch:: dh_nativejava -a endif debian/changelog0000644000000000000000000005234412163212507011047 0ustar swt-gtk (3.8.2-3) unstable; urgency=low * Fix FTBFS with glib 2.35 (Closes: #710649). -- Jakub Adam Wed, 26 Jun 2013 14:49:25 +0200 swt-gtk (3.8.2-2) unstable; urgency=low * Team upload. * Upload to unstable. -- tony mancill Tue, 14 May 2013 22:07:29 -0700 swt-gtk (3.8.2-1) experimental; urgency=low * New upstream release. * Add fix for compatibility with libwebkitgtk-1.0-0 1.11.91-1 (Closes: #704516). * Updated arch64.diff patch for new upstream release. * Reconsidered package description (Closes: #681417). * Bump Standards-Version to 3.9.4. * Use xz compression for orig tarball. * Override hardening-no-fortify-functions false positives. * Removed obsolete d/NEWS.Debian file. -- Jakub Adam Thu, 04 Apr 2013 17:40:20 +0200 swt-gtk (3.8.0~rc4-1) unstable; urgency=low * New upstream release. * Ensure CFLAGS from d/rules are really used. -- Jakub Adam Fri, 29 Jun 2012 10:53:16 +0200 swt-gtk (3.8.0~rc2-3) unstable; urgency=low * Upload to unstable. * Compile java code with source/target 1.5 to ensure java classes are compatible with Java 1.5+. Thanks to James Page for the report and the patch. (Closes: #677025, LP: #1011103) * Add breaks on eclipse-rcp to ensure eclipse 3.7 is not installed with swt-gtk 3.8. -- Niels Thykier Wed, 20 Jun 2012 12:38:50 +0200 swt-gtk (3.8.0~rc2-2) experimental; urgency=low * Prefer tight dependencies between the -JNI libraries to breaks. * Add breaks on the -JNI libraries built from 3.8.0~rc2-1 to ensure the tight dependency is used. * Bump source format to 3.0 (quilt). -- Niels Thykier Mon, 18 Jun 2012 12:42:27 +0200 swt-gtk (3.8.0~rc2-1) experimental; urgency=low [ Niels Thykier ] * Use breaks to ensure that the SWT JNI libraries are upgraded together with the Java package. * Add conflicts with older versions of SWT and its JNI libraries. This avoid this issue new and old versions of SWT and its JNI libraries being used (and crashing). (Closes: #670756, LP: #1000272) * Remove alternatives for /usr/share/java/swt.jar. [ Jakub Adam ] * New upstream release. * Updated arch64.diff patch for new upstream release. -- Jakub Adam Tue, 29 May 2012 17:02:51 +0200 swt-gtk (3.7.2-3) unstable; urgency=low [ Jakub Adam ] * debian/Makefile: Add missing SWTMessages*.properties files to swt-gtk-$(RELEASE).jar [ Niels Thykier ] * Use breaks to ensure that the SWT JNI libraries are upgraded together with the Java package. * Add conflicts with older versions of SWT and its JNI libraries. This avoid this issue new and old versions of SWT and its JNI libraries being used (and crashing). (Closes: #670756, LP: #1000272) * Remove alternatives for /usr/share/java/swt.jar. * Add myself to uploaders. -- Niels Thykier Thu, 24 May 2012 09:18:54 +0200 swt-gtk (3.8.0~m7-2) experimental; urgency=low * Fix build on 64-bit platforms. -- Jakub Adam Thu, 10 May 2012 13:13:13 +0200 swt-gtk (3.8.0~m7-1) experimental; urgency=low [ Jakub Adam ] * New upstream release. * Updated arch64.diff patch for new upstream release. * Updated 01-as-needed.diff patch for new upstream release. [ Niels Thykier ] * Merge make_linux.mak patches and pass LDFLAGS + CPPFLAGS to the underlying build system. * Refactored the d/rules files. -- Jakub Adam Wed, 09 May 2012 17:00:58 +0200 swt-gtk (3.8.0~m6-1) experimental; urgency=low * New upstream release. * debian/Makefile: Add missing SWTMessages*.properties files to swt-gtk-$(RELEASE).jar * Updated 01-as-needed.diff patch for new upstream release. * Updated arch64.diff patch for new upstream release. * Search for JNI libraries in Debian location /usr/lib/jni (Closes: #663734 #665195 #668002) -- Jakub Adam Sun, 29 Apr 2012 21:14:20 +0200 swt-gtk (3.7.2-2) unstable; urgency=low * debian/control: Change build-dep: libwebkit-dev -> libwebkitgtk-dev (Closes: #635428) -- أحمد المحمودي (Ahmed El-Mahmoudy) Tue, 27 Mar 2012 14:55:53 +0200 swt-gtk (3.7.2-1) unstable; urgency=low [ أحمد المحمودي (Ahmed El-Mahmoudy) ] * New upstream release. * Updated arch64.diff patch for new upstream release. * debian/java-config/libswt-gtk-3-java, debian/libswt-gtk-3-java.links, debian/libswt-gtk-3-java.lintian-overrides, debian/manifest: Bumped version. * debian/control: Updated Standards-Version to 3.9.3 * Bumped compat level to 9 * debian/copyright: Updated copyright years & format URL. [ Jakub Adam ] * Add OSGi metadata to jar manifest * Add Jakub Adam to Uploaders -- أحمد المحمودي (Ahmed El-Mahmoudy) Mon, 27 Feb 2012 22:42:15 +0200 swt-gtk (3.7.1-1) unstable; urgency=low * New upstream release * Updated arch64.diff patch for new upstream release. * debian/copyright: Updated copyright format & years * debian/libswt-gtk-3-java.{postinst,prerm}: Modify the alternatives links to /usr/share/java/swt-gtk-.jar instead of /usr/lib/java/swt-gtk-.jar * debian/java-config/libswt-gtk-3-java, debian/libswt-gtk-3-java.links, debian/libswt-gtk-3-java.lintian-overrides: Bumped version * Added format-security.diff patch to fix FTBFS with -Werror=format-security compiler flag set. -- أحمد المحمودي (Ahmed El-Mahmoudy) Fri, 30 Sep 2011 11:27:58 +0200 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 debian/libswt-cairo-gtk-3-jni.install0000644000000000000000000000004312163212507014652 0ustar libswt-cairo-*[0-9].so usr/lib/jni debian/README0000644000000000000000000001676112163212507010060 0ustar 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. debian/libswt-gtk-3-java.preinst0000644000000000000000000000044712163212507013746 0ustar #! /bin/sh set -e case "$1" in install|upgrade) if update-alternatives --list swt.jar >/dev/null 2>&1 ; then update-alternatives --remove-all swt.jar fi ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/libswt-glx-gtk-3-jni.install0000644000000000000000000000004112163212507014345 0ustar libswt-glx-*[0-9].so usr/lib/jni debian/libswt-gnome-gtk-3-jni.install0000644000000000000000000000004312163212507014662 0ustar libswt-gnome-*[0-9].so usr/lib/jni debian/patches/0000755000000000000000000000000012163212507010614 5ustar debian/patches/common/0000755000000000000000000000000012163212507012104 5ustar debian/patches/common/fix-libwebkitgtk-1.11.91-compatibility.diff0000644000000000000000000000241312163212507021661 0ustar From d4cd04aaea5b4d7ddbf4edda1b812ef038faf2c7 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Tue, 2 Apr 2013 23:04:29 +0200 Subject: [PATCH 1/2] fix-libwebkitgtk-1.11.91-compatibility --- org/eclipse/swt/browser/WebKit.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java index 0bae664..34852d5 100644 --- a/org/eclipse/swt/browser/WebKit.java +++ b/org/eclipse/swt/browser/WebKit.java @@ -597,9 +597,13 @@ public void create (Composite parent, int style) { */ int /*long*/ session = WebKitGTK.webkit_get_default_session (); int /*long*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); - WebKitGTK.soup_session_feature_detach (originalAuth, session); + if (originalAuth != 0) { + WebKitGTK.soup_session_feature_detach (originalAuth, session); + } OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); - WebKitGTK.soup_session_feature_attach (originalAuth, session); + if (originalAuth != 0) { + WebKitGTK.soup_session_feature_attach (originalAuth, session); + } /* * Check for proxy values set as documented java properties and update the -- 1.7.10.4 debian/patches/common/fix-glib-2.35-compatibility.patch0000644000000000000000000000237712163212507020073 0ustar From c973b9b9be568ebbce618985bc5ee440babf8ab1 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Thu, 27 Jun 2013 10:16:49 +0200 Subject: [PATCH 1/2] fix-glib-2.35-compatibility g_thread_init() and g_thread_supported() are deprecated and don't have to be used anymore. --- os.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/os.c b/os.c index a3085a1..1e550cc 100644 --- a/os.c +++ b/os.c @@ -4444,9 +4444,9 @@ fail: JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init) (JNIEnv *env, jclass that, jintLong arg0) { - OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC); + /*OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC); g_thread_init((GThreadFunctions *)arg0); - OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC); + OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);*/ } #endif @@ -4454,11 +4454,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init) JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported) (JNIEnv *env, jclass that) { - jboolean rc = 0; + /*jboolean rc = 0; OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC); rc = (jboolean)g_thread_supported(); OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC); - return rc; + return rc;*/ + return 1; } #endif -- 1.7.10.4 debian/patches/common/01-make_linux.patch0000644000000000000000000001174612163212507015510 0ustar Description: Ensure the underlying build system gets the right flags and settings. diff --git a/make_linux.mak b/make_linux.mak index c8cc080..998cfcd 100644 --- a/make_linux.mak +++ b/make_linux.mak @@ -66,6 +66,7 @@ GLXLIBS = -lGL -lGLU -lm # 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 @@ MOZILLACFLAGS = -O \ -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 \ @@ -106,7 +109,7 @@ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o 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 \ @@ -114,8 +117,9 @@ CFLAGS = -O -Wall \ -I$(JAVA_HOME)/include/linux \ -fPIC \ ${SWT_PTR_CFLAGS} -LFLAGS = -shared -fPIC ${SWT_LFLAGS} +LFLAGS += $(DEB_LDFLAGS) -shared -fPIC ${SWT_LFLAGS} +NO_STRIP=1 ifndef NO_STRIP AWT_LFLAGS := $(AWT_LFLAGS) -s MOZILLALFLAGS := $(MOZILLALFLAGS) -s @@ -136,7 +140,7 @@ callback.o: callback.c callback.h $(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 @@ -155,7 +159,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h 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 @@ -171,7 +175,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h 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 @@ -179,7 +183,7 @@ $(CDE_LIB): $(CDE_OBJECTS) make_awt:$(AWT_LIB) $(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) + $(CC) $(AWT_LFLAGS) $(DEB_LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS) # # Atk lib @@ -187,7 +191,7 @@ $(AWT_LIB): $(AWT_OBJECTS) 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 @@ -204,7 +208,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h 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 @@ -221,7 +225,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h 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 +246,7 @@ make_xulrunner:$(XULRUNNER_LIB) $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) echo -e "#include\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so - $(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 +266,7 @@ xpcomxul_stats.o: xpcom_stats.cpp 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 @@ -296,7 +300,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h 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 debian/patches/common/search-usr-lib-jni.diff0000644000000000000000000000214112163212507016332 0ustar From 67941dbb88d763bfbd62825d893c4ed676800ec3 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Sun, 29 Apr 2012 16:46:01 +0200 Subject: [PATCH] Search for JNI libraries in Debian location /usr/lib/jni This allows Sun/Oracle JRE to find the libraries. --- org/eclipse/swt/internal/Library.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java index d76b39a..12374a2 100644 --- a/org/eclipse/swt/internal/Library.java +++ b/org/eclipse/swt/internal/Library.java @@ -302,6 +302,10 @@ public static void loadLibrary (String name, boolean mapName) { if (load (libName1, message)) return; if (mapName && load (libName2, message)) return; + /* Try the Debian location /usr/lib/jni/ */ + if (load ("/usr/lib/jni" + SEPARATOR + mappedName1, message)) return; + if (mapName && load ("/usr/lib/jni" + SEPARATOR + mappedName2, message)) return; + /* Try loading library from the tmp directory if swt library path is not specified */ String fileName1 = mappedName1; String fileName2 = mappedName2; -- 1.7.10 debian/patches/common/format-security.diff0000644000000000000000000000166312163212507016101 0ustar Description: Fix FTBFS with -Werror=format-security compiler flag set Author: أحمد المحمودي (Ahmed El-Mahmoudy) Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=359538 Forwarded: https://bugs.eclipse.org/bugs/attachment.cgi?id=204356 --- a/os.c +++ b/os.c @@ -10830,7 +10830,7 @@ jintLong rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC); if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4); + rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, "%s", (const gchar *)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC); debian/patches/64/0000755000000000000000000000000012163212507011045 5ustar debian/patches/64/arch64.diff0000644000000000000000001240423412163212507013000 0ustar From 40ca684f2e41541516c4fb861e1615f9ad042658 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Thu, 4 Apr 2013 17:28:50 +0200 Subject: [PATCH] arch64.diff --- org/eclipse/swt/accessibility/Accessible.java | 10 +- .../swt/accessibility/AccessibleFactory.java | 82 +- .../swt/accessibility/AccessibleObject.java | 384 +- org/eclipse/swt/awt/SWT_AWT.java | 10 +- org/eclipse/swt/browser/AppFileLocProvider.java | 56 +- org/eclipse/swt/browser/Download.java | 166 +- org/eclipse/swt/browser/DownloadFactory.java | 30 +- org/eclipse/swt/browser/DownloadFactory_1_8.java | 30 +- org/eclipse/swt/browser/Download_1_8.java | 186 +- org/eclipse/swt/browser/External.java | 214 +- org/eclipse/swt/browser/ExternalFactory.java | 30 +- org/eclipse/swt/browser/FilePicker.java | 96 +- org/eclipse/swt/browser/FilePickerFactory.java | 34 +- org/eclipse/swt/browser/FilePicker_10.java | 46 +- org/eclipse/swt/browser/FilePicker_1_8.java | 46 +- .../swt/browser/HelperAppLauncherDialog.java | 36 +- .../browser/HelperAppLauncherDialogFactory.java | 34 +- .../swt/browser/HelperAppLauncherDialog_10.java | 6 +- .../swt/browser/HelperAppLauncherDialog_1_9.java | 32 +- org/eclipse/swt/browser/InputStream.java | 36 +- org/eclipse/swt/browser/Mozilla.java | 524 +- org/eclipse/swt/browser/MozillaDelegate.java | 26 +- org/eclipse/swt/browser/PromptAuth2.java | 42 +- org/eclipse/swt/browser/PromptDialog.java | 2 +- org/eclipse/swt/browser/PromptFactory.java | 30 +- org/eclipse/swt/browser/PromptService2.java | 128 +- org/eclipse/swt/browser/PromptService2Factory.java | 32 +- org/eclipse/swt/browser/Prompter.java | 98 +- org/eclipse/swt/browser/SimpleEnumerator.java | 32 +- org/eclipse/swt/browser/WebKit.java | 258 +- org/eclipse/swt/browser/WindowCreator2.java | 54 +- org/eclipse/swt/dnd/ByteArrayTransfer.java | 2 +- org/eclipse/swt/dnd/Clipboard.java | 22 +- org/eclipse/swt/dnd/ClipboardProxy.java | 18 +- org/eclipse/swt/dnd/DragSource.java | 22 +- org/eclipse/swt/dnd/DropTarget.java | 28 +- org/eclipse/swt/dnd/FileTransfer.java | 30 +- org/eclipse/swt/dnd/HTMLTransfer.java | 2 +- org/eclipse/swt/dnd/ImageTransfer.java | 10 +- org/eclipse/swt/dnd/RTFTransfer.java | 2 +- org/eclipse/swt/dnd/TableDragSourceEffect.java | 24 +- org/eclipse/swt/dnd/TableDropTargetEffect.java | 8 +- org/eclipse/swt/dnd/TextTransfer.java | 12 +- org/eclipse/swt/dnd/TransferData.java | 4 +- org/eclipse/swt/dnd/TreeDragSourceEffect.java | 24 +- org/eclipse/swt/dnd/TreeDropTargetEffect.java | 8 +- org/eclipse/swt/dnd/URLTransfer.java | 2 +- org/eclipse/swt/graphics/Color.java | 4 +- org/eclipse/swt/graphics/Cursor.java | 18 +- org/eclipse/swt/graphics/Device.java | 40 +- org/eclipse/swt/graphics/Drawable.java | 4 +- org/eclipse/swt/graphics/Font.java | 8 +- org/eclipse/swt/graphics/GC.java | 290 +- org/eclipse/swt/graphics/GCData.java | 12 +- org/eclipse/swt/graphics/Image.java | 122 +- org/eclipse/swt/graphics/Path.java | 22 +- org/eclipse/swt/graphics/Pattern.java | 4 +- org/eclipse/swt/graphics/Region.java | 14 +- org/eclipse/swt/graphics/TextLayout.java | 98 +- org/eclipse/swt/internal/BidiUtil.java | 6 +- org/eclipse/swt/internal/C.java | 44 +- org/eclipse/swt/internal/Callback.java | 8 +- org/eclipse/swt/internal/Converter.java | 8 +- org/eclipse/swt/internal/ImageList.java | 48 +- org/eclipse/swt/internal/LONG.java | 4 +- org/eclipse/swt/internal/Library.java | 2 +- .../swt/internal/accessibility/gtk/ATK.java | 204 +- .../internal/accessibility/gtk/AtkActionIface.java | 12 +- .../internal/accessibility/gtk/AtkAttribute.java | 4 +- .../accessibility/gtk/AtkComponentIface.java | 26 +- .../accessibility/gtk/AtkEditableTextIface.java | 14 +- .../accessibility/gtk/AtkHypertextIface.java | 6 +- .../internal/accessibility/gtk/AtkObjectClass.java | 48 +- .../accessibility/gtk/AtkObjectFactoryClass.java | 6 +- .../accessibility/gtk/AtkSelectionIface.java | 16 +- .../internal/accessibility/gtk/AtkTableIface.java | 72 +- .../internal/accessibility/gtk/AtkTextIface.java | 44 +- .../internal/accessibility/gtk/AtkTextRange.java | 2 +- .../internal/accessibility/gtk/AtkValueIface.java | 8 +- .../internal/accessibility/gtk/GtkAccessible.java | 2 +- org/eclipse/swt/internal/cairo/Cairo.java | 546 +-- org/eclipse/swt/internal/cairo/cairo_path_t.java | 2 +- org/eclipse/swt/internal/cde/CDE.java | 60 +- org/eclipse/swt/internal/cde/DtActionArg.java | 2 +- org/eclipse/swt/internal/gnome/GNOME.java | 86 +- .../internal/gnome/GnomeVFSMimeApplication.java | 8 +- org/eclipse/swt/internal/gtk/GInterfaceInfo.java | 6 +- org/eclipse/swt/internal/gtk/GObjectClass.java | 14 +- org/eclipse/swt/internal/gtk/GTypeInfo.java | 14 +- org/eclipse/swt/internal/gtk/GTypeQuery.java | 2 +- org/eclipse/swt/internal/gtk/GdkDragContext.java | 6 +- org/eclipse/swt/internal/gtk/GdkEventAny.java | 2 +- org/eclipse/swt/internal/gtk/GdkEventButton.java | 6 +- org/eclipse/swt/internal/gtk/GdkEventCrossing.java | 4 +- org/eclipse/swt/internal/gtk/GdkEventExpose.java | 4 +- org/eclipse/swt/internal/gtk/GdkEventFocus.java | 2 +- org/eclipse/swt/internal/gtk/GdkEventKey.java | 4 +- org/eclipse/swt/internal/gtk/GdkEventMotion.java | 6 +- org/eclipse/swt/internal/gtk/GdkEventProperty.java | 4 +- org/eclipse/swt/internal/gtk/GdkEventScroll.java | 4 +- .../swt/internal/gtk/GdkEventVisibility.java | 2 +- .../swt/internal/gtk/GdkEventWindowState.java | 2 +- org/eclipse/swt/internal/gtk/GdkGCValues.java | 10 +- org/eclipse/swt/internal/gtk/GdkImage.java | 8 +- org/eclipse/swt/internal/gtk/GdkWindowAttr.java | 12 +- .../swt/internal/gtk/GtkCellRendererClass.java | 4 +- .../swt/internal/gtk/GtkColorSelectionDialog.java | 8 +- org/eclipse/swt/internal/gtk/GtkFixed.java | 2 +- org/eclipse/swt/internal/gtk/GtkSelectionData.java | 8 +- org/eclipse/swt/internal/gtk/GtkTargetEntry.java | 2 +- org/eclipse/swt/internal/gtk/GtkTargetPair.java | 2 +- org/eclipse/swt/internal/gtk/GtkWidgetClass.java | 124 +- org/eclipse/swt/internal/gtk/OS.java | 4986 ++++++++++---------- org/eclipse/swt/internal/gtk/PangoAttribute.java | 2 +- org/eclipse/swt/internal/gtk/PangoItem.java | 10 +- org/eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +- org/eclipse/swt/internal/gtk/PangoLayoutRun.java | 4 +- org/eclipse/swt/internal/gtk/XAnyEvent.java | 6 +- .../swt/internal/gtk/XClientMessageEvent.java | 10 +- org/eclipse/swt/internal/gtk/XCrossingEvent.java | 4 +- .../swt/internal/gtk/XRenderPictureAttributes.java | 6 +- org/eclipse/swt/internal/gtk/XWindowChanges.java | 2 +- org/eclipse/swt/internal/mozilla/XPCOM.java | 986 ++-- org/eclipse/swt/internal/mozilla/XPCOMObject.java | 652 +-- .../swt/internal/mozilla/init/GREProperty.java | 4 +- .../swt/internal/mozilla/init/GREVersionRange.java | 4 +- .../swt/internal/mozilla/init/XPCOMInit.java | 4 +- .../internal/mozilla/nsDynamicFunctionLoad.java | 4 +- .../swt/internal/mozilla/nsEmbedString.java | 6 +- org/eclipse/swt/internal/mozilla/nsIAppShell.java | 10 +- .../swt/internal/mozilla/nsIAuthInformation.java | 18 +- .../swt/internal/mozilla/nsIAuthPrompt2.java | 6 +- .../swt/internal/mozilla/nsIBadCertListener2.java | 4 +- .../swt/internal/mozilla/nsIBaseWindow.java | 16 +- .../swt/internal/mozilla/nsICancelable.java | 2 +- .../swt/internal/mozilla/nsICategoryManager.java | 10 +- .../internal/mozilla/nsICertOverrideService.java | 14 +- .../internal/mozilla/nsICertificateDialogs.java | 14 +- org/eclipse/swt/internal/mozilla/nsIChannel.java | 34 +- org/eclipse/swt/internal/mozilla/nsIClassInfo.java | 14 +- .../swt/internal/mozilla/nsIComponentManager.java | 10 +- .../internal/mozilla/nsIComponentRegistrar.java | 22 +- .../internal/mozilla/nsIContextMenuListener.java | 4 +- org/eclipse/swt/internal/mozilla/nsICookie.java | 14 +- .../swt/internal/mozilla/nsICookieManager.java | 6 +- .../swt/internal/mozilla/nsICookieService.java | 10 +- .../swt/internal/mozilla/nsICookieService_1_9.java | 10 +- org/eclipse/swt/internal/mozilla/nsID.java | 4 +- .../swt/internal/mozilla/nsIDOMDocument.java | 114 +- .../swt/internal/mozilla/nsIDOMElement.java | 42 +- org/eclipse/swt/internal/mozilla/nsIDOMEvent.java | 12 +- .../swt/internal/mozilla/nsIDOMEventTarget.java | 10 +- .../swt/internal/mozilla/nsIDOMKeyEvent.java | 4 +- .../swt/internal/mozilla/nsIDOMMouseEvent.java | 8 +- org/eclipse/swt/internal/mozilla/nsIDOMNode.java | 68 +- .../swt/internal/mozilla/nsIDOMSerializer.java | 6 +- .../swt/internal/mozilla/nsIDOMSerializer_1_7.java | 6 +- .../swt/internal/mozilla/nsIDOMUIEvent.java | 8 +- org/eclipse/swt/internal/mozilla/nsIDOMWindow.java | 170 +- .../internal/mozilla/nsIDOMWindowCollection.java | 6 +- org/eclipse/swt/internal/mozilla/nsIDataType.java | 2 +- .../swt/internal/mozilla/nsIDirectoryService.java | 6 +- .../mozilla/nsIDirectoryServiceProvider.java | 4 +- .../mozilla/nsIDirectoryServiceProvider2.java | 4 +- org/eclipse/swt/internal/mozilla/nsIDocShell.java | 38 +- org/eclipse/swt/internal/mozilla/nsIDownload.java | 22 +- .../swt/internal/mozilla/nsIDownload_1_8.java | 18 +- .../internal/mozilla/nsIEmbeddingSiteWindow.java | 6 +- org/eclipse/swt/internal/mozilla/nsIFactory.java | 4 +- org/eclipse/swt/internal/mozilla/nsIFile.java | 44 +- .../swt/internal/mozilla/nsIFilePicker.java | 20 +- .../swt/internal/mozilla/nsIFilePicker_1_8.java | 26 +- .../swt/internal/mozilla/nsIFocusManager.java | 38 +- .../swt/internal/mozilla/nsIHelperAppLauncher.java | 16 +- .../mozilla/nsIHelperAppLauncherDialog.java | 8 +- .../mozilla/nsIHelperAppLauncherDialog_1_9.java | 6 +- .../internal/mozilla/nsIHelperAppLauncher_1_8.java | 18 +- .../internal/mozilla/nsIHelperAppLauncher_1_9.java | 18 +- .../internal/mozilla/nsIHelperAppLauncher_8.java | 20 +- .../swt/internal/mozilla/nsIHttpChannel.java | 24 +- .../swt/internal/mozilla/nsIHttpHeaderVisitor.java | 4 +- org/eclipse/swt/internal/mozilla/nsIIOService.java | 14 +- .../swt/internal/mozilla/nsIInputStream.java | 4 +- .../internal/mozilla/nsIInterfaceRequestor.java | 4 +- .../swt/internal/mozilla/nsIJSContextStack.java | 8 +- org/eclipse/swt/internal/mozilla/nsILocalFile.java | 26 +- .../swt/internal/mozilla/nsIMIMEInputStream.java | 4 +- org/eclipse/swt/internal/mozilla/nsIMemory.java | 8 +- .../swt/internal/mozilla/nsIObserverService.java | 10 +- .../swt/internal/mozilla/nsIPrefBranch.java | 12 +- .../internal/mozilla/nsIPrefLocalizedString.java | 6 +- .../swt/internal/mozilla/nsIPrefService.java | 10 +- org/eclipse/swt/internal/mozilla/nsIPrincipal.java | 48 +- .../swt/internal/mozilla/nsIProgressDialog.java | 8 +- .../internal/mozilla/nsIProgressDialog_1_8.java | 12 +- org/eclipse/swt/internal/mozilla/nsIPrompt.java | 2 +- .../swt/internal/mozilla/nsIPromptFactory.java | 4 +- .../swt/internal/mozilla/nsIPromptService.java | 20 +- .../swt/internal/mozilla/nsIPromptService2.java | 6 +- .../swt/internal/mozilla/nsIProperties.java | 8 +- org/eclipse/swt/internal/mozilla/nsIRequest.java | 12 +- org/eclipse/swt/internal/mozilla/nsISSLStatus.java | 6 +- .../internal/mozilla/nsIScriptSecurityManager.java | 48 +- .../swt/internal/mozilla/nsISeekableStream.java | 2 +- .../swt/internal/mozilla/nsISerializable.java | 6 +- .../swt/internal/mozilla/nsIServiceManager.java | 6 +- .../swt/internal/mozilla/nsISimpleEnumerator.java | 4 +- org/eclipse/swt/internal/mozilla/nsISupports.java | 8 +- .../internal/mozilla/nsISupportsWeakReference.java | 4 +- .../swt/internal/mozilla/nsITooltipListener.java | 2 +- org/eclipse/swt/internal/mozilla/nsITransfer.java | 4 +- org/eclipse/swt/internal/mozilla/nsIURI.java | 58 +- .../internal/mozilla/nsIURIContentListener.java | 18 +- .../swt/internal/mozilla/nsIUploadChannel.java | 6 +- org/eclipse/swt/internal/mozilla/nsIVariant.java | 38 +- .../swt/internal/mozilla/nsIWeakReference.java | 4 +- .../swt/internal/mozilla/nsIWebBrowser.java | 16 +- .../swt/internal/mozilla/nsIWebBrowserChrome.java | 6 +- .../internal/mozilla/nsIWebBrowserChromeFocus.java | 2 +- .../swt/internal/mozilla/nsIWebBrowserFocus.java | 10 +- .../swt/internal/mozilla/nsIWebBrowserSetup.java | 2 +- .../swt/internal/mozilla/nsIWebBrowserStream.java | 6 +- .../swt/internal/mozilla/nsIWebNavigation.java | 14 +- .../swt/internal/mozilla/nsIWebNavigationInfo.java | 4 +- .../swt/internal/mozilla/nsIWebProgress.java | 8 +- .../internal/mozilla/nsIWebProgressListener.java | 12 +- .../internal/mozilla/nsIWebProgressListener2.java | 4 +- .../swt/internal/mozilla/nsIWindowCreator.java | 4 +- .../swt/internal/mozilla/nsIWindowCreator2.java | 4 +- .../swt/internal/mozilla/nsIWindowWatcher.java | 24 +- .../swt/internal/mozilla/nsIWritableVariant.java | 20 +- org/eclipse/swt/internal/mozilla/nsIX509Cert.java | 54 +- .../swt/internal/mozilla/nsIX509CertValidity.java | 18 +- .../internal/mozilla/nsIXPCSecurityManager.java | 10 +- org/eclipse/swt/internal/mozilla/nsIXPConnect.java | 6 +- org/eclipse/swt/internal/opengl/glx/GLX.java | 70 +- .../swt/internal/opengl/glx/XVisualInfo.java | 2 +- org/eclipse/swt/internal/theme/ButtonDrawData.java | 18 +- org/eclipse/swt/internal/theme/ComboDrawData.java | 14 +- org/eclipse/swt/internal/theme/DrawData.java | 26 +- .../swt/internal/theme/ExpanderDrawData.java | 8 +- org/eclipse/swt/internal/theme/GroupDrawData.java | 6 +- .../swt/internal/theme/ProgressBarDrawData.java | 6 +- .../swt/internal/theme/TabFolderDrawData.java | 6 +- .../swt/internal/theme/TabItemDrawData.java | 10 +- org/eclipse/swt/internal/theme/Theme.java | 18 +- .../swt/internal/theme/ToolBarDrawData.java | 6 +- .../swt/internal/theme/ToolItemDrawData.java | 20 +- .../swt/internal/webkit/JSClassDefinition.java | 30 +- org/eclipse/swt/internal/webkit/WebKitGTK.java | 434 +- org/eclipse/swt/opengl/GLCanvas.java | 34 +- org/eclipse/swt/printing/PrintDialog.java | 28 +- org/eclipse/swt/printing/Printer.java | 62 +- org/eclipse/swt/program/Program.java | 134 +- org/eclipse/swt/widgets/Button.java | 36 +- org/eclipse/swt/widgets/Canvas.java | 36 +- org/eclipse/swt/widgets/Caret.java | 10 +- org/eclipse/swt/widgets/ColorDialog.java | 20 +- org/eclipse/swt/widgets/Combo.java | 134 +- org/eclipse/swt/widgets/Composite.java | 128 +- org/eclipse/swt/widgets/Control.java | 364 +- org/eclipse/swt/widgets/DateTime.java | 8 +- org/eclipse/swt/widgets/Decorations.java | 18 +- org/eclipse/swt/widgets/DirectoryDialog.java | 24 +- org/eclipse/swt/widgets/Display.java | 298 +- org/eclipse/swt/widgets/ExpandBar.java | 22 +- org/eclipse/swt/widgets/ExpandItem.java | 18 +- org/eclipse/swt/widgets/FileDialog.java | 42 +- org/eclipse/swt/widgets/FontDialog.java | 16 +- org/eclipse/swt/widgets/Group.java | 10 +- org/eclipse/swt/widgets/IME.java | 20 +- org/eclipse/swt/widgets/Label.java | 22 +- org/eclipse/swt/widgets/Link.java | 24 +- org/eclipse/swt/widgets/List.java | 156 +- org/eclipse/swt/widgets/Menu.java | 40 +- org/eclipse/swt/widgets/MenuItem.java | 46 +- org/eclipse/swt/widgets/MessageBox.java | 10 +- org/eclipse/swt/widgets/Monitor.java | 2 +- org/eclipse/swt/widgets/ProgressBar.java | 8 +- org/eclipse/swt/widgets/Sash.java | 40 +- org/eclipse/swt/widgets/Scale.java | 14 +- org/eclipse/swt/widgets/ScrollBar.java | 18 +- org/eclipse/swt/widgets/Scrollable.java | 22 +- org/eclipse/swt/widgets/Shell.java | 134 +- org/eclipse/swt/widgets/Slider.java | 36 +- org/eclipse/swt/widgets/Spinner.java | 114 +- org/eclipse/swt/widgets/TabFolder.java | 42 +- org/eclipse/swt/widgets/TabItem.java | 10 +- org/eclipse/swt/widgets/Table.java | 356 +- org/eclipse/swt/widgets/TableColumn.java | 28 +- org/eclipse/swt/widgets/TableItem.java | 92 +- org/eclipse/swt/widgets/Text.java | 214 +- org/eclipse/swt/widgets/ToolBar.java | 32 +- org/eclipse/swt/widgets/ToolItem.java | 72 +- org/eclipse/swt/widgets/ToolTip.java | 54 +- org/eclipse/swt/widgets/TouchSource.java | 4 +- org/eclipse/swt/widgets/Tracker.java | 26 +- org/eclipse/swt/widgets/TrayItem.java | 40 +- org/eclipse/swt/widgets/Tree.java | 374 +- org/eclipse/swt/widgets/TreeColumn.java | 28 +- org/eclipse/swt/widgets/TreeItem.java | 116 +- org/eclipse/swt/widgets/Widget.java | 200 +- 302 files changed, 9042 insertions(+), 9042 deletions(-) diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java index 9c2821c..2b8fcc0 100644 --- a/org/eclipse/swt/accessibility/Accessible.java +++ b/org/eclipse/swt/accessibility/Accessible.java @@ -468,14 +468,14 @@ public class Accessible { 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 --git a/org/eclipse/swt/accessibility/AccessibleFactory.java b/org/eclipse/swt/accessibility/AccessibleFactory.java index 03e4031..585d12c 100644 --- a/org/eclipse/swt/accessibility/AccessibleFactory.java +++ b/org/eclipse/swt/accessibility/AccessibleFactory.java @@ -157,14 +157,14 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { } 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { } 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 @@ class AccessibleFactory { 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 @@ class AccessibleFactory { } 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 --git a/org/eclipse/swt/accessibility/AccessibleObject.java b/org/eclipse/swt/accessibility/AccessibleObject.java index 92c38a3..edd3d8e 100644 --- a/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/org/eclipse/swt/accessibility/AccessibleObject.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.accessibility.gtk.*; 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 @@ class AccessibleObject { */ 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } } } - 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 @@ class AccessibleObject { } - 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } // 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } } } - 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } } } - 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } } } - 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } } - 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { } 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 @@ class AccessibleObject { 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 --git a/org/eclipse/swt/awt/SWT_AWT.java b/org/eclipse/swt/awt/SWT_AWT.java index 998cfa0..a27b3e5 100644 --- a/org/eclipse/swt/awt/SWT_AWT.java +++ b/org/eclipse/swt/awt/SWT_AWT.java @@ -64,7 +64,7 @@ public class SWT_AWT { 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 @@ public static Frame new_Frame (final Composite parent) { 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 @@ public static Frame new_Frame (final Composite parent) { 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_x11_display_get_xdisplay(OS.gdk_display_get_default()), awtHandle, xWindow); } }); @@ -300,7 +300,7 @@ public static Frame new_Frame (final Composite parent) { 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 --git a/org/eclipse/swt/browser/AppFileLocProvider.java b/org/eclipse/swt/browser/AppFileLocProvider.java index 2be80e9..4781d21 100644 --- a/org/eclipse/swt/browser/AppFileLocProvider.java +++ b/org/eclipse/swt/browser/AppFileLocProvider.java @@ -47,7 +47,7 @@ AppFileLocProvider (String mozillaPath, String profilePath, String cacheParentPa this.cacheParentPath = cacheParentPath; 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); @@ -70,24 +70,24 @@ int AddRef () { 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]);} }; } @@ -106,32 +106,32 @@ void disposeCOMInterfaces () { } } -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; } @@ -143,7 +143,7 @@ int Release () { /* 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); @@ -154,7 +154,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) { 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]; @@ -205,9 +205,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) { 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++) { @@ -241,7 +241,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) { 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; } @@ -250,7 +250,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) { /* 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); @@ -304,9 +304,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) { } XPCOM.memmove (persistent, new boolean[] {true}); - 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); @@ -319,7 +319,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) { 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 --git a/org/eclipse/swt/browser/Download.java b/org/eclipse/swt/browser/Download.java index c97c08a..d4a05b6 100644 --- a/org/eclipse/swt/browser/Download.java +++ b/org/eclipse/swt/browser/Download.java @@ -46,63 +46,63 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, */ 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 (!Mozilla.IsPre_4 ? nsIURI.NS_IURI_10_IID : 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 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, target.Release (); } else { /* < 1.7 */ nsILocalFile target = new nsILocalFile (aTarget); - int /*long*/ aNativeTarget = XPCOM.nsEmbedString_new (); + long /*int*/ aNativeTarget = XPCOM.nsEmbedString_new (); rc = target.GetLeafName (aNativeTarget); if (rc != XPCOM.NS_OK) Mozilla.error (rc); length = XPCOM.nsEmbedString_Length (aNativeTarget); @@ -259,54 +259,54 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, 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 @@ int SetObserver (int /*long*/ aObserver) { } /* 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 @@ int SetCancelDownloadOnClose (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 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 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur 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 --git a/org/eclipse/swt/browser/DownloadFactory.java b/org/eclipse/swt/browser/DownloadFactory.java index 901786c..a0e2f21 100644 --- a/org/eclipse/swt/browser/DownloadFactory.java +++ b/org/eclipse/swt/browser/DownloadFactory.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 --git a/org/eclipse/swt/browser/DownloadFactory_1_8.java b/org/eclipse/swt/browser/DownloadFactory_1_8.java index 1af0069..a6bf534 100644 --- a/org/eclipse/swt/browser/DownloadFactory_1_8.java +++ b/org/eclipse/swt/browser/DownloadFactory_1_8.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 --git a/org/eclipse/swt/browser/Download_1_8.java b/org/eclipse/swt/browser/Download_1_8.java index 3ec20e7..2a2e150 100644 --- a/org/eclipse/swt/browser/Download_1_8.java +++ b/org/eclipse/swt/browser/Download_1_8.java @@ -48,97 +48,97 @@ int AddRef () { 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 @@ void disposeCOMInterfaces() { } } -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 @@ int Release () { /* 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 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, 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 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) { 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 @@ int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int 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 @@ int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long a 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 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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 --git a/org/eclipse/swt/browser/External.java b/org/eclipse/swt/browser/External.java index cd4201a..c4087df 100644 --- a/org/eclipse/swt/browser/External.java +++ b/org/eclipse/swt/browser/External.java @@ -46,12 +46,12 @@ External () { * QueryInterface answers an nsIScriptObjectOwner implementation (which points * at this function) iff the detected XULRunner version is >= 4. */ -static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ vp) { +static long /*int*/ callJava (long /*int*/ cx, long /*int*/ argc, long /*int*/ vp) { int jsval_sizeof = 8; - int /*long*/ argsPtr = vp + 2 * jsval_sizeof; + long /*int*/ argsPtr = vp + 2 * jsval_sizeof; nsIVariant resultVariant = null; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int rc = XPCOM.NS_GetServiceManager (result); if (rc != XPCOM.NS_OK) Mozilla.error (rc); if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE); @@ -82,14 +82,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v argsPtr += jsval_sizeof; rc = connect.JSValToVariant (cx, argsPtr, result); if (rc == XPCOM.NS_OK && result[0] != 0) { - int /*long*/ tokenVariant = result[0]; + long /*int*/ tokenVariant = result[0]; result[0] = 0; /* get the third argument variant (the invocation args) */ argsPtr += jsval_sizeof; rc = connect.JSValToVariant (cx, argsPtr, result); if (rc == XPCOM.NS_OK && result[0] != 0) { - int /*long*/ argsVariant = result[0]; + long /*int*/ argsVariant = result[0]; result[0] = 0; /* invoke the BrowserFunction */ @@ -124,14 +124,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v nsIMemory memory = new nsIMemory (result[0]); result[0] = 0; - int /*long*/ jsVal = memory.Alloc (jsval_sizeof); + long /*int*/ jsVal = memory.Alloc (jsval_sizeof); C.memset (jsVal, 0, jsval_sizeof); - int /*long*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx); + long /*int*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx); rc = connect.VariantToJS (cx, globalObject, resultVariant.getAddress (), jsVal); resultVariant.Release (); connect.Release (); - int /*long*/ returnValue = XPCOM.JS_FALSE; + long /*int*/ returnValue = XPCOM.JS_FALSE; if (rc == XPCOM.NS_OK) { /* write the jsval to the return value slot */ C.memmove (vp, jsVal, jsval_sizeof); @@ -143,9 +143,9 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v } /* this is the BrowserFunction entry point when the detected XULRunner version is < 4 */ -static int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ argsVariant, int /*long*/ returnPtr) { - int /*long*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant); - C.memmove (returnPtr, new int /*long*/[] {resultVariant}, C.PTR_SIZEOF); +static int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ argsVariant, long /*int*/ returnPtr) { + long /*int*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant); + C.memmove (returnPtr, new long /*int*/[] {resultVariant}, C.PTR_SIZEOF); return XPCOM.NS_OK; } @@ -167,7 +167,7 @@ static Object convertToJava (nsIVariant variant, short type) { 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]; @@ -176,7 +176,7 @@ static Object convertToJava (nsIVariant variant, short type) { 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]]; @@ -184,11 +184,11 @@ static Object convertToJava (nsIVariant variant, short type) { 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); @@ -196,7 +196,7 @@ static Object convertToJava (nsIVariant variant, short type) { 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); @@ -215,7 +215,7 @@ static Object convertToJava (nsIVariant variant, short type) { if (id.Equals (nsIVariant.NS_IVARIANT_IID) || id.Equals (nsIVariant.NS_IVARIANT_10_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 (id, result); @@ -267,8 +267,8 @@ static Object convertToJava (nsIVariant variant, short type) { 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]; @@ -291,7 +291,7 @@ static Object convertToJava (nsIVariant variant, short type) { } static 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]); @@ -330,26 +330,26 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage 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, Mozilla.IsPre_4 ? nsIVariant.NS_IVARIANT_IID : nsIVariant.NS_IVARIANT_10_IID, nsID.sizeof); rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr); C.free (idPtr); @@ -364,7 +364,7 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage return null; } -static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, int /*long*/ args) { +static long /*int*/ invokeFunction (int functionId, long /*int*/ tokenVariant, long /*int*/ args) { Object key = new Integer (functionId); BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key); Object returnValue = null; @@ -405,7 +405,7 @@ static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, i } } - 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); @@ -431,48 +431,48 @@ int AddRef () { 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]);} }; scriptObjectOwner = new XPCOMObject (new int[] {2, 0, 0, 2, 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 getScriptObject (args[0], args[1]);} - public int /*long*/ method4 (int /*long*/[] args) {return setScriptObject (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 getScriptObject (args[0], args[1]);} + public long /*int*/ method4 (long /*int*/[] args) {return setScriptObject (args[0]);} }; } @@ -499,45 +499,45 @@ void disposeCOMInterfaces () { } } -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 (XPCOM.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; } if (!Mozilla.IsPre_4) { if (guid.Equals(XPCOM.NS_ISCRIPTOBJECTOWNER_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {scriptObjectOwner.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; } @@ -549,8 +549,8 @@ int Release () { /* 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); @@ -566,43 +566,43 @@ int getClassDescription (int /*long*/ _retValue) { 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); @@ -617,20 +617,20 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) { 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, XPCOM.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 (3 * 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); + long /*int*/ ptrArray = memory.Alloc (3 * 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); nsID NS_ASDF_IID = new nsID("a40ce52e-2d8c-400f-9af2-f8784a656070"); - int /*long*/ asdfIID = memory.Alloc (nsID.sizeof); + long /*int*/ asdfIID = memory.Alloc (nsID.sizeof); XPCOM.memmove (asdfIID, NS_ASDF_IID, nsID.sizeof); - C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new int /*long*/[] {asdfIID}, C.PTR_SIZEOF); + C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new long /*int*/[] {asdfIID}, C.PTR_SIZEOF); - C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF); + C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF); memory.Release (); C.memmove (count, new int[] {3}, 4); /* PRUint */ @@ -639,27 +639,27 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) { /* nsIScriptObjectOwner */ -int getScriptObject (int /*long*/ aContext, int /*long*/ aScriptObject) { +int getScriptObject (long /*int*/ aContext, long /*int*/ aScriptObject) { byte[] jsLibPath = Mozilla.getJSLibPathBytes (); - int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext); - int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext); - int /*long*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject); + long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext); + long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext); + long /*int*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject); byte[] functionName = MozillaDelegate.wcsToMbcs (null, "callJava", true); //$NON-NLS-1$ int flags = XPCOM.JSPROP_ENUMERATE | XPCOM.JSPROP_READONLY | XPCOM.JSPROP_PERMANENT; XPCOM.JS_DefineFunction (jsLibPath, nativeContext, newObject, functionName, XPCOM.CALLBACK_JSNative (CallJavaProc.getAddress ()), 3, flags); - XPCOM.memmove (aScriptObject, new int /*long*/[] {newObject}, C.PTR_SIZEOF); + XPCOM.memmove (aScriptObject, new long /*int*/[] {newObject}, C.PTR_SIZEOF); return XPCOM.NS_OK; } -int setScriptObject (int /*long*/ aScriptObject) { +int setScriptObject (long /*int*/ aScriptObject) { return XPCOM.NS_COMFALSE; } /* 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); @@ -675,16 +675,16 @@ int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) { 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); @@ -709,16 +709,16 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV } 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); @@ -734,16 +734,16 @@ int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r 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); @@ -759,9 +759,9 @@ int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r 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; diff --git a/org/eclipse/swt/browser/ExternalFactory.java b/org/eclipse/swt/browser/ExternalFactory.java index 84462ec..f90ef3d 100644 --- a/org/eclipse/swt/browser/ExternalFactory.java +++ b/org/eclipse/swt/browser/ExternalFactory.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 --git a/org/eclipse/swt/browser/FilePicker.java b/org/eclipse/swt/browser/FilePicker.java index 0203016..44b9e5f 100644 --- a/org/eclipse/swt/browser/FilePicker.java +++ b/org/eclipse/swt/browser/FilePicker.java @@ -21,7 +21,7 @@ class FilePicker { int refCount = 0; short mode; - int /*long*/ parentHandle; + long /*int*/ parentHandle; String[] files, masks; String defaultFilename, directory, title; @@ -39,30 +39,30 @@ int AddRef () { 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,37 +77,37 @@ void disposeCOMInterfaces () { } } -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; } if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_10_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; } @@ -117,7 +117,7 @@ int Release () { return refCount; } -Browser getBrowser (int /*long*/ aDOMWindow) { +Browser getBrowser (long /*int*/ aDOMWindow) { if (aDOMWindow == 0) return null; return Mozilla.getBrowser (aDOMWindow); } @@ -127,20 +127,20 @@ Browser getBrowser (int /*long*/ aDOMWindow) { * 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 (); @@ -190,20 +190,20 @@ int showDirectoryPicker () { 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); @@ -212,14 +212,14 @@ int GetFile (int /*long*/ aFile) { 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.nsEmbedString_new (); + long /*int*/ pathname = XPCOM.nsEmbedString_new (); int rc = file.GetPath (pathname); if (rc != XPCOM.NS_OK) Mozilla.error (rc); int length = XPCOM.nsEmbedString_Length (pathname); - int /*long*/ buffer = XPCOM.nsEmbedString_get (pathname); + long /*int*/ buffer = XPCOM.nsEmbedString_get (pathname); char[] chars = new char[length]; XPCOM.memmove (chars, buffer, length * 2); XPCOM.nsEmbedString_delete (pathname); @@ -227,10 +227,10 @@ int SetDisplayDirectory (int /*long*/ aDisplayDirectory) { 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); @@ -243,31 +243,31 @@ int SetFilterIndex (int aFilterIndex) { 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 --git a/org/eclipse/swt/browser/FilePickerFactory.java b/org/eclipse/swt/browser/FilePickerFactory.java index 44fcbd6..fcf4a18 100644 --- a/org/eclipse/swt/browser/FilePickerFactory.java +++ b/org/eclipse/swt/browser/FilePickerFactory.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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,19 +87,19 @@ int Release () { /* 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_4) { FilePicker_10 picker = new FilePicker_10 (); picker.AddRef (); - XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF); } else if (Mozilla.IsXULRunner) { 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); } else { 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 --git a/org/eclipse/swt/browser/FilePicker_10.java b/org/eclipse/swt/browser/FilePicker_10.java index b976233..5ad410c 100644 --- a/org/eclipse/swt/browser/FilePicker_10.java +++ b/org/eclipse/swt/browser/FilePicker_10.java @@ -17,32 +17,32 @@ class FilePicker_10 extends FilePicker_1_8 { 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, 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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;} - public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;} - public int /*long*/ method19 (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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;} + public long /*int*/ method18 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;} + public long /*int*/ method19 (long /*int*/[] args) {return Show (args[0]);} }; } diff --git a/org/eclipse/swt/browser/FilePicker_1_8.java b/org/eclipse/swt/browser/FilePicker_1_8.java index a73840f..19e15e5 100644 --- a/org/eclipse/swt/browser/FilePicker_1_8.java +++ b/org/eclipse/swt/browser/FilePicker_1_8.java @@ -17,30 +17,30 @@ class FilePicker_1_8 extends FilePicker { 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 @@ void createCOMInterfaces () { * 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 --git a/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/org/eclipse/swt/browser/HelperAppLauncherDialog.java index 706ec08..a8d9d5a 100644 --- a/org/eclipse/swt/browser/HelperAppLauncherDialog.java +++ b/org/eclipse/swt/browser/HelperAppLauncherDialog.java @@ -38,17 +38,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) { 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 @@ int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2 */ 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 --git a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java index 43f96bd..80ed72e 100644 --- a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java +++ b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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,19 +87,19 @@ int Release () { /* 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 if (Mozilla.IsPre_4){ 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); } else { HelperAppLauncherDialog_10 helperAppLauncherDialog = new HelperAppLauncherDialog_10 (); 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 --git a/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java b/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java index fd30ea1..38107f5 100644 --- a/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java +++ b/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java @@ -32,12 +32,12 @@ HelperAppLauncherDialog_10 () { /* nsIHelperAppLauncherDialog */ -int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) { +int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) { nsIHelperAppLauncher_8 helperAppLauncher = new nsIHelperAppLauncher_8 (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); @@ -61,7 +61,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in 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 --git a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java index dd2e0cb..5599b9b 100644 --- a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java +++ b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java @@ -38,17 +38,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in 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 --git a/org/eclipse/swt/browser/InputStream.java b/org/eclipse/swt/browser/InputStream.java index cc0f34d..1f4a55a 100644 --- a/org/eclipse/swt/browser/InputStream.java +++ b/org/eclipse/swt/browser/InputStream.java @@ -34,14 +34,14 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Close () { 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 @@ int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) { 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 ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int / 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 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int / return XPCOM.NS_OK; } -int IsNonBlocking (int /*long*/ _retval) { +int IsNonBlocking (long /*int*/ _retval) { /* blocking */ XPCOM.memmove (_retval, new boolean[] {false}); return XPCOM.NS_OK; diff --git a/org/eclipse/swt/browser/Mozilla.java b/org/eclipse/swt/browser/Mozilla.java index 5fb1177..40f2af1 100644 --- a/org/eclipse/swt/browser/Mozilla.java +++ b/org/eclipse/swt/browser/Mozilla.java @@ -23,7 +23,7 @@ import org.eclipse.swt.internal.mozilla.init.*; 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 @@ class Mozilla extends WebBrowser { int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT; int registerFunctionsOnState = 0; int refCount, lastKeyCode, lastCharCode, authCount; - int /*long*/ request, badCertRequest; + long /*int*/ request, badCertRequest; Point location, size; boolean visible, isActive, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText; boolean updateLastNavigateUrl; @@ -124,7 +124,7 @@ class Mozilla extends WebBrowser { 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); @@ -189,18 +189,18 @@ class Mozilla extends WebBrowser { // 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); @@ -222,7 +222,7 @@ class Mozilla extends WebBrowser { 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); @@ -327,7 +327,7 @@ class Mozilla extends WebBrowser { 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); @@ -357,9 +357,9 @@ class Mozilla extends WebBrowser { 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); @@ -382,7 +382,7 @@ class Mozilla extends WebBrowser { 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); @@ -396,7 +396,7 @@ class Mozilla extends WebBrowser { 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 (); @@ -410,7 +410,7 @@ class Mozilla extends WebBrowser { 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; @@ -485,7 +485,7 @@ class Mozilla extends WebBrowser { 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); @@ -499,7 +499,7 @@ class Mozilla extends WebBrowser { 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 (); @@ -631,7 +631,7 @@ static void LoadLibraries () { 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 { @@ -675,7 +675,7 @@ public void create (Composite parent, int style) { 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 (); @@ -972,7 +972,7 @@ public void create (Composite parent, int style) { /* if tabbing onto a page for the first time then full-Browser focus ring should be shown */ - 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); @@ -1059,7 +1059,7 @@ public void create (Composite parent, int style) { 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); @@ -1089,122 +1089,122 @@ public boolean close () { 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]);} }; } @@ -1283,7 +1283,7 @@ public boolean execute (String script) { * 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); @@ -1336,13 +1336,13 @@ public boolean execute (String script) { 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) { new nsISupports (scriptGlobalObject).Release (); } else { - int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */ + long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */ new nsISupports (scriptGlobalObject).Release (); if (scriptContext != 0) { @@ -1365,7 +1365,7 @@ public boolean execute (String script) { 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]; @@ -1373,11 +1373,11 @@ public boolean execute (String script) { 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; byte[] jsLibPath = getJSLibPathBytes (); - int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext); + long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext); if (globalJSObject != 0) { aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true); rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result); @@ -1427,12 +1427,12 @@ public boolean execute (String script) { return rc == XPCOM.NS_OK; } -static Browser findBrowser (int /*long*/ handle) { +static Browser findBrowser (long /*int*/ handle) { return MozillaDelegate.findBrowser (handle); } -static Browser getBrowser (int /*long*/ aDOMWindow) { - int /*long*/[] result = new int /*long*/[1]; +static Browser getBrowser (long /*int*/ aDOMWindow) { + 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); @@ -1452,7 +1452,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) { rc = window.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); @@ -1482,7 +1482,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) { 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); @@ -1515,7 +1515,7 @@ static String getMozillaPath () { 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); @@ -1545,11 +1545,11 @@ static String getMozillaPath () { nsIFile mozillaDir = new nsIFile (result[0]); result[0] = 0; - int /*long*/ path = XPCOM.nsEmbedString_new (); + long /*int*/ path = XPCOM.nsEmbedString_new (); rc = mozillaDir.GetPath (path); if (rc != XPCOM.NS_OK) error (rc); int length = XPCOM.nsEmbedString_Length (path); - int /*long*/ ptr = XPCOM.nsEmbedString_get (path); + long /*int*/ ptr = XPCOM.nsEmbedString_get (path); char[] chars = new char[length]; XPCOM.memmove (chars, ptr, length * 2); XPCOM.nsEmbedString_delete (path); @@ -1563,7 +1563,7 @@ int getNextFunctionIndex () { } 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); @@ -1575,7 +1575,7 @@ public String getText () { 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); @@ -1592,12 +1592,12 @@ public String getText () { 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); @@ -1622,13 +1622,13 @@ public String getText () { } 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 (); @@ -1636,11 +1636,11 @@ public String getUrl () { 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); @@ -1703,29 +1703,29 @@ static String InitDiscoverXULRunner () { 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) { @@ -1784,7 +1784,7 @@ void initExternal (String profilePath) { } 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) { @@ -1918,7 +1918,7 @@ void initJavaXPCOM (String mozillaPath) { 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]; @@ -1972,7 +1972,7 @@ String initMozilla (String mozillaPath) { } 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); @@ -1991,7 +1991,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { 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 (); @@ -2003,7 +2003,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { 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 ()); rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr); if (rc == XPCOM.NS_OK) { @@ -2026,7 +2026,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { } 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); @@ -2055,7 +2055,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { } 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 @@ -2414,7 +2414,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp } 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); @@ -2449,18 +2449,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) { 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); @@ -2478,7 +2478,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) { void initSpinup (nsIComponentManager componentManager) { if (MozillaDelegate.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); @@ -2515,7 +2515,7 @@ void initWebBrowserWindows () { error (rc); } - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result); if (rc != XPCOM.NS_OK) { rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); @@ -2561,7 +2561,7 @@ void initWindowCreator (nsIServiceManager serviceManager) { 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) { @@ -2610,7 +2610,7 @@ String initXULRunner (String mozillaPath) { } 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); @@ -2623,7 +2623,7 @@ public boolean isBackEnabled () { } 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); @@ -2665,7 +2665,7 @@ void onDispose (Display display) { unhookDOMListeners (); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result); if (rc != XPCOM.NS_OK) { rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); @@ -2714,7 +2714,7 @@ void onDispose (Display display) { void Activate () { isActive = true; - 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); @@ -2727,7 +2727,7 @@ void Activate () { void Deactivate () { isActive = false; - 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); @@ -2738,11 +2738,11 @@ void Deactivate () { webBrowserFocus.Release (); } -void navigate (int /*long*/ requestHandle) { +void navigate (long /*int*/ requestHandle) { nsIRequest request = new nsIRequest (requestHandle); /* get the request post data, if any */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; byte[] postData = null; final Vector headers = new Vector (); int rc = request.QueryInterface (nsIUploadChannel.NS_IUPLOADCHANNEL_IID, result); @@ -2802,37 +2802,37 @@ void navigate (int /*long*/ requestHandle) { /* get the request headers */ XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) { int refCount = 0; - public int /*long*/ method0 (int /*long*/[] args) { + public long /*int*/ method0 (long /*int*/[] args) { /* QueryInterface */ - int /*long*/ riid = args[0]; - int /*long*/ ppvObject = args[1]; + long /*int*/ riid = args[0]; + long /*int*/ ppvObject = args[1]; 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) || guid.Equals (nsIHttpHeaderVisitor.NS_IHTTPHEADERVISITOR_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {getAddress ()}, C.PTR_SIZEOF); refCount++; 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; } - public int /*long*/ method1 (int /*long*/[] args) { + public long /*int*/ method1 (long /*int*/[] args) { /* AddRef */ return ++refCount; } - public int /*long*/ method2 (int /*long*/[] args) { + public long /*int*/ method2 (long /*int*/[] args) { /* Release */ if (--refCount == 0) dispose (); return refCount; } - public int /*long*/ method3 (int /*long*/[] args) { + public long /*int*/ method3 (long /*int*/[] args) { /* VisitHeader */ - int /*long*/ aHeader = args[0]; - int /*long*/ aValue = args[1]; + long /*int*/ aHeader = args[0]; + long /*int*/ aValue = args[1]; int length = XPCOM.nsEmbedCString_Length (aHeader); - int /*long*/ buffer = XPCOM.nsEmbedCString_get (aHeader); + long /*int*/ buffer = XPCOM.nsEmbedCString_get (aHeader); byte[] dest = new byte[length]; XPCOM.memmove (dest, buffer, length); String header = new String (dest); @@ -2867,11 +2867,11 @@ void navigate (int /*long*/ requestHandle) { /* a request's name often (but not always) is its url */ String url = lastNavigateURL; - int /*long*/ name = XPCOM.nsEmbedCString_new (); + long /*int*/ name = XPCOM.nsEmbedCString_new (); 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); @@ -2887,7 +2887,7 @@ void onResize () { 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_10_IID, result); if (rc != XPCOM.NS_OK) { rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); @@ -2905,7 +2905,7 @@ void onResize () { 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); @@ -2975,7 +2975,7 @@ public boolean setText (String html, boolean trusted) { */ 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) { /* @@ -3009,9 +3009,9 @@ public boolean setText (String html, boolean trusted) { 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); @@ -3031,7 +3031,7 @@ public boolean setText (String html, boolean trusted) { } 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); @@ -3084,7 +3084,7 @@ public boolean setUrl (String url, String postData, String[] headers) { boolean setUrl (String url, byte[] 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); @@ -3186,7 +3186,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) { 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); @@ -3245,7 +3245,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) { } 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; @@ -3334,73 +3334,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) { /* 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; } @@ -3417,18 +3417,18 @@ int Release () { /* 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_10_IID) || 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); @@ -3438,15 +3438,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) { 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 (); @@ -3477,11 +3477,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF */ 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); @@ -3492,7 +3492,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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 @@ -3572,13 +3572,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF * are typically added. */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int rc; LONG ptrObject = new LONG (result[0]); result[0] = 0; int index = unhookedDOMWindows.indexOf (ptrObject); if (index != -1) { - int /*long*/[] window = new int /*long*/[1]; + long /*int*/[] window = new long /*int*/[1]; nsIWebProgress progress = new nsIWebProgress (aWebProgress); rc = progress.GetDOMWindow (window); if (rc != XPCOM.NS_OK) error (rc); @@ -3617,11 +3617,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF */ 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); @@ -3654,7 +3654,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF } 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); @@ -3672,7 +3672,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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); @@ -3696,11 +3696,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF */ 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) { @@ -3724,7 +3724,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF */ deferCompleted = true; - int /*long*/[] window = new int /*long*/[1]; + long /*int*/[] window = new long /*int*/[1]; nsIWebProgress progress = new nsIWebProgress (aWebProgress); rc = progress.GetDOMWindow (window); if (rc != XPCOM.NS_OK) error (rc); @@ -3798,7 +3798,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF updateLastNavigateUrl = false; nsIRequest request = new nsIRequest (aRequest); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result); if (rc != XPCOM.NS_OK) { rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result); @@ -3813,11 +3813,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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); @@ -3830,7 +3830,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF * 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); @@ -3869,7 +3869,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF 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 (); @@ -3882,7 +3882,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur 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 @@ -3897,12 +3897,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo 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); - int /*long*/[] aTop = new int /*long*/[1]; + long /*int*/[] aTop = new long /*int*/[1]; nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]); rc = domWindow.GetTop (aTop); domWindow.Release (); @@ -3912,10 +3912,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo 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); @@ -3952,7 +3952,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo 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 (); @@ -3967,13 +3967,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu 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 (); @@ -3989,8 +3989,8 @@ int SetStatus (int statusType, int /*long*/ status) { 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 (); @@ -3999,13 +3999,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) { 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 */ @@ -4045,7 +4045,7 @@ int SizeBrowserTo (int aCX, int aCY) { } 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); @@ -4075,7 +4075,7 @@ int ShowAsModal () { return XPCOM.NS_OK; } -int IsWindowModal (int /*long*/ retval) { +int IsWindowModal (long /*int*/ retval) { boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0; XPCOM.memmove (retval, new boolean[] {result}); return XPCOM.NS_OK; @@ -4109,7 +4109,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) { 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 */ @@ -4129,7 +4129,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i } int SetFocus () { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result); if (rc != XPCOM.NS_OK) { rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); @@ -4150,7 +4150,7 @@ int SetFocus () { 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 boolean[] {visible}); return XPCOM.NS_OK; @@ -4193,11 +4193,11 @@ int SetVisibility (int aVisibility) { 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 (); @@ -4221,7 +4221,7 @@ int SetTitle (int /*long*/ aTitle) { return XPCOM.NS_OK; } -int GetSiteWindow (int /*long*/ aSiteWindow) { +int GetSiteWindow (long /*int*/ aSiteWindow) { /* * This is expected to be an HWND on Windows, a GtkWidget* on GTK, and * a WindowPtr on OS X. This callback is invoked on Windows when the @@ -4229,8 +4229,8 @@ int GetSiteWindow (int /*long*/ aSiteWindow) { * dialog is shown with XULRunner versions < 4. */ - int /*long*/ siteWindow = delegate.getSiteWindow (); - XPCOM.memmove (aSiteWindow, new int /*long*/[] {siteWindow}, C.PTR_SIZEOF); + long /*int*/ siteWindow = delegate.getSiteWindow (); + XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF); return XPCOM.NS_OK; } @@ -4270,9 +4270,9 @@ int FocusPrevElement () { /* 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 (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4302,15 +4302,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod /* 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); @@ -4365,7 +4365,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) { if (doit) { if (jsEnabled != jsEnabledOnNextPage) { jsEnabled = jsEnabledOnNextPage; - 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); @@ -4384,11 +4384,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) { 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) { @@ -4399,7 +4399,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in /* 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); @@ -4411,7 +4411,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in 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 */ @@ -4441,34 +4441,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in XPCOM.memmove(retval, new boolean[] {preferred}); 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); @@ -4504,20 +4504,20 @@ int OnHideTooltip () { return XPCOM.NS_OK; } -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); @@ -4534,7 +4534,7 @@ int HandleEvent (int /*long*/ event) { } if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4642,7 +4642,7 @@ int HandleEvent (int /*long*/ event) { 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 (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4698,7 +4698,7 @@ int HandleEvent (int /*long*/ event) { } if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4755,7 +4755,7 @@ int HandleEvent (int /*long*/ event) { /* mouse event */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4873,10 +4873,10 @@ int HandleEvent (int /*long*/ event) { /* 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); @@ -4886,7 +4886,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* /* 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_10_IID, result); if (rc != XPCOM.NS_OK) { @@ -4909,7 +4909,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* 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); @@ -4932,7 +4932,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* 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); @@ -4961,7 +4961,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* 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); @@ -4990,7 +4990,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* if (url.equals (lastNavigateURL)) { 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); @@ -5006,7 +5006,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long* 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); navigate (badCertRequest); XPCOM.nsEmbedCString_delete (hostString); diff --git a/org/eclipse/swt/browser/MozillaDelegate.java b/org/eclipse/swt/browser/MozillaDelegate.java index 3b1a5d7..0146715 100644 --- a/org/eclipse/swt/browser/MozillaDelegate.java +++ b/org/eclipse/swt/browser/MozillaDelegate.java @@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.*; class MozillaDelegate { Browser browser; Shell eventShell; - 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; @@ -50,8 +50,8 @@ MozillaDelegate (Browser browser) { 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); @@ -61,12 +61,12 @@ static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int / 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); } @@ -96,7 +96,7 @@ static String getProfilePath () { * then attempt to read the value from the environment directly. */ if (baseDir.equals ("?")) { //$NON-NLS-1$ - int /*long*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$ + long /*int*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$ if (ptr != 0) { int length = C.strlen (ptr); byte[] bytes = new byte[length]; @@ -167,7 +167,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) { 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 @@ -184,11 +184,11 @@ int /*long*/ getHandle () { return embedHandle; } -int /*long*/ getSiteWindow () { +long /*int*/ getSiteWindow () { return embedHandle; } -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) { @@ -260,7 +260,7 @@ void init () { * 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); @@ -282,7 +282,7 @@ void init () { } } -void onDispose (int /*long*/ embedHandle) { +void onDispose (long /*int*/ embedHandle) { if (listener != null) { eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener); eventShell.removeListener (SWT.Deactivate, listener); @@ -300,7 +300,7 @@ boolean sendTraverse () { 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 --git a/org/eclipse/swt/browser/PromptAuth2.java b/org/eclipse/swt/browser/PromptAuth2.java index 40d9855..abef771 100644 --- a/org/eclipse/swt/browser/PromptAuth2.java +++ b/org/eclipse/swt/browser/PromptAuth2.java @@ -19,7 +19,7 @@ class PromptAuth2 { XPCOMObject supports; XPCOMObject promptAuth; int refCount = 0; - int /*long*/ parent; + long /*int*/ parent; PromptAuth2 () { createCOMInterfaces (); @@ -33,17 +33,17 @@ int AddRef () { 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 ();} }; promptAuth = new XPCOMObject (new int[] {2, 0, 0, 4, 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 PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);} - public int /*long*/ method4 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/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 PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);} + public long /*int*/ method4 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);} }; } @@ -58,27 +58,27 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return promptAuth.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 (nsIAuthPrompt2.NS_IAUTHPROMPT2_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {promptAuth.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; } @@ -93,11 +93,11 @@ Browser getBrowser () { return Mozilla.getBrowser (parent); } -void setParent(int /*long*/ aParent) { +void setParent(long /*int*/ aParent) { parent = aParent; } -int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) { +int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) { nsIAuthInformation auth = new nsIAuthInformation (authInfo); Browser browser = getBrowser (); @@ -143,11 +143,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo /* 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); @@ -176,13 +176,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo 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); @@ -222,7 +222,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo return XPCOM.NS_OK; } -int AsyncPromptAuth(int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ _retval) { +int AsyncPromptAuth(long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ _retval) { return XPCOM.NS_ERROR_NOT_IMPLEMENTED; } } diff --git a/org/eclipse/swt/browser/PromptDialog.java b/org/eclipse/swt/browser/PromptDialog.java index ad271eb..4a8c186 100644 --- a/org/eclipse/swt/browser/PromptDialog.java +++ b/org/eclipse/swt/browser/PromptDialog.java @@ -141,7 +141,7 @@ class PromptDialog extends Dialog { 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 --git a/org/eclipse/swt/browser/PromptFactory.java b/org/eclipse/swt/browser/PromptFactory.java index 001bd1b..3f3da8e 100644 --- a/org/eclipse/swt/browser/PromptFactory.java +++ b/org/eclipse/swt/browser/PromptFactory.java @@ -30,16 +30,16 @@ int AddRef () { 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 GetPrompt (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 GetPrompt (args[0], args[1], args[2]);} }; } @@ -54,27 +54,27 @@ void disposeCOMInterfaces () { } } -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 (nsIPromptFactory.NS_IPROMPTFACTORY_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; } @@ -86,7 +86,7 @@ int Release () { /* nsIPromptFactory */ -int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) { +int GetPrompt (long /*int*/ aParent, long /*int*/ iid, long /*int*/ result) { nsID guid = new nsID (); XPCOM.memmove (guid, iid, nsID.sizeof); @@ -94,7 +94,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) { Prompter prompter = new Prompter (); prompter.AddRef (); prompter.setParent (aParent); - XPCOM.memmove (result, new int /*long*/[] {prompter.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (result, new long /*int*/[] {prompter.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } @@ -102,7 +102,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) { PromptAuth2 promptAuth = new PromptAuth2(); promptAuth.AddRef (); promptAuth.setParent (aParent); - XPCOM.memmove (result, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (result, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } diff --git a/org/eclipse/swt/browser/PromptService2.java b/org/eclipse/swt/browser/PromptService2.java index 16cbe4f..bb8f380 100644 --- a/org/eclipse/swt/browser/PromptService2.java +++ b/org/eclipse/swt/browser/PromptService2.java @@ -33,41 +33,41 @@ int AddRef () { void createCOMInterfaces () { /* Create each of the interfaces that this object implements */ supports = new XPCOMObject (new int[] {2, 0, 0}) { - public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);} - public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();} - public int /*long*/ method2 (int /*long*/[] args) {return Release ();} + public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long /*int*/ method2 (long /*int*/[] args) {return Release ();} }; promptService = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7}) { - public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);} - public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();} - public int /*long*/ method2 (int /*long*/[] args) {return Release ();} - public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);} - public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} - public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} - public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} - public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} + public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);} + public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} + public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} + public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} + public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} + public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} + public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} }; promptService2 = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7, 7, 9}) { - public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);} - public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();} - public int /*long*/ method2 (int /*long*/[] args) {return Release ();} - public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);} - public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} - public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} - public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} - public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} - public int /*long*/ method12 (int /*long*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);} - public int /*long*/ method13 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);} + public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);} + public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} + public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} + public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} + public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} + public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} + public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} + public long /*int*/ method12 (long /*int*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);} + public long /*int*/ method13 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);} }; } @@ -86,32 +86,32 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return promptService2.getAddress (); } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE; nsID guid = new nsID (); XPCOM.memmove (guid, riid, nsID.sizeof); if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } if (guid.Equals (nsIPromptService.NS_IPROMPTSERVICE_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); return XPCOM.NS_ERROR_NO_INTERFACE; } @@ -121,12 +121,12 @@ int Release () { return refCount; } -Browser getBrowser (int /*long*/ aDOMWindow) { +Browser getBrowser (long /*int*/ aDOMWindow) { if (aDOMWindow == 0) return null; return Mozilla.getBrowser (aDOMWindow); } -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) { @@ -147,7 +147,7 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) { /* 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); @@ -177,7 +177,7 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) 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); @@ -204,11 +204,11 @@ int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aT 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) { @@ -236,11 +236,11 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText 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); @@ -283,7 +283,7 @@ int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aTe 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]; @@ -301,7 +301,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, 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]); @@ -332,7 +332,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, * 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); @@ -352,9 +352,9 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, 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]); @@ -366,7 +366,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, 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); @@ -420,11 +420,11 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon /* 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); @@ -453,13 +453,13 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon 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); @@ -500,7 +500,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon 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; @@ -551,7 +551,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, 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]); @@ -560,7 +560,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, 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]); @@ -598,12 +598,12 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, * 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); @@ -628,9 +628,9 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, 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]; @@ -638,17 +638,17 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, 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 --git a/org/eclipse/swt/browser/PromptService2Factory.java b/org/eclipse/swt/browser/PromptService2Factory.java index 3ec1c35..8c7c189 100644 --- a/org/eclipse/swt/browser/PromptService2Factory.java +++ b/org/eclipse/swt/browser/PromptService2Factory.java @@ -30,17 +30,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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,19 +87,19 @@ int Release () { /* nsIFactory */ -int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) { +int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) { nsID guid = new nsID (); XPCOM.memmove (guid, iid, nsID.sizeof); if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) { 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; } if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) { PromptFactory promptFactory = new PromptFactory(); promptFactory.AddRef (); - XPCOM.memmove (result, new int /*long*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (result, new long /*int*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } diff --git a/org/eclipse/swt/browser/Prompter.java b/org/eclipse/swt/browser/Prompter.java index c8274d0..a7b9848 100644 --- a/org/eclipse/swt/browser/Prompter.java +++ b/org/eclipse/swt/browser/Prompter.java @@ -19,7 +19,7 @@ class Prompter { XPCOMObject supports; XPCOMObject prompt; int refCount = 0; - int /*long*/ parent; + long /*int*/ parent; Prompter () { createCOMInterfaces (); @@ -33,24 +33,24 @@ int AddRef () { 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 ();} }; prompt = new XPCOMObject (new int[] {2, 0, 0, 2, 4, 3, 5, 9, 6, 6, 7, 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 Alert (args[0], args[1] );} - public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);} - public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2]);} - public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);} - public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method9 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method10 (int /*long*/[] args) {return PromptUsernameAndPassword (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], (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 Alert (args[0], args[1] );} + public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);} + public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2]);} + public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);} + public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method9 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method10 (long /*int*/[] args) {return PromptUsernameAndPassword (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], (int)/*64*/args[2], args[3], args[4], args[5]);} }; } @@ -65,26 +65,26 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return prompt.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 (nsIPrompt.NS_IPROMPT_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {prompt.getAddress ()}, C.PTR_SIZEOF); + XPCOM.memmove (ppvObject, new long /*int*/[] {prompt.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; } @@ -99,7 +99,7 @@ Browser getBrowser () { return Mozilla.getBrowser (parent); } -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) { @@ -118,13 +118,13 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) { return label; } -void setParent(int /*long*/ aParent) { +void setParent(long /*int*/ aParent) { parent = aParent; } /* nsIPrompt */ -int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) { +int Alert (long /*int*/ aDialogTitle, long /*int*/ aText) { final Browser browser = getBrowser (); int length = XPCOM.strlen_PRUnichar (aDialogTitle); @@ -154,7 +154,7 @@ int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) { return XPCOM.NS_OK; } -int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) { +int AlertCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) { Browser browser = getBrowser (); int length = XPCOM.strlen_PRUnichar (aDialogTitle); @@ -181,7 +181,7 @@ int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aChe return XPCOM.NS_OK; } -int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) { +int Confirm (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) { Browser browser = getBrowser (); if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) { @@ -209,11 +209,11 @@ int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval return XPCOM.NS_OK; } -int ConfirmCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { +int ConfirmCheck (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*/ 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*/ 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 (); int length = XPCOM.strlen_PRUnichar (aDialogTitle); @@ -256,7 +256,7 @@ int ConfirmEx (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, return XPCOM.NS_OK; } -int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { +int Prompt (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { Browser browser = getBrowser (); String titleLabel = null, textLabel, checkLabel = null; String[] valueLabel = new String[1]; @@ -274,7 +274,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, 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]); @@ -305,7 +305,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, * 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); @@ -325,9 +325,9 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, 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]); @@ -339,7 +339,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, return XPCOM.NS_OK; } -int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) { +int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) { nsIAuthInformation auth = new nsIAuthInformation (authInfo); Browser browser = getBrowser (); @@ -385,11 +385,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo /* 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); @@ -418,13 +418,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo 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); @@ -464,7 +464,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo return XPCOM.NS_OK; } -int PromptUsernameAndPassword (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*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { Browser browser = getBrowser (); String user = null, password = null; @@ -515,7 +515,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in XPCOM.memmove (dest, aText, length * 2); textLabel = new String (dest); - int /*long*/[] userAddr = new int /*long*/[1]; + long /*int*/[] userAddr = new long /*int*/[1]; XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF); if (userAddr[0] != 0) { length = XPCOM.strlen_PRUnichar (userAddr[0]); @@ -524,7 +524,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in 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]); @@ -562,12 +562,12 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in * 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); @@ -592,9 +592,9 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in 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]; @@ -602,17 +602,17 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in 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*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { +int PromptPassword (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*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) { +int Select (long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) { return XPCOM.NS_ERROR_NOT_IMPLEMENTED; } diff --git a/org/eclipse/swt/browser/SimpleEnumerator.java b/org/eclipse/swt/browser/SimpleEnumerator.java index 9b09794..d39b512 100644 --- a/org/eclipse/swt/browser/SimpleEnumerator.java +++ b/org/eclipse/swt/browser/SimpleEnumerator.java @@ -36,17 +36,17 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { return refCount; } -int HasMoreElements (int /*long*/ _retval) { +int HasMoreElements (long /*int*/ _retval) { boolean more = values != null && index < values.length; XPCOM.memmove (_retval, new boolean[] {more}); 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 --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java index 6c84b88..1b21766 100644 --- a/org/eclipse/swt/browser/WebKit.java +++ b/org/eclipse/swt/browser/WebKit.java @@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*; 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; @@ -33,7 +33,7 @@ class WebKit extends WebBrowser { BrowserFunction eventFunction; static int DisabledJSCount; - static int /*long*/ ExternalClass, PostString, WebViewType; + static long /*int*/ ExternalClass, PostString, WebViewType; static boolean IsWebKit14orNewer, LibraryLoaded; static Hashtable WindowMappings = new Hashtable (); @@ -125,16 +125,16 @@ class WebKit extends WebBrowser { 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 @@ class WebKit extends WebBrowser { 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 @@ class WebKit extends WebBrowser { 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 @@ class WebKit extends WebBrowser { } 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 @@ class WebKit extends WebBrowser { } } -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); } @@ -236,12 +236,12 @@ static boolean IsInstalled () { (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; @@ -249,20 +249,20 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f 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$ @@ -272,7 +272,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes); } -static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /*long*/ user_data) { +static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) { if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) { /* * Stop the propagation of events that are not consumed by WebKit, before @@ -342,15 +342,15 @@ static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int / return webkit.handleDOMEvent (event, (int)user_data) ? 0 : STOP_PROPOGATE; } -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) { - int /*long*/ webView; +static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { + long /*int*/ webView; if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { webView = WebKitGTK.webkit_web_frame_get_web_view (handle); } else { @@ -366,15 +366,15 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } } -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 (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) { webView = user_data; } else { @@ -390,14 +390,14 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a } } -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; @@ -405,8 +405,8 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a 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); @@ -432,14 +432,14 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a 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); @@ -447,7 +447,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) { } } -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); @@ -460,14 +460,14 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } } -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); @@ -475,7 +475,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a } } -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); @@ -498,7 +498,7 @@ public void create (Composite parent, int style) { 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); @@ -511,7 +511,7 @@ public void create (Composite parent, int style) { 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); @@ -553,7 +553,7 @@ public void create (Composite parent, int style) { OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE); OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.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$ @@ -595,8 +595,8 @@ public void create (Composite parent, int style) { * 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 ()); if (originalAuth != 0) { WebKitGTK.soup_session_feature_detach (originalAuth, session); } @@ -626,7 +626,7 @@ public void create (Composite parent, int style) { } 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); @@ -665,7 +665,7 @@ public void create (Composite parent, int style) { } } -void addEventHandlers (int /*long*/ web_view, boolean top) { +void addEventHandlers (long /*int*/ web_view, boolean top) { /* * If JS is disabled (causes DOM events to not be delivered) then do not add event * listeners here, DOM events will be inferred from received GDK events instead. @@ -673,7 +673,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) { if (!jsEnabled) return; if (top && IsWebKit14orNewer) { - int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); + long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); if (domDocument != 0) { WindowMappings.put (new LONG (domDocument), new LONG (web_view)); WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect); @@ -785,8 +785,8 @@ boolean close (boolean showPrompters) { } 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 { @@ -794,16 +794,16 @@ public boolean execute (String script) { } 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; @@ -820,13 +820,13 @@ public String getBrowserType () { } 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); @@ -834,7 +834,7 @@ public String getText () { 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 { @@ -845,7 +845,7 @@ public String getText () { } 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; @@ -870,7 +870,7 @@ public String getUrl () { return url; } -boolean handleDOMEvent (int /*long*/ event, int type) { +boolean handleDOMEvent (long /*int*/ event, int type) { /* * This method handles JS events that are received through the DOM * listener API that was introduced in WebKitGTK 1.4. @@ -1225,7 +1225,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int 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); @@ -1263,7 +1263,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) { 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); @@ -1315,8 +1315,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) { * 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 (); @@ -1382,7 +1382,7 @@ void onResize (Event e) { 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); @@ -1392,12 +1392,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) { 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); @@ -1529,7 +1529,7 @@ public boolean setUrl (String url, String postData, String[] headers) { * set the value on the WebView when initiating the load request and then * remove it afterwards. */ - 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]; @@ -1558,11 +1558,11 @@ public void stop () { 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: { @@ -1572,9 +1572,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p * 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); } } @@ -1582,7 +1582,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p 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; @@ -1593,11 +1593,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) { 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; @@ -1617,14 +1617,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame) 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); final String nameString = new String (Converter.mbcsToWcs (null, bytes)); - final int /*long*/ request = WebKitGTK.webkit_download_get_network_request (download); + final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download); OS.g_object_ref (request); /* @@ -1641,7 +1641,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down String path = dialog.open (); if (path != null) { path = URI_FILEROOT + path; - int /*long*/ newDownload = WebKitGTK.webkit_download_new (request); + long /*int*/ newDownload = WebKitGTK.webkit_download_new (request); byte[] uriBytes = Converter.wcsToMbcs (null, path, true); WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes); openDownloadWindow (newDownload); @@ -1656,7 +1656,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down 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]; @@ -1673,7 +1673,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl 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); @@ -1682,7 +1682,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view, 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 @@ -1693,7 +1693,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, 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); @@ -1726,12 +1726,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, if (jsEnabled != jsEnabledOnNextPage) { jsEnabled = jsEnabledOnNextPage; DisabledJSCount += !jsEnabled ? 1 : -1; - 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) { @@ -1754,22 +1754,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, 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; @@ -1781,8 +1781,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec) 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$ @@ -1802,7 +1802,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) { 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; @@ -1810,10 +1810,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m 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); } @@ -1827,10 +1827,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m } 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); } @@ -1839,18 +1839,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m 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); @@ -1877,7 +1877,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long } /* 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) { @@ -1900,7 +1900,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long 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); @@ -1914,12 +1914,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/ 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; @@ -1957,16 +1957,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) { 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 (); @@ -1974,16 +1974,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f 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 (web_view, 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) { @@ -2023,7 +2023,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj 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); } @@ -2034,8 +2034,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) { } 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; } @@ -2048,10 +2048,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) { 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); @@ -2060,7 +2060,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) { 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: { @@ -2072,9 +2072,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) { 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); @@ -2095,15 +2095,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) { } 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 --git a/org/eclipse/swt/browser/WindowCreator2.java b/org/eclipse/swt/browser/WindowCreator2.java index 8882a4f..78c21ab 100644 --- a/org/eclipse/swt/browser/WindowCreator2.java +++ b/org/eclipse/swt/browser/WindowCreator2.java @@ -35,24 +35,24 @@ int AddRef () { 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 @@ void disposeCOMInterfaces () { } } -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 @@ int Release () { /* 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_10_IID, result); if (rc != XPCOM.NS_OK) { rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); @@ -139,7 +139,7 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, 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); @@ -185,11 +185,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, }); 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)); @@ -218,11 +218,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, 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) { XPCOM.memmove (cancel, new boolean[] {true}); diff --git a/org/eclipse/swt/dnd/ByteArrayTransfer.java b/org/eclipse/swt/dnd/ByteArrayTransfer.java index 6620e74..e8baa38 100644 --- a/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -155,7 +155,7 @@ protected void javaToNative (Object object, TransferData transferData) { } 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 --git a/org/eclipse/swt/dnd/Clipboard.java b/org/eclipse/swt/dnd/Clipboard.java index 541830f..7b3f563 100644 --- a/org/eclipse/swt/dnd/Clipboard.java +++ b/org/eclipse/swt/dnd/Clipboard.java @@ -32,14 +32,14 @@ public class Clipboard { 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) { 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 @@ public String[] getAvailableTypeNames() { 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 @@ public String[] getAvailableTypeNames() { 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 @@ public String[] getAvailableTypeNames() { 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[] getAvailablePrimaryTypes() { } 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 @@ private int[] getAvailableClipboardTypes () { 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 --git a/org/eclipse/swt/dnd/ClipboardProxy.java b/org/eclipse/swt/dnd/ClipboardProxy.java index c03768f..b68c23e 100644 --- a/org/eclipse/swt/dnd/ClipboardProxy.java +++ b/org/eclipse/swt/dnd/ClipboardProxy.java @@ -30,7 +30,7 @@ class ClipboardProxy { 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 @@ void clear (Clipboard owner, int clipboards) { } } -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 @@ void dispose () { * 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 @@ int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /* 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 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo 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 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo 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 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo 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 --git a/org/eclipse/swt/dnd/DragSource.java b/org/eclipse/swt/dnd/DragSource.java index 87113a3..f2c713e 100644 --- a/org/eclipse/swt/dnd/DragSource.java +++ b/org/eclipse/swt/dnd/DragSource.java @@ -106,7 +106,7 @@ public class DragSource extends Widget { 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 @@ static int checkStyle (int style) { 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 @@ void drag(Event dragEvent) { 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 = ImageList.createPixbuf(image); + long /*int*/ pixbuf = ImageList.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 @@ void dragEnd(int /*long*/ widget, int /*long*/ context){ 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 @@ void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selecti return; } -void dragDataDelete(int /*long*/ widget, int /*long*/ context){ +void dragDataDelete(long /*int*/ widget, long /*int*/ context){ moveData = true; } @@ -564,7 +564,7 @@ public void setTransfer(Transfer[] transferAgents){ } } - 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); } diff --git a/org/eclipse/swt/dnd/DropTarget.java b/org/eclipse/swt/dnd/DropTarget.java index c9cc25a..1f5166d 100644 --- a/org/eclipse/swt/dnd/DropTarget.java +++ b/org/eclipse/swt/dnd/DropTarget.java @@ -245,33 +245,33 @@ static int checkStyle (int style) { return style; } -static int /*long*/ Drag_Data_Received ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ data, int /*long*/ info, int /*long*/ time){ +static long /*int*/ Drag_Data_Received ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ data, long /*int*/ info, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time); return 0; } -static int /*long*/ Drag_Drop(int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time) { +static long /*int*/ Drag_Drop(long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time) { DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static int /*long*/ Drag_Leave ( int /*long*/ widget, int /*long*/ context, int /*long*/ time){ +static long /*int*/ Drag_Leave ( long /*int*/ widget, long /*int*/ context, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_leave (widget, context, (int)/*64*/time); return 0; } -static int /*long*/ Drag_Motion ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time){ +static long /*int*/ Drag_Motion ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static DropTarget FindDropTarget(int /*long*/ handle) { +static DropTarget FindDropTarget(long /*int*/ handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -332,7 +332,7 @@ protected void checkSubclass () { } } -void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int y, int /*long*/ data, int info, int time){ +void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int y, long /*int*/ data, int info, int time){ DNDEvent event = new DNDEvent(); if (data == 0 || !setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -380,7 +380,7 @@ void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int return; } -boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int time) { +boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int time) { DNDEvent event = new DNDEvent(); if (!setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -417,7 +417,7 @@ boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int t return true; } -void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){ +void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){ updateDragOverHover(0, null); if (keyOperation == -1) return; @@ -430,7 +430,7 @@ void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){ notifyListeners(DND.DragLeave, event); } -boolean drag_motion ( int /*long*/ widget, int /*long*/ context, int x, int y, int time){ +boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){ int oldKeyOperation = keyOperation; /* @@ -694,7 +694,7 @@ public void setTransfer(Transfer[] transferAgents){ } } - 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); } @@ -702,7 +702,7 @@ public void setTransfer(Transfer[] transferAgents){ int actions = opToOsOp(getStyle()); if (control instanceof Combo) { if ((control.getStyle() & SWT.READ_ONLY) == 0) { - int /*long*/ entryHandle = OS.gtk_bin_get_child (control.handle); + long /*int*/ entryHandle = OS.gtk_bin_get_child (control.handle); if (entryHandle != 0) { OS.gtk_drag_dest_unset(entryHandle); } @@ -728,7 +728,7 @@ public void setDropTargetEffect(DropTargetEffect effect) { dropEffect = effect; } -boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent event) { +boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent event) { if (context == 0) return false; GdkDragContext dragContext = new GdkDragContext(); OS.memmove(dragContext, context, GdkDragContext.sizeof); @@ -754,7 +754,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even int length = OS.g_list_length(dragContext.targets); TransferData[] dataTypes = new TransferData[0]; for (int i = 0; i < length; i++) { - int /*long*/ pData = OS.g_list_nth(dragContext.targets, i); + long /*int*/ pData = OS.g_list_nth(dragContext.targets, i); GtkTargetPair gtkTargetPair = new GtkTargetPair(); OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof); TransferData data = new TransferData(); @@ -772,7 +772,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even } if (dataTypes.length == 0) return false; - int /*long*/ window = OS.GTK_WIDGET_WINDOW(control.handle); + long /*int*/ window = OS.GTK_WIDGET_WINDOW(control.handle); int [] origin_x = new int[1], origin_y = new int[1]; OS.gdk_window_get_origin(window, origin_x, origin_y); Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y); diff --git a/org/eclipse/swt/dnd/FileTransfer.java b/org/eclipse/swt/dnd/FileTransfer.java index 5795831..c8d716f 100644 --- a/org/eclipse/swt/dnd/FileTransfer.java +++ b/org/eclipse/swt/dnd/FileTransfer.java @@ -85,13 +85,13 @@ public void javaToNative(Object object, TransferData transferData) { if (length == 0) continue; char[] chars = new char[length]; string.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) continue; - 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) continue; - 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) continue; length = OS.strlen(uriPtr); @@ -111,7 +111,7 @@ public void javaToNative(Object object, TransferData transferData) { buffer = newBuffer; } if (buffer.length == 0) return; - int /*long*/ ptr = OS.g_malloc(buffer.length+1); + long /*int*/ ptr = OS.g_malloc(buffer.length+1); OS.memset(ptr, '\0', buffer.length+1); OS.memmove(ptr, buffer, buffer.length); transferData.pValue = ptr; @@ -137,7 +137,7 @@ public Object nativeToJava(TransferData transferData) { OS.memmove(temp, transferData.pValue, length); boolean gnomeList = transferData.type == GNOME_LIST_ID; int sepLength = gnomeList ? 1 : 2; - int /*long*/[] files = new int /*long*/[0]; + long /*int*/[] files = new long /*int*/[0]; int offset = 0; for (int i = 0; i < temp.length - 1; i++) { boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n'; @@ -145,11 +145,11 @@ public Object nativeToJava(TransferData transferData) { if (!(gnomeList && offset == 0)) { /* The content of the first line in a gnome-list is always either 'copy' or 'cut' */ int size = i - offset; - int /*long*/ file = OS.g_malloc(size + 1); + long /*int*/ file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); OS.memmove(file, fileBuffer, size + 1); - int /*long*/[] newFiles = new int /*long*/[files.length + 1]; + long /*int*/[] newFiles = new long /*int*/[files.length + 1]; System.arraycopy(files, 0, newFiles, 0, files.length); newFiles[files.length] = file; files = newFiles; @@ -159,27 +159,27 @@ public Object nativeToJava(TransferData transferData) { } if (offset < temp.length - sepLength) { int size = temp.length - offset; - int /*long*/ file = OS.g_malloc(size + 1); + long /*int*/ file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); OS.memmove(file, fileBuffer, size + 1); - int /*long*/[] newFiles = new int /*long*/[files.length + 1]; + long /*int*/[] newFiles = new long /*int*/[files.length + 1]; System.arraycopy(files, 0, newFiles, 0, files.length); newFiles[files.length] = file; files = newFiles; } String[] fileNames = new String[0]; for (int i = 0; i < files.length; i++) { - int /*long*/[] error = new int /*long*/[1]; - int /*long*/ localePtr = OS.g_filename_from_uri(files[i], null, error); + long /*int*/[] error = new long /*int*/[1]; + long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error); OS.g_free(files[i]); if (error[0] != 0 || localePtr == 0) continue; - int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); + long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr); if (localePtr != utf8Ptr) OS.g_free (localePtr); if (utf8Ptr == 0) continue; - 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) continue; length = (int)/*64*/items_written[0]; diff --git a/org/eclipse/swt/dnd/HTMLTransfer.java b/org/eclipse/swt/dnd/HTMLTransfer.java index cd7465f..0fa1abf 100644 --- a/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/org/eclipse/swt/dnd/HTMLTransfer.java @@ -64,7 +64,7 @@ public void javaToNative (Object object, TransferData transferData){ String string = (String)object; byte[] utf8 = Converter.wcsToMbcs(null, string, true); int byteCount = utf8.length; - int /*long*/ pValue = OS.g_malloc(byteCount); + long /*int*/ pValue = OS.g_malloc(byteCount); if (pValue == 0) return; OS.memmove(pValue, utf8, byteCount); transferData.length = byteCount; diff --git a/org/eclipse/swt/dnd/ImageTransfer.java b/org/eclipse/swt/dnd/ImageTransfer.java index ffc92bb..ffa0b07 100644 --- a/org/eclipse/swt/dnd/ImageTransfer.java +++ b/org/eclipse/swt/dnd/ImageTransfer.java @@ -89,7 +89,7 @@ public void javaToNative(Object object, TransferData transferData) { ImageData imgData = (ImageData)object; if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); Image image = new Image(Display.getCurrent(), imgData); - int /*long*/ pixbuf = ImageList.createPixbuf(image); + long /*int*/ pixbuf = ImageList.createPixbuf(image); if (pixbuf != 0) { String typeStr = ""; if (transferData.type == JPEG_ID) typeStr = "jpeg"; @@ -104,8 +104,8 @@ public void javaToNative(Object object, TransferData transferData) { else if (transferData.type == XPM_ID) typeStr = "xpm"; else if (transferData.type == XV_ID) typeStr = "xv"; byte[] type = Converter.wcsToMbcs(null, typeStr , true); - int /*long*/ [] buffer = new int /*long*/ [1]; - int /*long*/ [] len = new int /*long*/ [1]; + long /*int*/ [] buffer = new long /*int*/ [1]; + long /*int*/ [] len = new long /*int*/ [1]; if (type == null) return; OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null); OS.g_object_unref(pixbuf); @@ -130,11 +130,11 @@ public void javaToNative(Object object, TransferData transferData) { public Object nativeToJava(TransferData transferData) { ImageData imgData = null; if (transferData.length > 0) { - int /*long*/ loader = OS.gdk_pixbuf_loader_new(); + long /*int*/ loader = OS.gdk_pixbuf_loader_new(); try { 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) { Image img = Image.gtk_new_from_pixbuf(Display.getCurrent(), SWT.BITMAP, pixbuf); imgData = img.getImageData(); diff --git a/org/eclipse/swt/dnd/RTFTransfer.java b/org/eclipse/swt/dnd/RTFTransfer.java index 74aae33..98284e6 100644 --- a/org/eclipse/swt/dnd/RTFTransfer.java +++ b/org/eclipse/swt/dnd/RTFTransfer.java @@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){ } 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 --git a/org/eclipse/swt/dnd/TableDragSourceEffect.java b/org/eclipse/swt/dnd/TableDragSourceEffect.java index fdb6313..0a4b93b 100644 --- a/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -88,27 +88,27 @@ public class TableDragSourceEffect extends DragSourceEffect { * in versions smaller than 2.2.4 if the model is NULL. The fix is * to give a valid pointer instead. */ - 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); OS.gtk_tree_path_free (path); } else { int width = 0, height = 0; int[] w = new int[1], h = new int[1]; int[] yy = new int[count], hh = new int[count]; - 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 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { 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 @@ public boolean equals(Object object) { * * @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 --git a/org/eclipse/swt/graphics/Device.java b/org/eclipse/swt/graphics/Device.java index fd2a4ac..403eef4 100644 --- a/org/eclipse/swt/graphics/Device.java +++ b/org/eclipse/swt/graphics/Device.java @@ -36,8 +36,8 @@ public abstract class Device implements Drawable { * * @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 @@ public abstract class Device implements Drawable { 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 @@ public abstract class Device implements Drawable { /* 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 @@ public abstract class Device implements Drawable { /* Device dpi */ Point dpi; - int /*long*/ emptyTab; + long /*int*/ emptyTab; boolean useXRender; static boolean CAIRO_LOADED; @@ -173,7 +173,7 @@ void checkCairo() { } 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 { @@ -272,7 +272,7 @@ void dispose_Object (Object object) { } } -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, @@ -735,7 +735,7 @@ public boolean loadFont (String path) { 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 (); @@ -806,7 +806,7 @@ protected void release () { 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) { @@ -899,7 +899,7 @@ public void setWarnings (boolean warnings) { } } -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) { @@ -917,7 +917,7 @@ static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent) 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 --git a/org/eclipse/swt/graphics/Drawable.java b/org/eclipse/swt/graphics/Drawable.java index 141268b..3bb7650 100644 --- a/org/eclipse/swt/graphics/Drawable.java +++ b/org/eclipse/swt/graphics/Drawable.java @@ -45,7 +45,7 @@ public interface Drawable { * @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 @@ public int /*long*/ internal_new_GC (GCData data); * * @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 --git a/org/eclipse/swt/graphics/Font.java b/org/eclipse/swt/graphics/Font.java index 70a7b7d..62a2cba 100644 --- a/org/eclipse/swt/graphics/Font.java +++ b/org/eclipse/swt/graphics/Font.java @@ -44,7 +44,7 @@ public final class Font extends Resource { * * @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 boolean equals(Object object) { 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 @@ public FontData[] getFontData() { if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC; if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN; if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD; - 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 @@ public FontData[] getFontData() { * * @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 --git a/org/eclipse/swt/graphics/GC.java b/org/eclipse/swt/graphics/GC.java index fb6d761..92413e2 100644 --- a/org/eclipse/swt/graphics/GC.java +++ b/org/eclipse/swt/graphics/GC.java @@ -69,7 +69,7 @@ public final class GC extends Resource { * * @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 @@ public GC(Drawable drawable, int style) { 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 @@ public GC(Drawable drawable, int style) { 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 @@ static int checkStyle (int style) { 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(int /*long*/ handle, GCData data) { 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 @@ void checkGC (int mask) { 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 @@ void checkGC (int mask) { } 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 @@ void checkGC (int mask) { } } -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 @@ int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) { 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 @@ public void copyArea(Image image, int x, int y) { if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); if (OS.USE_CAIRO) { - int /*long*/ cairo = Cairo.cairo_create(image.surface); + long /*int*/ cairo = Cairo.cairo_create(image.surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_translate(cairo, -x, -y); Cairo.cairo_push_group(cairo); @@ -462,10 +462,10 @@ public void copyArea(Image image, int x, int y) { int[] w = new int[1], h = new int[1]; OS.gdk_drawable_get_size(data.drawable, w, h); int width = w[0], height = h[0]; - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ xDrawable = OS.gdk_x11_drawable_get_xid(data.drawable); - int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); - int /*long*/ srcSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDrawable = OS.gdk_x11_drawable_get_xid(data.drawable); + long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); + long /*int*/ srcSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height); Cairo.cairo_set_source_surface(cairo, srcSurface, 0, 0); } } else { @@ -480,7 +480,7 @@ public void copyArea(Image image, int x, int y) { return; } 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); @@ -528,7 +528,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d 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 (OS.USE_CAIRO) { if (data.image != null) { Cairo.cairo_set_source_surface(handle, data.image.surface, deltaX, deltaY); @@ -550,15 +550,15 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d Cairo.cairo_paint(handle); Cairo.cairo_restore(handle); if (paint) { - int /*long*/ visibleRegion = OS.gdk_drawable_get_visible_region (drawable); + long /*int*/ visibleRegion = OS.gdk_drawable_get_visible_region (drawable); GdkRectangle srcRect = new GdkRectangle (); srcRect.x = srcX; srcRect.y = srcY; 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); OS.gdk_window_invalidate_region(drawable, invalidateRegion, false); @@ -608,10 +608,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d } 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()); @@ -636,13 +636,13 @@ void disposeLayout() { 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) { @@ -705,7 +705,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc 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) { @@ -756,8 +756,8 @@ public void drawFocus(int x, int y, int width, int height) { * 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]; @@ -868,7 +868,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, 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(); @@ -890,7 +890,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break; case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break; } - 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) { /* @@ -912,8 +912,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, */ int version = Cairo.cairo_version (); if (version >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0) && version < Cairo.CAIRO_VERSION_ENCODE(1, 8, 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); @@ -936,7 +936,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, 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); @@ -977,7 +977,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, 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); @@ -994,12 +994,12 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei 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; @@ -1012,7 +1012,7 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei 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; @@ -1021,33 +1021,33 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei 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); @@ -1695,7 +1695,7 @@ public void drawText (String string, int x, int y, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (string.length() == 0) return; - 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 @@ -1744,13 +1744,13 @@ public void drawText (String string, int x, int y, int flags) { 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_get_default_root_window(), data.stringWidth, data.stringHeight, -1); + long /*int*/ pixmap = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), 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); @@ -1823,7 +1823,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc 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) { @@ -1900,9 +1900,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v 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 { @@ -1952,7 +1952,7 @@ public void fillOval(int x, int y, int width, int height) { 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); @@ -1998,8 +1998,8 @@ public void fillPath (Path path) { 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); @@ -2029,7 +2029,7 @@ public void fillPolygon(int[] pointArray) { 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); @@ -2064,7 +2064,7 @@ public void fillRectangle(int x, int y, int width, int height) { 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); @@ -2130,7 +2130,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth } 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); @@ -2155,7 +2155,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth } 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); @@ -2369,11 +2369,11 @@ public Rectangle getClipping() { width = w[0]; 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; @@ -2429,10 +2429,10 @@ public void getClipping(Region region) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - 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(); int[] width = new int[1], height = new int[1]; @@ -2443,7 +2443,7 @@ public void getClipping(Region region) { } 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 { @@ -2458,7 +2458,7 @@ public void getClipping(Region region) { 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); @@ -2479,7 +2479,7 @@ public void getClipping(Region region) { */ 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; } @@ -2515,9 +2515,9 @@ public FontMetrics getFontMetrics() { 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)); @@ -2752,7 +2752,7 @@ void getSize(int[] width, int[] height) { return; } if (OS.USE_CAIRO) { - int /*long*/ surface = Cairo.cairo_get_target(handle); + long /*int*/ surface = Cairo.cairo_get_target(handle); switch (Cairo.cairo_surface_get_type(surface)) { case Cairo.CAIRO_SURFACE_TYPE_IMAGE: width[0] = Cairo.cairo_image_surface_get_width(surface); @@ -2787,13 +2787,13 @@ public int getTextAntialias() { 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); } } @@ -2828,7 +2828,7 @@ public void getTransform(Transform transform) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; if (cairo != 0) { Cairo.cairo_get_matrix(cairo, transform.handle); double[] identity = identity(); @@ -2891,7 +2891,7 @@ double[] identity() { 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; @@ -2910,7 +2910,7 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) { this.data = data; handle = gdkGC; if (OS.USE_CAIRO) { - int /*long*/ cairo = data.cairo = handle; + long /*int*/ cairo = data.cairo = handle; Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD); data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET); } else if (OS.INIT_CAIRO) { @@ -2919,27 +2919,27 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) { setClipping(data.clipRgn); 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); - int /*long*/ xDrawable = 0; + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + 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]; @@ -2949,7 +2949,7 @@ void initCairo() { 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); @@ -3073,7 +3073,7 @@ public void setAdvanced(boolean advanced) { } 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; @@ -3153,7 +3153,7 @@ public void setAntialias(int antialias) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } initCairo(); - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; Cairo.cairo_set_antialias(cairo, mode); } @@ -3215,12 +3215,12 @@ public void setBackgroundPattern(Pattern pattern) { 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); @@ -3237,12 +3237,12 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) { 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,18,0) && data.drawable != 0) { OS.gdk_cairo_reset_clip(cairo, data.drawable); } else { @@ -3285,8 +3285,8 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) { } } -void setClipping(int /*long*/ clipRgn) { - int /*long*/ cairo = data.cairo; +void setClipping(long /*int*/ clipRgn) { + long /*int*/ cairo = data.cairo; if (clipRgn == 0) { if (data.clipRgn != 0) { OS.gdk_region_destroy(data.clipRgn); @@ -3296,7 +3296,7 @@ void setClipping(int /*long*/ clipRgn) { data.clippingTransform = null; setCairoClip(data.damageRgn, 0); } else { - int /*long*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0; + long /*int*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0; OS.gdk_gc_set_clip_region(handle, clipping); } } else { @@ -3308,7 +3308,7 @@ void setClipping(int /*long*/ clipRgn) { Cairo.cairo_get_matrix(cairo, data.clippingTransform); setCairoClip(data.damageRgn, clipRgn); } else { - int /*long*/ clipping = clipRgn; + long /*int*/ clipping = clipRgn; if (data.damageRgn != 0) { clipping = OS.gdk_region_new(); OS.gdk_region_union(clipping, clipRgn); @@ -3349,7 +3349,7 @@ public void setClipping(int x, int y, int width, int height) { rect.y = y; rect.width = width; rect.height = height; - int /*long*/ clipRgn = OS.gdk_region_new(); + long /*int*/ clipRgn = OS.gdk_region_new(); OS.gdk_region_union_with_rect(clipRgn, rect); setClipping(clipRgn); OS.gdk_region_destroy(clipRgn); @@ -3387,8 +3387,8 @@ public void setClipping(Path path) { setClipping(0); if (path != null) { initCairo(); - 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); @@ -3491,7 +3491,7 @@ public void setFillRule(int rule) { } //TODO - need fill rule in X, GDK has no API initCairo(); - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; if (cairo != 0) { Cairo.cairo_set_fill_rule(cairo, cairo_mode); } @@ -3882,7 +3882,7 @@ void setString(String string, int flags) { } byte[] buffer; int mnemonic, length = string.length (); - int /*long*/ layout = data.layout; + long /*int*/ layout = data.layout; char[] text = new char[length]; string.getChars(0, length, text, 0); if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) { @@ -3895,8 +3895,8 @@ void setString(String string, int flags) { buffer = new byte[buffer1.length + buffer2.length]; System.arraycopy(buffer1, 0, buffer, 0, buffer1.length); System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length); - int /*long*/ attr_list = OS.pango_attr_list_new(); - int /*long*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW); + long /*int*/ attr_list = OS.pango_attr_list_new(); + long /*int*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW); PangoAttribute attribute = new PangoAttribute(); OS.memmove(attribute, attr, PangoAttribute.sizeof); attribute.start_index = buffer1.length; @@ -3958,7 +3958,7 @@ public void setTextAntialias(int antialias) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } initCairo(); - int /*long*/ options = Cairo.cairo_font_options_create(); + long /*int*/ options = Cairo.cairo_font_options_create(); Cairo.cairo_font_options_set_antialias(options, mode); if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) { Cairo.cairo_set_font_options(data.cairo, options); @@ -4000,7 +4000,7 @@ public void setTransform(Transform transform) { if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); if (data.cairo == 0 && transform == null) return; initCairo(); - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; double[] identity = identity(); if (transform != null) { Cairo.cairo_matrix_multiply(identity, transform.handle, identity); @@ -4032,7 +4032,7 @@ public void setTransform(Transform transform) { */ public void setXORMode(boolean xor) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; if (cairo != 0) { if (Cairo.cairo_version() >= Cairo.CAIRO_VERSION_ENCODE(1, 10, 0)) { Cairo.cairo_set_operator(handle, xor ? Cairo.CAIRO_OPERATOR_DIFFERENCE : Cairo.CAIRO_OPERATOR_OVER); @@ -4124,7 +4124,7 @@ public Point textExtent(String string) { public Point textExtent(String string, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - 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 diff --git a/org/eclipse/swt/graphics/GCData.java b/org/eclipse/swt/graphics/GCData.java index 2259ddc..c956db3 100644 --- a/org/eclipse/swt/graphics/GCData.java +++ b/org/eclipse/swt/graphics/GCData.java @@ -34,7 +34,7 @@ public final class GCData { 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 final class GCData { 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[] identity, clippingTransform; diff --git a/org/eclipse/swt/graphics/Image.java b/org/eclipse/swt/graphics/Image.java index 9f7fda7..786cd1c 100644 --- a/org/eclipse/swt/graphics/Image.java +++ b/org/eclipse/swt/graphics/Image.java @@ -96,7 +96,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ pixmap; + public long /*int*/ pixmap; /** * The handle to the OS mask resource. @@ -110,7 +110,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ mask; + public long /*int*/ mask; /** * The handle to the OS cairo surface resource. @@ -124,7 +124,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ surface; + public long /*int*/ surface; /** * specifies the transparent pixel @@ -255,14 +255,14 @@ public Image(Device device, Image srcImage, int flag) { System.arraycopy(srcImage.alphaData, 0, alphaData, 0, alphaData.length); } - int /*long*/ imageSurface = srcImage.surface; + long /*int*/ imageSurface = srcImage.surface; int width = this.width = srcImage.width; int height = this.height = srcImage.height; int format = Cairo.cairo_surface_get_content(imageSurface) == Cairo.CAIRO_CONTENT_COLOR ? Cairo.CAIRO_FORMAT_RGB24 : Cairo.CAIRO_FORMAT_ARGB32; boolean hasAlpha = format == Cairo.CAIRO_FORMAT_ARGB32; surface = Cairo.cairo_image_surface_create(format, width, height); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ cairo = Cairo.cairo_create(surface); + long /*int*/ cairo = Cairo.cairo_create(surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE); Cairo.cairo_set_source_surface (cairo, imageSurface, 0, 0); @@ -270,7 +270,7 @@ public Image(Device device, Image srcImage, int flag) { Cairo.cairo_destroy(cairo); if (flag != SWT.IMAGE_COPY) { int stride = Cairo.cairo_image_surface_get_stride(surface); - int /*long*/ data = Cairo.cairo_image_surface_get_data(surface); + long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); int oa, or, og, ob; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -371,9 +371,9 @@ public Image(Device device, Image srcImage, int flag) { if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) { /* Generate the mask if necessary. */ if (srcImage.transparentPixel != -1) srcImage.createMask(); - int /*long*/ mask = OS.gdk_pixmap_new(0, width, height, 1); + long /*int*/ mask = OS.gdk_pixmap_new(0, width, height, 1); if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ gdkGC = OS.gdk_gc_new(mask); + long /*int*/ gdkGC = OS.gdk_gc_new(mask); if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height); OS.g_object_unref(gdkGC); @@ -392,9 +392,9 @@ public Image(Device device, Image srcImage, int flag) { createAlphaMask(width, height); /* Create the new pixmap */ - int /*long*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1); + long /*int*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1); if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ gdkGC = OS.gdk_gc_new(pixmap); + long /*int*/ gdkGC = OS.gdk_gc_new(pixmap); if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES); this.pixmap = pixmap; @@ -404,12 +404,12 @@ public Image(Device device, Image srcImage, int flag) { } else { /* Retrieve the source pixmap data */ - int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); + long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ colormap = OS.gdk_colormap_get_system(); + long /*int*/ colormap = OS.gdk_colormap_get_system(); OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height); int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); - int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); /* Apply transformation */ switch (flag) { @@ -671,7 +671,7 @@ void initNative(String filename) { char [] chars = new char [length]; filename.getChars (0, length, chars, 0); byte [] buffer = Converter.wcsToMbcs(null, chars, true); - int /*long*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null); + long /*int*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null); if (pixbuf != 0) { try { createFromPixbuf (SWT.BITMAP, pixbuf); @@ -686,14 +686,14 @@ void createAlphaMask (int width, int height) { if (device.useXRender && (alpha != -1 || alphaData != null)) { mask = OS.gdk_pixmap_new(0, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8); if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ gc = OS.gdk_gc_new(mask); + long /*int*/ gc = OS.gdk_gc_new(mask); if (alpha != -1) { GdkColor color = new GdkColor(); color.pixel = (alpha & 0xFF) << 8 | (alpha & 0xFF); OS.gdk_gc_set_foreground(gc, color); OS.gdk_draw_rectangle(mask, gc, 1, 0, 0, 1, 1); } else { - int /*long*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height); + long /*int*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height); if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES); GdkImage gdkImage = new GdkImage(); OS.memmove(gdkImage, imagePtr); @@ -713,18 +713,18 @@ void createAlphaMask (int width, int height) { } } -void createFromPixbuf(int type, int /*long*/ pixbuf) { +void createFromPixbuf(int type, long /*int*/ pixbuf) { this.type = type; boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf); if (OS.USE_CAIRO) { int width = this.width = OS.gdk_pixbuf_get_width(pixbuf); int height = this.height = OS.gdk_pixbuf_get_height(pixbuf); int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); - int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); int format = hasAlpha ? Cairo.CAIRO_FORMAT_ARGB32 : Cairo.CAIRO_FORMAT_RGB24; surface = Cairo.cairo_image_surface_create(format, width, height); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ data = Cairo.cairo_image_surface_get_data(surface); + long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); int cairoStride = Cairo.cairo_image_surface_get_stride(surface); int oa = 0, or = 0, og = 0, ob = 0; if (OS.BIG_ENDIAN) { @@ -781,7 +781,7 @@ void createFromPixbuf(int type, int /*long*/ pixbuf) { int width = OS.gdk_pixbuf_get_width(pixbuf); int height = OS.gdk_pixbuf_get_height(pixbuf); int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); - int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); byte[] line = new byte[stride]; alphaData = new byte[width * height]; for (int y = 0; y < height; y++) { @@ -794,7 +794,7 @@ void createFromPixbuf(int type, int /*long*/ pixbuf) { } createAlphaMask(width, height); } - int /*long*/ [] pixmap_return = new int /*long*/ [1]; + long /*int*/ [] pixmap_return = new long /*int*/ [1]; OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0); this.pixmap = pixmap_return[0]; if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -809,7 +809,7 @@ void createMask() { int width = this.width; int height = this.height; int stride = Cairo.cairo_image_surface_get_stride(surface); - int /*long*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); + long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); int oa, or, og, ob, tr, tg, tb; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -850,7 +850,7 @@ void createMask() { if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); } -int /*long*/ createMask(ImageData image, boolean copy) { +long /*int*/ createMask(ImageData image, boolean copy) { ImageData mask = image.getTransparencyMask(); byte[] data = mask.data; byte[] maskData = copy ? new byte[data.length] : data; @@ -872,12 +872,12 @@ void createSurface() { OS.gdk_drawable_get_size(pixmap, w, h); int width = w[0], height = h[0]; if (mask != 0 || alpha != -1 || alphaData != null) { - int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); + long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ colormap = OS.gdk_colormap_get_system(); + long /*int*/ colormap = OS.gdk_colormap_get_system(); OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height); int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); - int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); byte[] line = new byte[stride]; int oa, or, og, ob; if (OS.BIG_ENDIAN) { @@ -886,13 +886,13 @@ void createSurface() { oa = 3; or = 2; og = 1; ob = 0; } if (mask != 0 && OS.gdk_drawable_get_depth(mask) == 1) { - int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); + long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); if (maskPixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.gdk_pixbuf_get_from_drawable(maskPixbuf, mask, 0, 0, 0, 0, 0, width, height); int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf); - int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); + long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); byte[] maskLine = new byte[maskStride]; - int /*long*/ offset = pixels, maskOffset = maskPixels; + long /*int*/ offset = pixels, maskOffset = maskPixels; for (int y=0; y= OS.VERSION(2, 22, 0)) { surface = OS.gdk_window_create_similar_surface(OS.gdk_get_default_root_window(), Cairo.CAIRO_CONTENT_COLOR, width, height); } else { - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ xDrawable = OS.gdk_x11_drawable_get_xid(OS.gdk_get_default_root_window()); - int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); - int /*long*/ rootSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, 1, 1); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDrawable = OS.gdk_x11_drawable_get_xid(OS.gdk_get_default_root_window()); + long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); + long /*int*/ rootSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, 1, 1); if (rootSurface == 0) SWT.error(SWT.ERROR_NO_HANDLES); surface = Cairo.cairo_surface_create_similar(rootSurface, Cairo.CAIRO_CONTENT_COLOR, width, height); Cairo.cairo_surface_destroy(rootSurface); } if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ cairo = Cairo.cairo_create(surface); + long /*int*/ cairo = Cairo.cairo_create(surface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_source_rgb(cairo, 1, 1, 1); Cairo.cairo_rectangle(cairo, 0, 0, width, height); @@ -1299,9 +1299,9 @@ void init(int width, int height) { white.red = (short)0xFFFF; white.green = (short)0xFFFF; white.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, white, true, true); - int /*long*/ gdkGC = OS.gdk_gc_new(pixmap); + long /*int*/ gdkGC = OS.gdk_gc_new(pixmap); OS.gdk_gc_set_foreground(gdkGC, white); OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height); OS.g_object_unref(gdkGC); @@ -1322,7 +1322,7 @@ void init(ImageData image) { surface = Cairo.cairo_image_surface_create(format, width, height); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); int stride = Cairo.cairo_image_surface_get_stride(surface); - int /*long*/ data = Cairo.cairo_image_surface_get_data(surface); + long /*int*/ data = Cairo.cairo_image_surface_get_data(surface); int oa = 0, or = 0, og = 0, ob = 0; int redMask, greenMask, blueMask, destDepth = 32, destOrder; if (OS.BIG_ENDIAN) { @@ -1447,10 +1447,10 @@ void init(ImageData image) { //TODO convert to XLIB surface if opaque for better performance return; } - int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); + long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); int 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 = image.data; if (!palette.isDirect || image.depth != 24 || stride != image.bytesPerLine || palette.redMask != 0xFF0000 || palette.greenMask != 0xFF00 || palette.blueMask != 0xFF) { buffer = new byte[stride * height]; @@ -1481,9 +1481,9 @@ void init(ImageData image) { } } OS.memmove(data, buffer, stride * height); - int /*long*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1); + long /*int*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1); if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ gdkGC = OS.gdk_gc_new(pixmap); + long /*int*/ gdkGC = OS.gdk_gc_new(pixmap); if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0); OS.g_object_unref(gdkGC); @@ -1504,7 +1504,7 @@ void init(ImageData image) { transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue; } } - int /*long*/ mask = createMask(image, isIcon); + long /*int*/ mask = createMask(image, isIcon); if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); this.mask = mask; if (isIcon) { @@ -1540,12 +1540,12 @@ void init(ImageData image) { * * @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_GRAPHIC_DISPOSED); if (type != SWT.BITMAP || memGC != null) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - int /*long*/ gc; + long /*int*/ gc; if (OS.USE_CAIRO) { gc = Cairo.cairo_create(surface); } else { @@ -1585,8 +1585,8 @@ public int /*long*/ internal_new_GC (GCData data) { * * @noreference This method is not intended to be referenced by clients. */ -public void internal_dispose_GC (int /*long*/ hDC, GCData data) { - int /*long*/ gc = hDC; +public void internal_dispose_GC (long /*int*/ hDC, GCData data) { + long /*int*/ gc = hDC; if (OS.USE_CAIRO) { Cairo.cairo_destroy(gc); } else { diff --git a/org/eclipse/swt/graphics/Path.java b/org/eclipse/swt/graphics/Path.java index 4a2cb56..97402eb 100644 --- a/org/eclipse/swt/graphics/Path.java +++ b/org/eclipse/swt/graphics/Path.java @@ -49,7 +49,7 @@ public class Path extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ handle; + public long /*int*/ handle; boolean moved, closed = true; @@ -78,7 +78,7 @@ public class Path extends Resource { public Path (Device device) { super(device); this.device.checkCairo(); - int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); handle = Cairo.cairo_create(surface); Cairo.cairo_surface_destroy(surface); @@ -121,12 +121,12 @@ public Path (Device device, Path path, float flatness) { super(device); if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); handle = Cairo.cairo_create(surface); Cairo.cairo_surface_destroy(surface); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ copy; + long /*int*/ copy; flatness = Math.max(0, flatness); if (flatness == 0) { copy = Cairo.cairo_copy_path(path.handle); @@ -251,7 +251,7 @@ public void addPath(Path path) { if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); moved = false; - int /*long*/ copy = Cairo.cairo_copy_path(path.handle); + long /*int*/ copy = Cairo.cairo_copy_path(path.handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(handle, copy); Cairo.cairo_path_destroy(copy); @@ -350,8 +350,8 @@ public boolean contains(float x, float y, GC gc, boolean outline) { gc.initCairo(); gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH); boolean result = false; - int /*long*/ cairo = gc.data.cairo; - int /*long*/ copy = Cairo.cairo_copy_path(handle); + long /*int*/ cairo = gc.data.cairo; + long /*int*/ copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_append_path(cairo, copy); Cairo.cairo_path_destroy(copy); @@ -409,7 +409,7 @@ public void getBounds(float[] bounds) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int /*long*/ copy = Cairo.cairo_copy_path(handle); + long /*int*/ copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); cairo_path_t path = new cairo_path_t(); Cairo.memmove(path, copy, cairo_path_t.sizeof); @@ -421,7 +421,7 @@ public void getBounds(float[] bounds) { double[] points = new double[6]; cairo_path_data_t data = new cairo_path_data_t(); while (i < path.num_data) { - int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof; + long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; Cairo.memmove(data, offset, cairo_path_data_t.sizeof); switch (data.type) { case Cairo.CAIRO_PATH_MOVE_TO: @@ -502,7 +502,7 @@ public void getCurrentPoint(float[] point) { */ public PathData getPathData() { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - int /*long*/ copy = Cairo.cairo_copy_path(handle); + long /*int*/ copy = Cairo.cairo_copy_path(handle); if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); cairo_path_t path = new cairo_path_t(); Cairo.memmove(path, copy, cairo_path_t.sizeof); @@ -514,7 +514,7 @@ public PathData getPathData() { double[] points = new double[6]; cairo_path_data_t data = new cairo_path_data_t(); while (i < path.num_data) { - int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof; + long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; Cairo.memmove(data, offset, cairo_path_data_t.sizeof); switch (data.type) { case Cairo.CAIRO_PATH_MOVE_TO: diff --git a/org/eclipse/swt/graphics/Pattern.java b/org/eclipse/swt/graphics/Pattern.java index 9e94116..848ea49 100644 --- a/org/eclipse/swt/graphics/Pattern.java +++ b/org/eclipse/swt/graphics/Pattern.java @@ -46,9 +46,9 @@ public class Pattern extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ handle; + public long /*int*/ handle; - int /*long*/ surface; + long /*int*/ surface; /** * Constructs a new Pattern given an image. Drawing with the resulting diff --git a/org/eclipse/swt/graphics/Region.java b/org/eclipse/swt/graphics/Region.java index a2b8995..2c4cae5 100644 --- a/org/eclipse/swt/graphics/Region.java +++ b/org/eclipse/swt/graphics/Region.java @@ -40,7 +40,7 @@ public final class Region extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ handle; + public long /*int*/ handle; /** * Constructs a new empty region. @@ -79,7 +79,7 @@ public Region(Device device) { init(); } -Region(Device device, int /*long*/ handle) { +Region(Device device, long /*int*/ handle) { super(device); this.handle = handle; } @@ -109,7 +109,7 @@ public void add (int[] pointArray) { * with enough points for a polygon. */ if (pointArray.length < 6) return; - int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); + long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); OS.gdk_region_union(handle, polyRgn); OS.gdk_region_destroy(polyRgn); } @@ -265,7 +265,7 @@ public Rectangle getBounds() { return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height); } -public static Region gtk_new(Device device, int /*long*/ handle) { +public static Region gtk_new(Device device, long /*int*/ handle) { return new Region(device, handle); } @@ -331,7 +331,7 @@ public void intersect(int x, int y, int width, int height) { gdkRect.y = y; gdkRect.width = width; gdkRect.height = height; - int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect); + long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect); OS.gdk_region_intersect(handle, rectRgn); OS.gdk_region_destroy(rectRgn); } @@ -462,7 +462,7 @@ public void subtract (int[] pointArray) { * with enough points for a polygon. */ if (pointArray.length < 6) return; - int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); + long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); OS.gdk_region_subtract(handle, polyRgn); OS.gdk_region_destroy(polyRgn); } @@ -515,7 +515,7 @@ public void subtract(int x, int y, int width, int height) { gdkRect.y = y; gdkRect.width = width; gdkRect.height = height; - int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect); + long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect); OS.gdk_region_subtract(handle, rectRgn); OS.gdk_region_destroy(rectRgn); } diff --git a/org/eclipse/swt/graphics/TextLayout.java b/org/eclipse/swt/graphics/TextLayout.java index 67695a3..c61fadb 100644 --- a/org/eclipse/swt/graphics/TextLayout.java +++ b/org/eclipse/swt/graphics/TextLayout.java @@ -54,7 +54,7 @@ public final class TextLayout extends Resource { int[] tabs; StyleItem[] styles; int stylesCount; - int /*long*/ layout, context, attrList, selAttrList; + long /*int*/ layout, context, attrList, selAttrList; int[] invalidOffsets; static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF'; @@ -110,7 +110,7 @@ void computeRuns () { byte[] buffer = Converter.wcsToMbcs(null, segmentsText, false); OS.pango_layout_set_text (layout, buffer, buffer.length); if (stylesCount == 2 && styles[0].style == null && ascent == -1 && descent == -1 && segments == null) return; - int /*long*/ ptr = OS.pango_layout_get_text(layout); + long /*int*/ ptr = OS.pango_layout_get_text(layout); attrList = OS.pango_attr_list_new(); selAttrList = OS.pango_attr_list_new(); PangoAttribute attribute = new PangoAttribute(); @@ -129,12 +129,12 @@ void computeRuns () { int oldPos = 0, lineIndex = 0; PangoLayoutLine line = new PangoLayoutLine(); while (lineIndex < lineCount) { - int /*long*/ linePtr = OS.pango_layout_get_line(layout, lineIndex); + long /*int*/ linePtr = OS.pango_layout_get_line(layout, lineIndex); OS.memmove(line, linePtr, PangoLayoutLine.sizeof); int bytePos = line.start_index; /* Note: The length in bytes of ZWS and ZWNBS are both equals to 3 */ int offset = lineIndex * 6; - int /*long*/ attr = OS.pango_attr_shape_new (rect, rect); + long /*int*/ attr = OS.pango_attr_shape_new (rect, rect); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = bytePos + offset; attribute.end_index = bytePos + offset + 3; @@ -196,7 +196,7 @@ void computeRuns () { byteEnd = Math.min(byteEnd, strlen); Font font = style.font; if (font != null && !font.isDisposed() && !defaultFont.equals(font)) { - int /*long*/ attr = OS.pango_attr_font_desc_new (font.handle); + long /*int*/ attr = OS.pango_attr_font_desc_new (font.handle); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -219,7 +219,7 @@ void computeRuns () { break; case SWT.UNDERLINE_LINK: { if (style.foreground == null) { - int /*long*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999); + long /*int*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -230,7 +230,7 @@ void computeRuns () { break; } } - int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle); + long /*int*/ attr = OS.pango_attr_underline_new(underlineStyle); OS.memmove(attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -251,7 +251,7 @@ void computeRuns () { } } if (style.strikeout) { - int /*long*/ attr = OS.pango_attr_strikethrough_new(true); + long /*int*/ attr = OS.pango_attr_strikethrough_new(true); OS.memmove(attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -274,7 +274,7 @@ void computeRuns () { Color foreground = style.foreground; if (foreground != null && !foreground.isDisposed()) { GdkColor fg = foreground.handle; - int /*long*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue); + long /*int*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -284,7 +284,7 @@ void computeRuns () { Color background = style.background; if (background != null && !background.isDisposed()) { GdkColor bg = background.handle; - int /*long*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue); + long /*int*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -297,7 +297,7 @@ void computeRuns () { rect.y = -(metrics.ascent * OS.PANGO_SCALE); rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE; rect.width = metrics.width * OS.PANGO_SCALE; - int /*long*/ attr = OS.pango_attr_shape_new (rect, rect); + long /*int*/ attr = OS.pango_attr_shape_new (rect, rect); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -307,7 +307,7 @@ void computeRuns () { } int rise = style.rise; if (rise != 0) { - int /*long*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE); + long /*int*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE); OS.memmove (attribute, attr, PangoAttribute.sizeof); attribute.start_index = byteStart; attribute.end_index = byteEnd; @@ -436,15 +436,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo x += Math.min (indent, wrapIndent); boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; GCData data = gc.data; - int /*long*/ cairo = data.cairo; + long /*int*/ cairo = data.cairo; if ((flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) { - int /*long*/[] attrs = new int /*long*/[1]; + long /*int*/[] attrs = new long /*int*/[1]; int[] nAttrs = new int[1]; PangoLogAttr logAttr = new PangoLogAttr(); PangoRectangle rect = new PangoRectangle(); int lineCount = OS.pango_layout_get_line_count(layout); - int /*long*/ ptr = OS.pango_layout_get_text(layout); - int /*long*/ iter = OS.pango_layout_get_iter(layout); + long /*int*/ ptr = OS.pango_layout_get_text(layout); + long /*int*/ iter = OS.pango_layout_get_iter(layout); if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION); if (cairo != 0) { Cairo.cairo_save(cairo); @@ -531,7 +531,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1; if (fullSelection) { if (cairo != 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); @@ -546,7 +546,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo 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); @@ -568,7 +568,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo 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); @@ -587,7 +587,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo 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); @@ -595,7 +595,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio 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); @@ -614,9 +614,9 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio 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) { Cairo.cairo_save(cairo); @@ -636,10 +636,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) { 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; @@ -818,14 +818,14 @@ public Rectangle getBounds(int start, int end) { 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(); @@ -835,9 +835,9 @@ public Rectangle getBounds(int start, int end) { * 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 { @@ -953,17 +953,17 @@ public int getLevel(int offset) { 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); @@ -995,7 +995,7 @@ public Rectangle getLineBounds(int lineIndex) { 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(); @@ -1052,11 +1052,11 @@ public int getLineIndex(int offset) { 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; @@ -1088,9 +1088,9 @@ public FontMetrics getLineMetrics (int lineIndex) { 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); @@ -1121,10 +1121,10 @@ public int[] getLineOffsets() { 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); @@ -1155,7 +1155,7 @@ public Point getLocation(int offset, boolean trailing) { 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); @@ -1206,12 +1206,12 @@ int _getOffset (int offset, int movement, boolean forward) { } 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; @@ -1329,7 +1329,7 @@ public int getOffset(int x, int y, int[] trailing) { * 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 { @@ -1349,7 +1349,7 @@ public int getOffset(int x, int y, int[] trailing) { int[] index = new int[1]; int[] piTrailing = new int[1]; OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing); - 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]; @@ -2049,7 +2049,7 @@ public void setTabs(int[] tabs) { 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 --git a/org/eclipse/swt/internal/BidiUtil.java b/org/eclipse/swt/internal/BidiUtil.java index b46c263..d39ac6c 100644 --- a/org/eclipse/swt/internal/BidiUtil.java +++ b/org/eclipse/swt/internal/BidiUtil.java @@ -42,7 +42,7 @@ public class BidiUtil { /* * 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 @@ public static int getKeyboardLanguage() { /* * 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 @@ public static void setKeyboardLanguage(int language) { /* * 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 --git a/org/eclipse/swt/internal/C.java b/org/eclipse/swt/internal/C.java index 886cb6e..34d0658 100644 --- a/org/eclipse/swt/internal/C.java +++ b/org/eclipse/swt/internal/C.java @@ -24,118 +24,118 @@ public class C extends Platform { public static final int PTR_SIZEOF = PTR_sizeof (); /** @param ptr cast=(void *) */ -public static final native void free (int /*long*/ ptr); +public static final native 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 --git a/org/eclipse/swt/internal/Callback.java b/org/eclipse/swt/internal/Callback.java index ce73d17..086bf2e 100644 --- a/org/eclipse/swt/internal/Callback.java +++ b/org/eclipse/swt/internal/Callback.java @@ -28,7 +28,7 @@ public class Callback { 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 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase * @param isArrayBased true if the arguments should be passed in an array and false otherwise * @param errorResult the return value if the java code throws an exception */ -public Callback (Object object, String method, int argCount, boolean isArrayBased, 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 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase * @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 @@ public void dispose () { * * @return the callback address */ -public int /*long*/ getAddress () { +public long /*int*/ getAddress () { return address; } diff --git a/org/eclipse/swt/internal/Converter.java b/org/eclipse/swt/internal/Converter.java index 779baed..717965f 100644 --- a/org/eclipse/swt/internal/Converter.java +++ b/org/eclipse/swt/internal/Converter.java @@ -37,8 +37,8 @@ public static String defaultCodePage () { } 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, String string, boolean termina } 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 --git a/org/eclipse/swt/internal/ImageList.java b/org/eclipse/swt/internal/ImageList.java index 0bb0f4d..644889a 100644 --- a/org/eclipse/swt/internal/ImageList.java +++ b/org/eclipse/swt/internal/ImageList.java @@ -17,24 +17,24 @@ import org.eclipse.swt.internal.gtk.*; import org.eclipse.swt.graphics.*; public 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 static int /*long*/ convertSurface(Image image) { - int /*long*/ newSurface = image.surface; +public static long /*int*/ convertSurface(Image image) { + long /*int*/ newSurface = image.surface; int type = Cairo.cairo_surface_get_type(newSurface); if (type != Cairo.CAIRO_SURFACE_TYPE_IMAGE) { Rectangle bounds = image.getBounds(); int format = Cairo.cairo_surface_get_content(newSurface) == Cairo.CAIRO_CONTENT_COLOR ? Cairo.CAIRO_FORMAT_RGB24 : Cairo.CAIRO_FORMAT_ARGB32; newSurface = Cairo.cairo_image_surface_create(format, bounds.width, bounds.height); if (newSurface == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int /*long*/ cairo = Cairo.cairo_create(newSurface); + long /*int*/ cairo = Cairo.cairo_create(newSurface); if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE); Cairo.cairo_set_source_surface (cairo, image.surface, 0, 0); @@ -46,10 +46,10 @@ public static int /*long*/ convertSurface(Image image) { return newSurface; } -public static int /*long*/ createPixbuf(Image image) { - int /*long*/ pixbuf; +public static long /*int*/ createPixbuf(Image image) { + long /*int*/ pixbuf; if (OS.USE_CAIRO) { - int /*long*/ surface = convertSurface(image); + long /*int*/ surface = convertSurface(image); int format = Cairo.cairo_image_surface_get_format(surface); int width = Cairo.cairo_image_surface_get_width(surface); int height = Cairo.cairo_image_surface_get_height(surface); @@ -57,7 +57,7 @@ public static int /*long*/ createPixbuf(Image image) { pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, hasAlpha, 8, width, height); if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES); 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 oa, or, og, ob; if (OS.BIG_ENDIAN) { oa = 0; or = 1; og = 2; ob = 3; @@ -65,7 +65,7 @@ public static int /*long*/ createPixbuf(Image image) { oa = 3; or = 2; og = 1; ob = 0; } byte[] line = new byte[stride]; - int /*long*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); + long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface); if (hasAlpha) { for (int y = 0; y < height; y++) { OS.memmove (line, surfaceData + (y * stride), stride); @@ -103,25 +103,25 @@ public static int /*long*/ createPixbuf(Image image) { } else { 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 (); + long /*int*/ colormap = OS.gdk_colormap_get_system (); 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! 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) { if (IsXULRunner10) return XPCOM.NS_COMFALSE; 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 + (IsXULRunner10 ? 2 : 3), getAddress(), cx, uri); } @@ -73,47 +73,47 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { public static final int DISALLOW_SCRIPT_OR_DATA = 4; public static final int DISALLOW_SCRIPT = 8; - public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) { + public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 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 + (IsXULRunner10 ? 4 : 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 + (IsXULRunner10 ? 5 : 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 + (IsXULRunner10 ? 6 : 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 + (IsXULRunner10 ? 7 : 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 + (IsXULRunner10 ? 8 : 9), getAddress(), cx, principal, _retval); } - public int GetSubjectPrincipal(int /*long*/[] _retval) { + public int GetSubjectPrincipal(long /*int*/[] _retval) { return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 10), getAddress(), _retval); } - public int GetSystemPrincipal(int /*long*/[] _retval) { + public int GetSystemPrincipal(long /*int*/[] _retval) { return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 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 + (Is8 ? 11 : 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 + (IsXULRunner10 ? 12 : 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 + (Is8 ? 13 : 14), getAddress(), principal, capability, _retval); // } @@ -133,11 +133,11 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 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 + (Is8 ? 18 : 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 + (IsXULRunner10 ? 19 : 20), getAddress(), cx, obj, _retval); } @@ -145,32 +145,32 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 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 + (IsXULRunner10 ? 21 : 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 + (IsXULRunner10 ? 22 : 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 + (IsXULRunner10 ? 23 : 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 + (IsXULRunner10 ? 24 : 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 + (IsXULRunner10 ? 25 : 26), getAddress(), aPrincipal, _retval); } - public int PushContextPrincipal(int /*long*/ cx, int /*long*/ fp, int /*long*/ principal) { + public int PushContextPrincipal(long /*int*/ cx, long /*int*/ fp, long /*int*/ principal) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), cx, fp, principal); } - public int PopContextPrincipal(int /*long*/ cx) { + public int PopContextPrincipal(long /*int*/ cx) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx); } diff --git a/org/eclipse/swt/internal/mozilla/nsISeekableStream.java b/org/eclipse/swt/internal/mozilla/nsISeekableStream.java index 74ddd6e..af8d253 100644 --- a/org/eclipse/swt/internal/mozilla/nsISeekableStream.java +++ b/org/eclipse/swt/internal/mozilla/nsISeekableStream.java @@ -37,7 +37,7 @@ public class nsISeekableStream extends nsISupports { public static final nsID NS_ISEEKABLESTREAM_IID = new nsID(NS_ISEEKABLESTREAM_IID_STR); - public nsISeekableStream(int /*long*/ address) { + public nsISeekableStream(long /*int*/ address) { super(address); } diff --git a/org/eclipse/swt/internal/mozilla/nsISerializable.java b/org/eclipse/swt/internal/mozilla/nsISerializable.java index 9537c36..25d86c9 100644 --- a/org/eclipse/swt/internal/mozilla/nsISerializable.java +++ b/org/eclipse/swt/internal/mozilla/nsISerializable.java @@ -37,15 +37,15 @@ public class nsISerializable extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java index 2f46a69..6b35781 100644 --- a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java +++ b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java @@ -37,15 +37,15 @@ public class nsIServiceManager extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java index 9f29e75..3a65d38 100644 --- a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java +++ b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java @@ -37,7 +37,7 @@ public class nsISimpleEnumerator extends nsISupports { 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 @@ public class nsISimpleEnumerator extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsISupports.java b/org/eclipse/swt/internal/mozilla/nsISupports.java index 2cd9f39..885542a 100644 --- a/org/eclipse/swt/internal/mozilla/nsISupports.java +++ b/org/eclipse/swt/internal/mozilla/nsISupports.java @@ -46,17 +46,17 @@ public class nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java index be23ec2..92f390a 100644 --- a/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java +++ b/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java @@ -37,11 +37,11 @@ public class nsISupportsWeakReference extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/org/eclipse/swt/internal/mozilla/nsITooltipListener.java index 50126a6..c362e6b 100644 --- a/org/eclipse/swt/internal/mozilla/nsITooltipListener.java +++ b/org/eclipse/swt/internal/mozilla/nsITooltipListener.java @@ -37,7 +37,7 @@ public class nsITooltipListener extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsITransfer.java b/org/eclipse/swt/internal/mozilla/nsITransfer.java index c9f0ba6..454b81f 100644 --- a/org/eclipse/swt/internal/mozilla/nsITransfer.java +++ b/org/eclipse/swt/internal/mozilla/nsITransfer.java @@ -37,11 +37,11 @@ public class nsITransfer extends nsIWebProgressListener2 { 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 --git a/org/eclipse/swt/internal/mozilla/nsIURI.java b/org/eclipse/swt/internal/mozilla/nsIURI.java index f6b6a7c..28adbdb 100644 --- a/org/eclipse/swt/internal/mozilla/nsIURI.java +++ b/org/eclipse/swt/internal/mozilla/nsIURI.java @@ -43,67 +43,67 @@ public class nsIURI extends nsISupports { public static final nsID NS_IURI_10_IID = new nsID(NS_IURI_10_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); } @@ -115,15 +115,15 @@ public class nsIURI extends nsISupports { 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); } @@ -131,47 +131,47 @@ public class nsIURI extends nsISupports { 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); } - public int GetRef(int /*long*/ aRef) { + public int GetRef(long /*int*/ aRef) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aRef); } - public int SetRef(int /*long*/ aRef) { + public int SetRef(long /*int*/ aRef) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aRef); } - public int EqualsExceptRef(int /*long*/ other, int[] _retval) { + public int EqualsExceptRef(long /*int*/ other, int[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), other, _retval); } - public int CloneIgnoringRef(int /*long*/[] _retval) { + public int CloneIgnoringRef(long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), _retval); } - public int GetSpecIgnoringRef(int /*long*/ aSpecIgnoringRef) { + public int GetSpecIgnoringRef(long /*int*/ aSpecIgnoringRef) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aSpecIgnoringRef); } diff --git a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java index aa6378e..8b2235f 100644 --- a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java +++ b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java @@ -37,39 +37,39 @@ public class nsIURIContentListener extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java b/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java index 9a8dc98..582f637 100644 --- a/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java +++ b/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java @@ -37,15 +37,15 @@ public class nsIUploadChannel extends nsISupports { public static final nsID NS_IUPLOADCHANNEL_IID = new nsID(NS_IUPLOADCHANNEL_IID_STR); - public nsIUploadChannel(int /*long*/ address) { + public nsIUploadChannel(long /*int*/ address) { super(address); } - public int SetUploadStream(int /*long*/ aStream, int /*long*/ aContentType, int aContentLength) { + public int SetUploadStream(long /*int*/ aStream, long /*int*/ aContentType, int aContentLength) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aStream, aContentType, aContentLength); } - public int GetUploadStream(int /*long*/[] aUploadStream) { + public int GetUploadStream(long /*int*/[] aUploadStream) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aUploadStream); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIVariant.java b/org/eclipse/swt/internal/mozilla/nsIVariant.java index 29f9bad..07b3525 100644 --- a/org/eclipse/swt/internal/mozilla/nsIVariant.java +++ b/org/eclipse/swt/internal/mozilla/nsIVariant.java @@ -43,7 +43,7 @@ public class nsIVariant extends nsISupports { public static final nsID NS_IVARIANT_10_IID = new nsID(NS_IVARIANT_10_IID_STR); - public nsIVariant(int /*long*/ address) { + public nsIVariant(long /*int*/ address) { super(address); } @@ -51,11 +51,11 @@ public class nsIVariant extends nsISupports { 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); } @@ -67,7 +67,7 @@ public class nsIVariant extends nsISupports { 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); } @@ -79,7 +79,7 @@ public class nsIVariant extends nsISupports { 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); } @@ -87,7 +87,7 @@ public class nsIVariant extends nsISupports { 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); } @@ -103,56 +103,56 @@ public class nsIVariant extends nsISupports { 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 GetAsJSVal(int /*long*/[] _retval) { + public int GetAsJSVal(long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, 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 + (IsXULRunner10 ? 24 : 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 + (IsXULRunner10 ? 25 : 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 + (IsXULRunner10 ? 26 : 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 + (IsXULRunner10 ? 27 : 26), getAddress(), size, str); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java index 8cccddc..7a37dbd 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java +++ b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java @@ -37,11 +37,11 @@ public class nsIWeakReference extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java index ba6c3a5..02c79c1 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java @@ -43,35 +43,35 @@ public class nsIWebBrowser extends nsISupports { public static final nsID NS_IWEBBROWSER_10_IID = new nsID(NS_IWEBBROWSER_10_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); } diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java index e97440b..e0e0a14 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java @@ -37,7 +37,7 @@ public class nsIWebBrowserChrome extends nsISupports { 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); } @@ -49,11 +49,11 @@ public class nsIWebBrowserChrome extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java index 68136bd..4f85413 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java @@ -37,7 +37,7 @@ public class nsIWebBrowserChromeFocus extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java index d128470..ece56a6 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java @@ -37,7 +37,7 @@ public class nsIWebBrowserFocus extends nsISupports { 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 @@ public class nsIWebBrowserFocus extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java index 7ea0bdd..a5cc363 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java @@ -37,7 +37,7 @@ public class nsIWebBrowserSetup extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java index a6d7c26..87a26e8 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java @@ -37,15 +37,15 @@ public class nsIWebBrowserStream extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java index 5dc9dda..1ca0612 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java @@ -37,7 +37,7 @@ public class nsIWebNavigation extends nsISupports { 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); } @@ -71,7 +71,7 @@ public class nsIWebNavigation extends nsISupports { public static final int LOAD_FLAGS_BYPASS_PROXY = 512; public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024; - public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) { + 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); } @@ -87,23 +87,23 @@ public class nsIWebNavigation extends nsISupports { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java index 8b329f5..f1f3efa 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java @@ -37,7 +37,7 @@ public class nsIWebNavigationInfo extends nsISupports { 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); } @@ -46,7 +46,7 @@ public class nsIWebNavigationInfo extends nsISupports { public static final int PLUGIN = 2; 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java index ba4addd..8f9c97e 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java @@ -37,7 +37,7 @@ public class nsIWebProgress extends nsISupports { 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); } @@ -52,15 +52,15 @@ public class nsIWebProgress extends nsISupports { public static final int NOTIFY_LOCATION = 128; 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 --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java index 7ce497e..902ef3a 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java @@ -37,7 +37,7 @@ public class nsIWebProgressListener extends nsISupports { 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); } @@ -57,23 +57,23 @@ public class nsIWebProgressListener extends nsISupports { public static final int STATE_SECURE_MED = 65536; 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java index d27f486..c1fa07e 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java +++ b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java @@ -37,11 +37,11 @@ public class nsIWebProgressListener2 extends nsIWebProgressListener { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java index 01646f5..0db573e 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java +++ b/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java @@ -37,11 +37,11 @@ public class nsIWindowCreator extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java index 4bfec46..7596227 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java +++ b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java @@ -37,13 +37,13 @@ public class nsIWindowCreator2 extends nsIWindowCreator { 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 --git a/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java index bfb7471..b9a1781 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java +++ b/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java @@ -37,51 +37,51 @@ public class nsIWindowWatcher extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java index 76566dd..2ccd628 100644 --- a/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java +++ b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java @@ -37,7 +37,7 @@ public class nsIWritableVariant extends nsIVariant { 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 @@ public class nsIWritableVariant extends nsIVariant { // 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 @@ public class nsIWritableVariant extends nsIVariant { 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 @@ public class nsIWritableVariant extends nsIVariant { 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 --git a/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java index 23705a0..430bff1 100644 --- a/org/eclipse/swt/internal/mozilla/nsIX509Cert.java +++ b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java @@ -37,87 +37,87 @@ public class nsIX509Cert extends nsISupports { 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); } @@ -148,15 +148,15 @@ public class nsIX509Cert extends nsISupports { public static final int CERT_USAGE_StatusResponder = 10; 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); } @@ -164,15 +164,15 @@ public class nsIX509Cert extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java index c14d593..ac5ebd3 100644 --- a/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java +++ b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java @@ -37,39 +37,39 @@ public class nsIX509CertValidity extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java index c1366d7..b33d74f 100644 --- a/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java +++ b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java @@ -37,7 +37,7 @@ public class nsIXPCSecurityManager extends nsISupports { 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 class nsIXPCSecurityManager extends nsISupports { 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 class nsIXPCSecurityManager extends nsISupports { 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); } } diff --git a/org/eclipse/swt/internal/mozilla/nsIXPConnect.java b/org/eclipse/swt/internal/mozilla/nsIXPConnect.java index dc49321..4a22bff 100644 --- a/org/eclipse/swt/internal/mozilla/nsIXPConnect.java +++ b/org/eclipse/swt/internal/mozilla/nsIXPConnect.java @@ -37,15 +37,15 @@ public class nsIXPConnect extends nsISupports { public static final nsID NS_IXPCONNECT_IID = new nsID(NS_IXPCONNECT_IID_STR); - public nsIXPConnect(int /*long*/ address) { + public nsIXPConnect(long /*int*/ address) { super(address); } - public int JSValToVariant(int /*long*/ cx, int /*long*/ aJSVal, int /*long*/[] _retval) { + public int JSValToVariant(long /*int*/ cx, long /*int*/ aJSVal, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, aJSVal, _retval); } - public int VariantToJS(int /*long*/ ctx, int /*long*/ scope, int /*long*/ value, int /*long*/ _retval) { + public int VariantToJS(long /*int*/ ctx, long /*int*/ scope, long /*int*/ value, long /*int*/ _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), ctx, scope, value, _retval); } } diff --git a/org/eclipse/swt/internal/opengl/glx/GLX.java b/org/eclipse/swt/internal/opengl/glx/GLX.java index 4f1d979..6e071ff 100644 --- a/org/eclipse/swt/internal/opengl/glx/GLX.java +++ b/org/eclipse/swt/internal/opengl/glx/GLX.java @@ -231,8 +231,8 @@ public static final void glViewport(int x, int y, int width, int height) { } } /** @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 @@ public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, i * @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 @@ public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int * @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 @@ public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo * @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 @@ public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInf * @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 @@ public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) { * @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 @@ public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) } } /** @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 @@ public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) } } /** @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 @@ public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attr 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 @@ public static final int /*long*/ glXGetCurrentContext() { 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 @@ public static final int /*long*/ glXGetCurrentDrawable() { * @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 @@ public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) { * @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 @@ public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawab } } /** @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 @@ public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, } } /** @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 @@ public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int } } /** @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 @@ public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int scre * @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 @@ public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] * @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 @@ public static final void glXWaitX() { * @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 --git a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java index 8faa6cf..c7b6733 100644 --- a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java +++ b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.opengl.glx; public class XVisualInfo { /** @field cast=(Visual *) */ - public int /*long*/ visual; + public long /*int*/ visual; public int visualid; public int screen; public int depth; diff --git a/org/eclipse/swt/internal/theme/ButtonDrawData.java b/org/eclipse/swt/internal/theme/ButtonDrawData.java index eff7bef..6510a28 100644 --- a/org/eclipse/swt/internal/theme/ButtonDrawData.java +++ b/org/eclipse/swt/internal/theme/ButtonDrawData.java @@ -25,10 +25,10 @@ public ButtonDrawData() { 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 @@ void draw(Theme theme, GC gc, Rectangle bounds) { } 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 @@ void draw(Theme theme, GC gc, Rectangle bounds) { 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 @@ void draw(Theme theme, GC gc, Rectangle bounds) { } 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 --git a/org/eclipse/swt/internal/theme/ComboDrawData.java b/org/eclipse/swt/internal/theme/ComboDrawData.java index dbf3b0d..7669e9f 100644 --- a/org/eclipse/swt/internal/theme/ComboDrawData.java +++ b/org/eclipse/swt/internal/theme/ComboDrawData.java @@ -24,9 +24,9 @@ public ComboDrawData() { } 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 @@ void draw(Theme theme, GC gc, Rectangle bounds) { 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 getStateType(int part) { 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 --git a/org/eclipse/swt/internal/theme/DrawData.java b/org/eclipse/swt/internal/theme/DrawData.java index 9785073..f51bdc1 100644 --- a/org/eclipse/swt/internal/theme/DrawData.java +++ b/org/eclipse/swt/internal/theme/DrawData.java @@ -79,21 +79,21 @@ void draw(Theme theme, GC gc, Rectangle bounds) { } 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 = ImageList.createPixbuf(image); - int /*long*/ source = OS.gtk_icon_source_new(); + long /*int*/ pixbuf = ImageList.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 drawImage(Theme theme, Image image, GC gc, Rectangle bounds) { } 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 @@ int getStateType(int part) { return state_type; } -int /*long*/ getTextHandle(Theme theme) { +long /*int*/ getTextHandle(Theme theme) { return theme.labelHandle; } @@ -169,9 +169,9 @@ int hit(Theme theme, Point position, Rectangle bounds) { } 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 --git a/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/org/eclipse/swt/internal/theme/ExpanderDrawData.java index 7553116..3f98b50 100644 --- a/org/eclipse/swt/internal/theme/ExpanderDrawData.java +++ b/org/eclipse/swt/internal/theme/ExpanderDrawData.java @@ -22,9 +22,9 @@ public ExpanderDrawData() { } 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 @@ void draw(Theme theme, GC gc, Rectangle bounds) { 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 --git a/org/eclipse/swt/internal/theme/GroupDrawData.java b/org/eclipse/swt/internal/theme/GroupDrawData.java index bd18278..fa3d414 100644 --- a/org/eclipse/swt/internal/theme/GroupDrawData.java +++ b/org/eclipse/swt/internal/theme/GroupDrawData.java @@ -29,9 +29,9 @@ public GroupDrawData() { 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 --git a/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/org/eclipse/swt/internal/theme/ProgressBarDrawData.java index 04d3ea9..e3b843b 100644 --- a/org/eclipse/swt/internal/theme/ProgressBarDrawData.java +++ b/org/eclipse/swt/internal/theme/ProgressBarDrawData.java @@ -22,9 +22,9 @@ public ProgressBarDrawData() { } 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 --git a/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/org/eclipse/swt/internal/theme/TabFolderDrawData.java index a261ec4..84cabdf 100644 --- a/org/eclipse/swt/internal/theme/TabFolderDrawData.java +++ b/org/eclipse/swt/internal/theme/TabFolderDrawData.java @@ -31,9 +31,9 @@ public TabFolderDrawData() { } 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 --git a/org/eclipse/swt/internal/theme/TabItemDrawData.java b/org/eclipse/swt/internal/theme/TabItemDrawData.java index 00b05e2..b0d7454 100644 --- a/org/eclipse/swt/internal/theme/TabItemDrawData.java +++ b/org/eclipse/swt/internal/theme/TabItemDrawData.java @@ -27,8 +27,8 @@ public TabItemDrawData() { } 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 @@ Rectangle computeTrim(Theme theme, GC gc) { } 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 --git a/org/eclipse/swt/internal/theme/Theme.java b/org/eclipse/swt/internal/theme/Theme.java index 1357fb9..22bfcfa 100644 --- a/org/eclipse/swt/internal/theme/Theme.java +++ b/org/eclipse/swt/internal/theme/Theme.java @@ -18,7 +18,7 @@ import org.eclipse.swt.internal.gtk.*; 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; @@ -161,7 +161,7 @@ public Rectangle measureText(GC gc, Rectangle bounds, DrawData data, String text return data.measureText(this, text, flags, gc, bounds); } -int getWidgetProperty(int /*long*/ handle, String name) { +int getWidgetProperty(long /*int*/ handle, String name) { byte[] propertyName = Converter.wcsToMbcs(null, name, true); int[] result = new int[1]; OS.gtk_widget_style_get(handle, propertyName, result, 0); @@ -169,18 +169,18 @@ int getWidgetProperty(int /*long*/ handle, String name) { } -int /*long*/ getBorderProperty(int /*long*/ handle, String name) { +long /*int*/ getBorderProperty(long /*int*/ handle, String name) { byte[] propertyName = Converter.wcsToMbcs(null, name, true); - int /*long*/ [] result = new int /*long*/[1]; + long /*int*/ [] result = new long /*int*/[1]; OS.gtk_widget_style_get(handle, propertyName, result, 0); return result[0]; } -void transferClipping(GC gc, int /*long*/ style) { +void transferClipping(GC gc, long /*int*/ style) { GCData data = gc.getGCData(); - int /*long*/ clipRgn = data.clipRgn; - int /*long*/ damageRgn = data.damageRgn; - int /*long*/ clipping = clipRgn; + long /*int*/ clipRgn = data.clipRgn; + long /*int*/ damageRgn = data.damageRgn; + long /*int*/ clipping = clipRgn; if (damageRgn != 0) { if (clipping != 0) { clipping = OS.gdk_region_new(); @@ -190,7 +190,7 @@ void transferClipping(GC gc, int /*long*/ style) { clipping = damageRgn; } } - int /*long*/ [] curGC = new int /*long*/ [1]; + long /*int*/ [] curGC = new long /*int*/ [1]; for (int i = 0; i < 5; i++) { OS.gtk_style_get_fg_gc (style, i, curGC); if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping); diff --git a/org/eclipse/swt/internal/theme/ToolBarDrawData.java b/org/eclipse/swt/internal/theme/ToolBarDrawData.java index 4c99b12..584977d 100644 --- a/org/eclipse/swt/internal/theme/ToolBarDrawData.java +++ b/org/eclipse/swt/internal/theme/ToolBarDrawData.java @@ -21,9 +21,9 @@ public ToolBarDrawData() { } void draw(Theme theme, GC gc, Rectangle bounds) { - int /*long*/ toolbarHandle = theme.toolbarHandle; - int /*long*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle); - int /*long*/ drawable = gc.getGCData().drawable; + long /*int*/ toolbarHandle = theme.toolbarHandle; + long /*int*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle); + long /*int*/ drawable = gc.getGCData().drawable; theme.transferClipping(gc, gtkStyle); int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; byte[] detail = Converter.wcsToMbcs(null, "toolbar", true); diff --git a/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/org/eclipse/swt/internal/theme/ToolItemDrawData.java index 67cc405..40754df 100644 --- a/org/eclipse/swt/internal/theme/ToolItemDrawData.java +++ b/org/eclipse/swt/internal/theme/ToolItemDrawData.java @@ -27,8 +27,8 @@ public ToolItemDrawData() { } Rectangle computeTrim(Theme theme, GC gc) { - 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 focus_width = theme.getWidgetProperty(buttonHandle, "focus-line-width"); int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding"); int xthickness = OS.gtk_style_get_xthickness(gtkStyle); @@ -47,13 +47,13 @@ Rectangle computeTrim(Theme theme, GC gc) { 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.SEPARATOR) != 0) { int state_type = getStateType(DrawData.WIDGET_WHOLE); - int /*long*/ separatorHandle = theme.separatorHandle; + long /*int*/ separatorHandle = theme.separatorHandle; byte[] detail = Converter.wcsToMbcs(null, "vseparator", true); - int /*long*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle); + long /*int*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle); theme.transferClipping(gc, gtkStyle); if ((parent.style & SWT.VERTICAL) != 0) { OS.gtk_paint_hline(gtkStyle, drawable, state_type, null, separatorHandle, detail, bounds.x, bounds.x + bounds.width, bounds.y + bounds.height / 2); @@ -63,8 +63,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) { return; } - 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"); @@ -83,7 +83,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { } int[] relief = new int[1]; - int /*long*/ toolbarHandle = theme.toolbarHandle; + long /*int*/ toolbarHandle = theme.toolbarHandle; OS.gtk_widget_style_get(toolbarHandle, OS.button_relief, relief, 0); int shadow_type = OS.GTK_SHADOW_OUT; @@ -149,8 +149,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) { int hit(Theme theme, Point position, Rectangle bounds) { if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; if ((style & SWT.DROP_DOWN) != 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); int xthickness = OS.gtk_style_get_xthickness(gtkStyle); int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus"); int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width"); diff --git a/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/org/eclipse/swt/internal/webkit/JSClassDefinition.java index 8c75e69..8158045 100644 --- a/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -19,35 +19,35 @@ public class JSClassDefinition { public int version; public int attributes; /** @field cast=(const char*) */ - public int /*long*/ className; + public long /*int*/ className; /** @field cast=(void*) */ - public int /*long*/ parentClass; + public long /*int*/ parentClass; /** @field cast=(const void*) */ - public int /*long*/ staticValues; + public long /*int*/ staticValues; /** @field cast=(const void*) */ - public int /*long*/ staticFunctions; + public long /*int*/ staticFunctions; /** @field cast=(void*) */ - public int /*long*/ initialize; + public long /*int*/ initialize; /** @field cast=(void*) */ - public int /*long*/ finalize; + public long /*int*/ finalize; /** @field cast=(void*) */ - public int /*long*/ hasProperty; + public long /*int*/ hasProperty; /** @field cast=(void*) */ - public int /*long*/ getProperty; + public long /*int*/ getProperty; /** @field cast=(void*) */ - public int /*long*/ setProperty; + public long /*int*/ setProperty; /** @field cast=(void*) */ - public int /*long*/ deleteProperty; + public long /*int*/ deleteProperty; /** @field cast=(void*) */ - public int /*long*/ getPropertyNames; + public long /*int*/ getPropertyNames; /** @field cast=(void*) */ - public int /*long*/ callAsFunction; + public long /*int*/ callAsFunction; /** @field cast=(void*) */ - public int /*long*/ callAsConstructor; + public long /*int*/ callAsConstructor; /** @field cast=(void*) */ - public int /*long*/ hasInstance; + public long /*int*/ hasInstance; /** @field cast=(void*) */ - public int /*long*/ convertToType; + public long /*int*/ convertToType; public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof(); } diff --git a/org/eclipse/swt/internal/webkit/WebKitGTK.java b/org/eclipse/swt/internal/webkit/WebKitGTK.java index f40c98d..029041b 100644 --- a/org/eclipse/swt/internal/webkit/WebKitGTK.java +++ b/org/eclipse/swt/internal/webkit/WebKitGTK.java @@ -90,8 +90,8 @@ protected static byte [] ascii (String name) { /** @method flags=dynamic */ -public static final native int /*long*/ _JSClassCreate (int /*long*/ definition); -public static final int /*long*/ JSClassCreate (int /*long*/ definition) { +public static final native long /*int*/ _JSClassCreate (long /*int*/ definition); +public static final long /*int*/ JSClassCreate (long /*int*/ definition) { lock.lock(); try { return _JSClassCreate (definition); @@ -101,8 +101,8 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) { } /** @method flags=dynamic */ -public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx); -public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { +public static final native long /*int*/ _JSContextGetGlobalObject (long /*int*/ ctx); +public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) { lock.lock(); try { return _JSContextGetGlobalObject (ctx); @@ -112,8 +112,8 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { } /** @method flags=dynamic */ -public static final native int /*long*/ _JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception); -public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception) { +public static final native long /*int*/ _JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception); +public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception) { lock.lock(); try { return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception); @@ -123,8 +123,8 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long* } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object); -public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { +public static final native long /*int*/ _JSObjectGetPrivate (long /*int*/ object); +public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) { lock.lock(); try { return _JSObjectGetPrivate (object); @@ -134,8 +134,8 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception); -public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception) { +public static final native long /*int*/ _JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception); +public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetProperty (ctx, object, propertyName, exception); @@ -145,8 +145,8 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception); -public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception) { +public static final native long /*int*/ _JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception); +public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception); @@ -156,8 +156,8 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data); -public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data) { +public static final native long /*int*/ _JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data); +public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data) { lock.lock(); try { return _JSObjectMake (ctx, jsClass, data); @@ -167,8 +167,8 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception); -public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception) { +public static final native long /*int*/ _JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception); +public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception) { lock.lock(); try { return _JSObjectMakeArray (ctx, argumentCount, arguments, exception); @@ -178,8 +178,8 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long } /** @method flags=dynamic */ -public static final native int /*long*/ _JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction); -public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction) { +public static final native long /*int*/ _JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction); +public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction) { lock.lock(); try { return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction); @@ -189,8 +189,8 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ } /** @method flags=dynamic */ -public static final native void _JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception); -public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception) { +public static final native void _JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception); +public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception) { lock.lock(); try { _JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception); @@ -200,8 +200,8 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj } /** @method flags=dynamic */ -public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string); -public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { +public static final native long /*int*/ _JSStringCreateWithUTF8CString (byte[] string); +public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) { lock.lock(); try { return _JSStringCreateWithUTF8CString (string); @@ -211,8 +211,8 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { } /** @method flags=dynamic */ -public static final native int /*long*/ _JSStringGetLength (int /*long*/ string); -public static final int /*long*/ JSStringGetLength (int /*long*/ string) { +public static final native long /*int*/ _JSStringGetLength (long /*int*/ string); +public static final long /*int*/ JSStringGetLength (long /*int*/ string) { lock.lock(); try { return _JSStringGetLength (string); @@ -222,8 +222,8 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) { } /** @method flags=dynamic */ -public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string); -public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string) { +public static final native long /*int*/ _JSStringGetMaximumUTF8CStringSize (long /*int*/ string); +public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string) { lock.lock(); try { return _JSStringGetMaximumUTF8CStringSize (string); @@ -233,8 +233,8 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ } /** @method flags=dynamic */ -public static final native int /*long*/ _JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize); -public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize) { +public static final native long /*int*/ _JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize); +public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize) { lock.lock(); try { return _JSStringGetUTF8CString (string, buffer, bufferSize); @@ -244,8 +244,8 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by } /** @method flags=dynamic */ -public static final native int _JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b); -public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) { +public static final native int _JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b); +public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) { lock.lock(); try { return _JSStringIsEqualToUTF8CString (a, b); @@ -255,8 +255,8 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) } /** @method flags=dynamic */ -public static final native void _JSStringRelease (int /*long*/ string); -public static final void JSStringRelease (int /*long*/ string) { +public static final native void _JSStringRelease (long /*int*/ string); +public static final void JSStringRelease (long /*int*/ string) { lock.lock(); try { _JSStringRelease (string); @@ -266,8 +266,8 @@ public static final void JSStringRelease (int /*long*/ string) { } /** @method flags=dynamic */ -public static final native int _JSValueGetType (int /*long*/ ctx, int /*long*/ value); -public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { +public static final native int _JSValueGetType (long /*int*/ ctx, long /*int*/ value); +public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) { lock.lock(); try { return _JSValueGetType (ctx, value); @@ -277,8 +277,8 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { } /** @method flags=dynamic */ -public static final native int _JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass); -public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass) { +public static final native int _JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass); +public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass) { lock.lock(); try { return _JSValueIsObjectOfClass (ctx, value, jsClass); @@ -288,8 +288,8 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v } /** @method flags=dynamic */ -public static final native int /*long*/ _JSValueMakeBoolean (int /*long*/ ctx, int bool); -public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) { +public static final native long /*int*/ _JSValueMakeBoolean (long /*int*/ ctx, int bool); +public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) { lock.lock(); try { return _JSValueMakeBoolean (ctx, bool); @@ -299,8 +299,8 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) } /** @method flags=dynamic */ -public static final native int /*long*/ _JSValueMakeNumber (int /*long*/ ctx, double number); -public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number) { +public static final native long /*int*/ _JSValueMakeNumber (long /*int*/ ctx, double number); +public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number) { lock.lock(); try { return _JSValueMakeNumber (ctx, number); @@ -310,8 +310,8 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num } /** @method flags=dynamic */ -public static final native int /*long*/ _JSValueMakeString (int /*long*/ ctx, int /*long*/ string); -public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string) { +public static final native long /*int*/ _JSValueMakeString (long /*int*/ ctx, long /*int*/ string); +public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string) { lock.lock(); try { return _JSValueMakeString (ctx, string); @@ -321,8 +321,8 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long } /** @method flags=dynamic */ -public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx); -public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { +public static final native long /*int*/ _JSValueMakeUndefined (long /*int*/ ctx); +public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) { lock.lock(); try { return _JSValueMakeUndefined (ctx); @@ -332,8 +332,8 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { } /** @method flags=dynamic */ -public static final native double _JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); -public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) { +public static final native double _JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); +public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToNumber (ctx, value, exception); @@ -343,8 +343,8 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value } /** @method flags=dynamic */ -public static final native int /*long*/ _JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); -public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) { +public static final native long /*int*/ _JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); +public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToStringCopy (ctx, value, exception); @@ -356,8 +356,8 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo /* --------------------- start libsoup natives --------------------- */ /** @method flags=dynamic */ -public static final native void _soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password); -public static final void soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password) { +public static final native void _soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password); +public static final void soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password) { lock.lock(); try { _soup_auth_authenticate (auth, username, password); @@ -367,8 +367,8 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth); -public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { +public static final native long /*int*/ _soup_auth_get_host (long /*int*/ auth); +public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) { lock.lock(); try { return _soup_auth_get_host (auth); @@ -378,8 +378,8 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth); -public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { +public static final native long /*int*/ _soup_auth_get_scheme_name (long /*int*/ auth); +public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) { lock.lock(); try { return _soup_auth_get_scheme_name (auth); @@ -389,8 +389,8 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_free (int /*long*/ cookie); -public static final void soup_cookie_free (int /*long*/ cookie) { +public static final native void _soup_cookie_free (long /*int*/ cookie); +public static final void soup_cookie_free (long /*int*/ cookie) { lock.lock(); try { _soup_cookie_free (cookie); @@ -400,8 +400,8 @@ public static final void soup_cookie_free (int /*long*/ cookie) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie); -public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie) { +public static final native void _soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie); +public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie) { lock.lock(); try { _soup_cookie_jar_add_cookie (jar, cookie); @@ -411,8 +411,8 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar); -public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) { +public static final native long /*int*/ _soup_cookie_jar_all_cookies (long /*int*/ jar); +public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) { lock.lock(); try { return _soup_cookie_jar_all_cookies (jar); @@ -422,8 +422,8 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie); -public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie) { +public static final native void _soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie); +public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie) { lock.lock(); try { _soup_cookie_jar_delete_cookie (jar, cookie); @@ -433,8 +433,8 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /* } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http); -public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http) { +public static final native long /*int*/ _soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http); +public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http) { lock.lock(); try { return _soup_cookie_jar_get_cookies (jar, uri, for_http); @@ -444,8 +444,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_cookie_jar_get_type (); -public static final int /*long*/ soup_cookie_jar_get_type () { +public static final native long /*int*/ _soup_cookie_jar_get_type (); +public static final long /*int*/ soup_cookie_jar_get_type () { lock.lock(); try { return _soup_cookie_jar_get_type (); @@ -455,8 +455,8 @@ public static final int /*long*/ soup_cookie_jar_get_type () { } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_cookie_parse (byte[] header, int /*long*/ origin); -public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ origin) { +public static final native long /*int*/ _soup_cookie_parse (byte[] header, long /*int*/ origin); +public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ origin) { lock.lock(); try { return _soup_cookie_parse (header, origin); @@ -466,8 +466,8 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ } /** @method flags=dynamic */ -public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length); -public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) { +public static final native void _soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length); +public static final void soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length) { lock.lock(); try { _soup_message_body_append (body, use, data, length); @@ -477,8 +477,8 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i } /** @method flags=dynamic */ -public static final native void _soup_message_body_flatten (int /*long*/ body); -public static final void soup_message_body_flatten (int /*long*/ body) { +public static final native void _soup_message_body_flatten (long /*int*/ body); +public static final void soup_message_body_flatten (long /*int*/ body) { lock.lock(); try { _soup_message_body_flatten (body); @@ -488,8 +488,8 @@ public static final void soup_message_body_flatten (int /*long*/ body) { } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg); -public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { +public static final native long /*int*/ _soup_message_get_uri (long /*int*/ msg); +public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) { lock.lock(); try { return _soup_message_get_uri (msg); @@ -499,8 +499,8 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { } /** @method flags=dynamic */ -public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value); -public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) { +public static final native void _soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value); +public static final void soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value) { lock.lock(); try { _soup_message_headers_append (headers, name, value); @@ -510,8 +510,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte } /** @method flags=dynamic */ -public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type); -public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) { +public static final native void _soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type); +public static final void soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type) { lock.lock(); try { _soup_session_add_feature_by_type (session, type); @@ -521,8 +521,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session, } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type); -public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) { +public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type); +public static final long /*int*/ soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type) { lock.lock(); try { return _soup_session_get_feature (session, feature_type); @@ -532,8 +532,8 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session, } /** @method flags=dynamic */ -public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session); -public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) { +public static final native void _soup_session_feature_attach (long /*int*/ feature, long /*int*/ session); +public static final void soup_session_feature_attach (long /*int*/ feature, long /*int*/ session) { lock.lock(); try { _soup_session_feature_attach (feature, session); @@ -543,8 +543,8 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_session_get_type (); -public static final int /*long*/ soup_session_get_type () { +public static final native long /*int*/ _soup_session_get_type (); +public static final long /*int*/ soup_session_get_type () { lock.lock(); try { return _soup_session_get_type (); @@ -554,8 +554,8 @@ public static final int /*long*/ soup_session_get_type () { } /** @method flags=dynamic */ -public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session); -public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) { +public static final native void _soup_session_feature_detach (long /*int*/ feature, long /*int*/ session); +public static final void soup_session_feature_detach (long /*int*/ feature, long /*int*/ session) { lock.lock(); try { _soup_session_feature_detach (feature, session); @@ -565,8 +565,8 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int } /** @method flags=dynamic */ -public static final native void _soup_uri_free (int /*long*/ uri); -public static final void soup_uri_free (int /*long*/ uri) { +public static final native void _soup_uri_free (long /*int*/ uri); +public static final void soup_uri_free (long /*int*/ uri) { lock.lock(); try { _soup_uri_free (uri); @@ -576,8 +576,8 @@ public static final void soup_uri_free (int /*long*/ uri) { } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_uri_new (byte[] uri_string); -public static final int /*long*/ soup_uri_new (byte[] uri_string) { +public static final native long /*int*/ _soup_uri_new (byte[] uri_string); +public static final long /*int*/ soup_uri_new (byte[] uri_string) { lock.lock(); try { return _soup_uri_new (uri_string); @@ -587,8 +587,8 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) { } /** @method flags=dynamic */ -public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query); -public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) { +public static final native long /*int*/ _soup_uri_to_string (long /*int*/ uri, int just_path_and_query); +public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_path_and_query) { lock.lock(); try { return _soup_uri_to_string (uri, just_path_and_query); @@ -600,8 +600,8 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_ /* --------------------- start WebKitGTK natives --------------------- */ /** @method flags=dynamic */ -public static final native int _webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData); -public static final int webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData) { +public static final native int _webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData); +public static final int webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData) { lock.lock(); try { return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData); @@ -611,8 +611,8 @@ public static final int webkit_dom_event_target_add_event_listener (int /*long*/ } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_alt_key (int /*long*/ self); -public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) { +public static final native int _webkit_dom_mouse_event_get_alt_key (long /*int*/ self); +public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_alt_key (self); @@ -622,8 +622,8 @@ public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) { } /** @method flags=dynamic */ -public static final native short _webkit_dom_mouse_event_get_button (int /*long*/ self); -public static final short webkit_dom_mouse_event_get_button (int /*long*/ self) { +public static final native short _webkit_dom_mouse_event_get_button (long /*int*/ self); +public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_button (self); @@ -633,8 +633,8 @@ public static final short webkit_dom_mouse_event_get_button (int /*long*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self); -public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self) { +public static final native int _webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self); +public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_ctrl_key (self); @@ -644,8 +644,8 @@ public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_meta_key (int /*long*/ self); -public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self) { +public static final native int _webkit_dom_mouse_event_get_meta_key (long /*int*/ self); +public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_meta_key (self); @@ -655,8 +655,8 @@ public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_x (int /*long*/ self); -public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_x (long /*int*/ self); +public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_x (self); @@ -666,8 +666,8 @@ public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_y (int /*long*/ self); -public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_y (long /*int*/ self); +public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_y (self); @@ -677,8 +677,8 @@ public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_shift_key (int /*long*/ self); -public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self) { +public static final native int _webkit_dom_mouse_event_get_shift_key (long /*int*/ self); +public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) { lock.lock(); try { return _webkit_dom_mouse_event_get_shift_key (self); @@ -688,8 +688,8 @@ public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_char_code (int /*long*/ self); -public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) { +public static final native long _webkit_dom_ui_event_get_char_code (long /*int*/ self); +public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) { lock.lock(); try { return _webkit_dom_ui_event_get_char_code (self); @@ -699,8 +699,8 @@ public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_detail (int /*long*/ self); -public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) { +public static final native long _webkit_dom_ui_event_get_detail (long /*int*/ self); +public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) { lock.lock(); try { return _webkit_dom_ui_event_get_detail (self); @@ -710,8 +710,8 @@ public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_key_code (int /*long*/ self); -public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) { +public static final native long _webkit_dom_ui_event_get_key_code (long /*int*/ self); +public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) { lock.lock(); try { return _webkit_dom_ui_event_get_key_code (self); @@ -721,8 +721,8 @@ public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) { } /** @method flags=dynamic */ -public static final native void _webkit_download_cancel (int /*long*/ download); -public static final void webkit_download_cancel (int /*long*/ download) { +public static final native void _webkit_download_cancel (long /*int*/ download); +public static final void webkit_download_cancel (long /*int*/ download) { lock.lock(); try { _webkit_download_cancel (download); @@ -732,8 +732,8 @@ public static final void webkit_download_cancel (int /*long*/ download) { } /** @method flags=dynamic */ -public static final native long _webkit_download_get_current_size (int /*long*/ download); -public static final long webkit_download_get_current_size (int /*long*/ download) { +public static final native long _webkit_download_get_current_size (long /*int*/ download); +public static final long webkit_download_get_current_size (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_current_size (download); @@ -743,8 +743,8 @@ public static final long webkit_download_get_current_size (int /*long*/ download } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_download_get_network_request (int /*long*/ download); -public static final int /*long*/ webkit_download_get_network_request (int /*long*/ download) { +public static final native long /*int*/ _webkit_download_get_network_request (long /*int*/ download); +public static final long /*int*/ webkit_download_get_network_request (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_network_request (download); @@ -754,8 +754,8 @@ public static final int /*long*/ webkit_download_get_network_request (int /*long } /** @method flags=dynamic */ -public static final native int _webkit_download_get_status (int /*long*/ download); -public static final int webkit_download_get_status (int /*long*/ download) { +public static final native int _webkit_download_get_status (long /*int*/ download); +public static final int webkit_download_get_status (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_status (download); @@ -765,8 +765,8 @@ public static final int webkit_download_get_status (int /*long*/ download) { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download); -public static final int /*long*/ webkit_download_get_suggested_filename (int /*long*/ download) { +public static final native long /*int*/ _webkit_download_get_suggested_filename (long /*int*/ download); +public static final long /*int*/ webkit_download_get_suggested_filename (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_suggested_filename (download); @@ -776,8 +776,8 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l } /** @method flags=dynamic */ -public static final native long _webkit_download_get_total_size (int /*long*/ download); -public static final long webkit_download_get_total_size (int /*long*/ download) { +public static final native long _webkit_download_get_total_size (long /*int*/ download); +public static final long webkit_download_get_total_size (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_total_size (download); @@ -787,8 +787,8 @@ public static final long webkit_download_get_total_size (int /*long*/ download) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download); -public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) { +public static final native long /*int*/ _webkit_download_get_uri (long /*int*/ download); +public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) { lock.lock(); try { return _webkit_download_get_uri (download); @@ -798,8 +798,8 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_download_new (int /*long*/ request); -public static final int /*long*/ webkit_download_new (int /*long*/ request) { +public static final native long /*int*/ _webkit_download_new (long /*int*/ request); +public static final long /*int*/ webkit_download_new (long /*int*/ request) { lock.lock(); try { return _webkit_download_new (request); @@ -809,8 +809,8 @@ public static final int /*long*/ webkit_download_new (int /*long*/ request) { } /** @method flags=dynamic */ -public static final native void _webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri); -public static final void webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri) { +public static final native void _webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri); +public static final void webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri) { lock.lock(); try { _webkit_download_set_destination_uri (download, destination_uri); @@ -820,8 +820,8 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl } /** @method flags=dynamic */ -public static final native void _webkit_download_start (int /*long*/ download); -public static final void webkit_download_start (int /*long*/ download) { +public static final native void _webkit_download_start (long /*int*/ download); +public static final void webkit_download_start (long /*int*/ download) { lock.lock(); try { _webkit_download_start (download); @@ -831,8 +831,8 @@ public static final void webkit_download_start (int /*long*/ download) { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_get_default_session (); -public static final int /*long*/ webkit_get_default_session () { +public static final native long /*int*/ _webkit_get_default_session (); +public static final long /*int*/ webkit_get_default_session () { lock.lock(); try { return _webkit_get_default_session (); @@ -875,8 +875,8 @@ public static final int webkit_minor_version () { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request); -public static final int /*long*/ webkit_network_request_get_message (int /*long*/ request) { +public static final native long /*int*/ _webkit_network_request_get_message (long /*int*/ request); +public static final long /*int*/ webkit_network_request_get_message (long /*int*/ request) { lock.lock(); try { return _webkit_network_request_get_message (request); @@ -886,8 +886,8 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long* } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request); -public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ request) { +public static final native long /*int*/ _webkit_network_request_get_uri (long /*int*/ request); +public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ request) { lock.lock(); try { return _webkit_network_request_get_uri (request); @@ -897,8 +897,8 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_network_request_new (byte[] uri); -public static final int /*long*/ webkit_network_request_new (byte[] uri) { +public static final native long /*int*/ _webkit_network_request_new (byte[] uri); +public static final long /*int*/ webkit_network_request_new (byte[] uri) { lock.lock(); try { return _webkit_network_request_new (uri); @@ -908,8 +908,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_soup_auth_dialog_get_type (); -public static final int /*long*/ webkit_soup_auth_dialog_get_type () { +public static final native long /*int*/ _webkit_soup_auth_dialog_get_type (); +public static final long /*int*/ webkit_soup_auth_dialog_get_type () { lock.lock(); try { return _webkit_soup_auth_dialog_get_type (); @@ -919,8 +919,8 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source); -public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ data_source) { +public static final native long /*int*/ _webkit_web_data_source_get_data (long /*int*/ data_source); +public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ data_source) { lock.lock(); try { return _webkit_web_data_source_get_data (data_source); @@ -930,8 +930,8 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source); -public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long*/ data_source) { +public static final native long /*int*/ _webkit_web_data_source_get_encoding (long /*int*/ data_source); +public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int*/ data_source) { lock.lock(); try { return _webkit_web_data_source_get_encoding (data_source); @@ -941,8 +941,8 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_data_source (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_data_source (frame); @@ -952,8 +952,8 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_global_context (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_global_context (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_global_context (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_global_context (frame); @@ -963,8 +963,8 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long } /** @method flags=dynamic */ -public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame); -public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { +public static final native int _webkit_web_frame_get_load_status (long /*int*/ frame); +public static final int webkit_web_frame_get_load_status (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_load_status (frame); @@ -974,8 +974,8 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_parent (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_parent (frame); @@ -985,8 +985,8 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_title (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_title (frame); @@ -996,8 +996,8 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_type (); -public static final int /*long*/ webkit_web_frame_get_type () { +public static final native long /*int*/ _webkit_web_frame_get_type (); +public static final long /*int*/ webkit_web_frame_get_type () { lock.lock(); try { return _webkit_web_frame_get_type (); @@ -1007,8 +1007,8 @@ public static final int /*long*/ webkit_web_frame_get_type () { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_uri (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_uri (frame); @@ -1018,8 +1018,8 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame); -public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ frame) { +public static final native long /*int*/ _webkit_web_frame_get_web_view (long /*int*/ frame); +public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ frame) { lock.lock(); try { return _webkit_web_frame_get_web_view (frame); @@ -1029,8 +1029,8 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_download (int /*long*/ decision); -public static final void webkit_web_policy_decision_download (int /*long*/ decision) { +public static final native void _webkit_web_policy_decision_download (long /*int*/ decision); +public static final void webkit_web_policy_decision_download (long /*int*/ decision) { lock.lock(); try { _webkit_web_policy_decision_download (decision); @@ -1040,8 +1040,8 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision); -public static final void webkit_web_policy_decision_ignore (int /*long*/ decision) { +public static final native void _webkit_web_policy_decision_ignore (long /*int*/ decision); +public static final void webkit_web_policy_decision_ignore (long /*int*/ decision) { lock.lock(); try { _webkit_web_policy_decision_ignore (decision); @@ -1051,8 +1051,8 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view); -public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { +public static final native int _webkit_web_view_can_go_back (long /*int*/ web_view); +public static final int webkit_web_view_can_go_back (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_can_go_back (web_view); @@ -1062,8 +1062,8 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view); -public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { +public static final native int _webkit_web_view_can_go_forward (long /*int*/ web_view); +public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_can_go_forward (web_view); @@ -1073,8 +1073,8 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type); -public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type) { +public static final native int _webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type); +public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type) { lock.lock(); try { return _webkit_web_view_can_show_mime_type (web_view, mime_type); @@ -1084,8 +1084,8 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie } /** @method flags=dynamic */ -public static final native void _webkit_web_view_execute_script (int /*long*/ web_view, byte[] script); -public static final void webkit_web_view_execute_script (int /*long*/ web_view, byte[] script) { +public static final native void _webkit_web_view_execute_script (long /*int*/ web_view, byte[] script); +public static final void webkit_web_view_execute_script (long /*int*/ web_view, byte[] script) { lock.lock(); try { _webkit_web_view_execute_script (web_view, script); @@ -1095,8 +1095,8 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view, } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_dom_document (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_dom_document (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_dom_document (web_view); @@ -1106,8 +1106,8 @@ public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/ } /** @method flags=dynamic */ -public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view); -public static final int webkit_web_view_get_load_status (int /*long*/ web_view) { +public static final native int _webkit_web_view_get_load_status (long /*int*/ web_view); +public static final int webkit_web_view_get_load_status (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_load_status (web_view); @@ -1117,8 +1117,8 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_main_frame (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_main_frame (web_view); @@ -1128,8 +1128,8 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we } /** @method flags=dynamic */ -public static final native double _webkit_web_view_get_progress (int /*long*/ web_view); -public static final double webkit_web_view_get_progress (int /*long*/ web_view) { +public static final native double _webkit_web_view_get_progress (long /*int*/ web_view); +public static final double webkit_web_view_get_progress (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_progress (web_view); @@ -1139,8 +1139,8 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_settings (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_settings (web_view); @@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_ } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_title (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_title (web_view); @@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_type (); -public static final int /*long*/ webkit_web_view_get_type () { +public static final native long /*int*/ _webkit_web_view_get_type (); +public static final long /*int*/ webkit_web_view_get_type () { lock.lock(); try { return _webkit_web_view_get_type (); @@ -1172,8 +1172,8 @@ public static final int /*long*/ webkit_web_view_get_type () { } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_uri (web_view); @@ -1183,8 +1183,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view); -public static final int /*long*/ webkit_web_view_get_window_features (int /*long*/ web_view) { +public static final native long /*int*/ _webkit_web_view_get_window_features (long /*int*/ web_view); +public static final long /*int*/ webkit_web_view_get_window_features (long /*int*/ web_view) { lock.lock(); try { return _webkit_web_view_get_window_features (web_view); @@ -1194,8 +1194,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long } /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_back (int /*long*/ web_view); -public static final void webkit_web_view_go_back (int /*long*/ web_view) { +public static final native void _webkit_web_view_go_back (long /*int*/ web_view); +public static final void webkit_web_view_go_back (long /*int*/ web_view) { lock.lock(); try { _webkit_web_view_go_back (web_view); @@ -1205,8 +1205,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_forward (int /*long*/ web_view); -public static final void webkit_web_view_go_forward (int /*long*/ web_view) { +public static final native void _webkit_web_view_go_forward (long /*int*/ web_view); +public static final void webkit_web_view_go_forward (long /*int*/ web_view) { lock.lock(); try { _webkit_web_view_go_forward (web_view); @@ -1216,8 +1216,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); -public static final void webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { +public static final native void _webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); +public static final void webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { lock.lock(); try { _webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri); @@ -1227,8 +1227,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri); -public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri) { +public static final native void _webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri); +public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri) { lock.lock(); try { _webkit_web_view_load_uri (web_view, uri); @@ -1238,8 +1238,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] } /** @method flags=dynamic */ -public static final native int /*long*/ _webkit_web_view_new (); -public static final int /*long*/ webkit_web_view_new () { +public static final native long /*int*/ _webkit_web_view_new (); +public static final long /*int*/ webkit_web_view_new () { lock.lock(); try { return _webkit_web_view_new (); @@ -1249,8 +1249,8 @@ public static final int /*long*/ webkit_web_view_new () { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_reload (int /*long*/ web_view); -public static final void webkit_web_view_reload (int /*long*/ web_view) { +public static final native void _webkit_web_view_reload (long /*int*/ web_view); +public static final void webkit_web_view_reload (long /*int*/ web_view) { lock.lock(); try { _webkit_web_view_reload (web_view); @@ -1260,8 +1260,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view); -public static final void webkit_web_view_stop_loading (int /*long*/ web_view) { +public static final native void _webkit_web_view_stop_loading (long /*int*/ web_view); +public static final void webkit_web_view_stop_loading (long /*int*/ web_view) { lock.lock(); try { _webkit_web_view_stop_loading (web_view); @@ -1279,14 +1279,14 @@ public static final native int JSClassDefinition_sizeof (); * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size); +public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size); /** * @method flags=getter * @param cookie cast=(SoupCookie *) */ -public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); -public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { +public static final native long /*int*/ _SoupCookie_expires (long /*int*/ cookie); +public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) { lock.lock(); try { return _SoupCookie_expires (cookie); @@ -1300,8 +1300,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { * @param message cast=(SoupMessage *) * @param method cast=(const char *) */ -public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); -public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { +public static final native void _SoupMessage_method (long /*int*/ message, long /*int*/ method); +public static final void SoupMessage_method (long /*int*/ message, long /*int*/ method) { lock.lock(); try { _SoupMessage_method (message, method); @@ -1314,8 +1314,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/ * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { +public static final native long /*int*/ _SoupMessage_request_body (long /*int*/ message); +public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) { lock.lock(); try { return _SoupMessage_request_body (message); @@ -1328,8 +1328,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { +public static final native long /*int*/ _SoupMessage_request_headers (long /*int*/ message); +public static final long /*int*/ SoupMessage_request_headers (long /*int*/ message) { lock.lock(); try { return _SoupMessage_request_headers (message); diff --git a/org/eclipse/swt/opengl/GLCanvas.java b/org/eclipse/swt/opengl/GLCanvas.java index af4b7a6..c48546b 100644 --- a/org/eclipse/swt/opengl/GLCanvas.java +++ b/org/eclipse/swt/opengl/GLCanvas.java @@ -27,9 +27,9 @@ import org.eclipse.swt.internal.opengl.glx.*; */ public class GLCanvas extends Canvas { - int /*long*/ context; - int /*long*/ xWindow; - int /*long*/ glWindow; + long /*int*/ context; + long /*int*/ xWindow; + long /*int*/ glWindow; XVisualInfo vinfo; static final int MAX_ATTRIBUTES = 32; @@ -104,9 +104,9 @@ public GLCanvas (Composite parent, int style, GLData data) { } glxAttrib [pos++] = 0; OS.gtk_widget_realize (handle); - int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); - int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); - int /*long*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); + long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib); if (infoPtr == 0) { dispose (); SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH); @@ -114,9 +114,9 @@ public GLCanvas (Composite parent, int style, GLData data) { vinfo = new XVisualInfo (); GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof); OS.XFree (infoPtr); - int /*long*/ screen = OS.gdk_screen_get_default (); - int /*long*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid); - int /*long*/ share = data.shareContext != null ? data.shareContext.context : 0; + long /*int*/ screen = OS.gdk_screen_get_default (); + long /*int*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid); + long /*int*/ share = data.shareContext != null ? data.shareContext.context : 0; context = GLX.glXCreateContext (xDisplay, vinfo, share, true); if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES); GdkWindowAttr attrs = new GdkWindowAttr (); @@ -156,8 +156,8 @@ public GLCanvas (Composite parent, int style, GLData data) { OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height); break; case SWT.Dispose: - int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); - int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); if (context != 0) { if (GLX.glXGetCurrentContext () == context) { GLX.glXMakeCurrent (xDisplay, 0, 0); @@ -189,8 +189,8 @@ public GLCanvas (Composite parent, int style, GLData data) { */ public GLData getGLData () { checkWidget (); - int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); - int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); GLData data = new GLData (); int [] value = new int [1]; GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value); @@ -252,8 +252,8 @@ public boolean isCurrent () { public void setCurrent () { checkWidget (); if (GLX.glXGetCurrentContext () == context) return; - int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); - int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); GLX.glXMakeCurrent (xDisplay, xWindow, context); } @@ -267,8 +267,8 @@ public void setCurrent () { */ public void swapBuffers () { checkWidget (); - int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle); - int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); + long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window); GLX.glXSwapBuffers (xDisplay, xWindow); } } diff --git a/org/eclipse/swt/printing/PrintDialog.java b/org/eclipse/swt/printing/PrintDialog.java index a317822..a6f2acd 100644 --- a/org/eclipse/swt/printing/PrintDialog.java +++ b/org/eclipse/swt/printing/PrintDialog.java @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.*; public class PrintDialog extends Dialog { PrinterData printerData = new PrinterData(); - int /*long*/ handle; + long /*int*/ handle; int index; byte [] settingsData; @@ -292,7 +292,7 @@ public PrinterData open() { return Printer.getDefaultPrinterData(); } else { byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true); - int /*long*/ topHandle = getParent().handle; + long /*int*/ topHandle = getParent().handle; while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) { topHandle = OS.gtk_widget_get_parent(topHandle); } @@ -305,8 +305,8 @@ public PrinterData open() { OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET); /* Set state into print dialog settings. */ - int /*long*/ settings = OS.gtk_print_settings_new(); - int /*long*/ page_setup = OS.gtk_page_setup_new(); + long /*int*/ settings = OS.gtk_print_settings_new(); + long /*int*/ page_setup = OS.gtk_page_setup_new(); if (printerData.otherData != null) { Printer.restore(printerData.otherData, settings, page_setup); @@ -316,7 +316,7 @@ public PrinterData open() { String printerName = printerData.name; if (printerName == null && printerData.printToFile) { /* Find the printer name corresponding to the file backend. */ - int /*long*/ printer = Printer.gtkPrinterFromPrinterData(printerData); + long /*int*/ printer = Printer.gtkPrinterFromPrinterData(printerData); if (printer != 0) { PrinterData data = Printer.printerDataFromGtkPrinter(printer); printerName = data.name; @@ -377,7 +377,7 @@ public PrinterData open() { } OS.g_object_unref(settings); OS.g_object_unref(page_setup); - 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); PrinterData data = null; @@ -385,7 +385,7 @@ public PrinterData open() { Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent (); int signalId = 0; - int /*long*/ hookId = 0; + long /*int*/ hookId = 0; if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) { signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET()); hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0); @@ -411,7 +411,7 @@ public PrinterData open() { OS.g_signal_remove_emission_hook (signalId, hookId); } if (response == OS.GTK_RESPONSE_OK) { - int /*long*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle); + long /*int*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle); if (printer != 0) { /* Get state from print dialog. */ settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref @@ -425,7 +425,7 @@ public PrinterData open() { case OS.GTK_PRINT_PAGES_RANGES: data.scope = PrinterData.PAGE_RANGE; int[] num_ranges = new int[1]; - int /*long*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges); + long /*int*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges); int [] pageRange = new int[2]; int length = num_ranges[0]; int min = Integer.MAX_VALUE, max = 0; @@ -447,7 +447,7 @@ public PrinterData open() { data.printToFile = Printer.GTK_FILE_BACKEND.equals(data.driver); // TODO: GTK_FILE_BACKEND is not GTK API (see gtk bug 345590) if (data.printToFile) { - int /*long*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI); + long /*int*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI); int length = OS.strlen (address); byte [] buffer = new byte [length]; OS.memmove (buffer, address, length); @@ -464,7 +464,7 @@ public PrinterData open() { /* Save other print_settings data as key/value pairs in otherData. */ Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$ - int /*long*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress(); + long /*int*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress(); if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); index = 0; settingsData = new byte[1024]; @@ -480,7 +480,7 @@ public PrinterData open() { store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$ store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$ store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$ - int /*long*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$ + long /*int*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$ storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$ storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$ storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$ @@ -498,7 +498,7 @@ public PrinterData open() { } } -int /*long*/ GtkPrintSettingsFunc (int /*long*/ key, int /*long*/ value, int /*long*/ data) { +long /*int*/ GtkPrintSettingsFunc (long /*int*/ key, long /*int*/ value, long /*int*/ data) { int length = OS.strlen (key); byte [] keyBuffer = new byte [length]; OS.memmove (keyBuffer, key, length); @@ -521,7 +521,7 @@ void store(String key, boolean value) { store(key, String.valueOf(value)); } -void storeBytes(String key, int /*long*/ value) { +void storeBytes(String key, long /*int*/ value) { int length = OS.strlen (value); byte [] valueBuffer = new byte [length]; OS.memmove (valueBuffer, value, length); diff --git a/org/eclipse/swt/printing/Printer.java b/org/eclipse/swt/printing/Printer.java index d1b17cf..ed98be0 100644 --- a/org/eclipse/swt/printing/Printer.java +++ b/org/eclipse/swt/printing/Printer.java @@ -44,16 +44,16 @@ import org.eclipse.swt.printing.PrinterData; */ public final class Printer extends Device { static PrinterData [] printerList; - static int /*long*/ findPrinter; + static long /*int*/ findPrinter; static PrinterData findData; PrinterData data; - int /*long*/ printer; - int /*long*/ printJob; - int /*long*/ settings; - int /*long*/ pageSetup; - int /*long*/ surface; - int /*long*/ cairo; + long /*int*/ printer; + long /*int*/ printJob; + long /*int*/ settings; + long /*int*/ pageSetup; + long /*int*/ surface; + long /*int*/ cairo; /** * whether or not a GC was created for this printer @@ -76,7 +76,7 @@ static void gtk_init() { if (OS.GTK_VERSION < OS.VERSION(2, 24, 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]"); } } @@ -95,7 +95,7 @@ public static PrinterData[] getPrinterList() { } gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_List", 2); //$NON-NLS-1$ - int /*long*/ GtkPrinterFunc_List = printerCallback.getAddress(); + long /*int*/ GtkPrinterFunc_List = printerCallback.getAddress(); if (GtkPrinterFunc_List == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); OS.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true); /* @@ -109,7 +109,7 @@ public static PrinterData[] getPrinterList() { return printerList; } -static int /*long*/ GtkPrinterFunc_List (int /*long*/ printer, int /*long*/ user_data) { +static long /*int*/ GtkPrinterFunc_List (long /*int*/ printer, long /*int*/ user_data) { int length = printerList.length; PrinterData [] newList = new PrinterData [length + 1]; System.arraycopy (printerList, 0, newList, 0, length); @@ -143,7 +143,7 @@ public static PrinterData getDefaultPrinterData() { } gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_Default", 2); //$NON-NLS-1$ - int /*long*/ GtkPrinterFunc_Default = printerCallback.getAddress(); + long /*int*/ GtkPrinterFunc_Default = printerCallback.getAddress(); if (GtkPrinterFunc_Default == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); OS.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true); /* @@ -157,7 +157,7 @@ public static PrinterData getDefaultPrinterData() { return findData; } -static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ user_data) { +static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ user_data) { if (OS.gtk_printer_is_default(printer)) { findData = printerDataFromGtkPrinter(printer); return 1; @@ -167,10 +167,10 @@ static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ u return 0; } -static int /*long*/ gtkPrinterFromPrinterData(PrinterData data) { +static long /*int*/ gtkPrinterFromPrinterData(PrinterData data) { gtk_init(); Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_FindNamedPrinter", 2); //$NON-NLS-1$ - int /*long*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress(); + long /*int*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress(); if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); findPrinter = 0; findData = data; @@ -186,7 +186,7 @@ static int /*long*/ gtkPrinterFromPrinterData(PrinterData data) { return findPrinter; } -static int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int /*long*/ user_data) { +static long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long /*int*/ user_data) { PrinterData pd = printerDataFromGtkPrinter(printer); if ((pd.driver.equals(findData.driver) && pd.name.equals(findData.name)) || (pd.driver.equals(GTK_FILE_BACKEND)) && findData.printToFile && findData.driver == null && findData.name == null) { @@ -200,9 +200,9 @@ static int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int / return 0; } -static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) { - int /*long*/ backend = OS.gtk_printer_get_backend(printer); - int /*long*/ address = OS.G_OBJECT_TYPE_NAME(backend); +static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) { + long /*int*/ backend = OS.gtk_printer_get_backend(printer); + long /*int*/ address = OS.G_OBJECT_TYPE_NAME(backend); int length = OS.strlen (address); byte [] buffer = new byte [length]; OS.memmove (buffer, address, length); @@ -220,7 +220,7 @@ static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) { /* * Restore printer settings and page_setup data from data. */ -static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup) { +static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup) { settingsData = data; start = end = 0; while (end < settingsData.length && settingsData[end] != 0) { @@ -253,7 +253,7 @@ static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup double width = restoreDouble("paper_size_width"); //$NON-NLS-1$ double height = restoreDouble("paper_size_height"); //$NON-NLS-1$ boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$ - int /*long*/ paper_size = 0; + long /*int*/ paper_size = 0; if (custom) { if (ppd_name.length > 0) { paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height); @@ -273,13 +273,13 @@ static byte [] uriFromFilename(String filename) { 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); @@ -294,7 +294,7 @@ static DeviceData checkNull (PrinterData data) { 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); @@ -410,8 +410,8 @@ static byte [] restoreBytes(String key, boolean nullTerminate) { 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); @@ -433,8 +433,8 @@ public Font getSystemFont () { * * @noreference This method is not intended to be referenced by clients. */ -public int /*long*/ internal_new_GC(GCData data) { - int /*long*/ gc, drawable = 0; +public long /*int*/ internal_new_GC(GCData data) { + long /*int*/ gc, drawable = 0; if (OS.USE_CAIRO) { gc = cairo; } else { @@ -488,8 +488,8 @@ public int /*long*/ internal_new_GC(GCData data) { * * @noreference This method is not intended to be referenced by clients. */ -public void internal_dispose_GC(int /*long*/ hDC, GCData data) { - int /*long*/ gc = hDC; +public void internal_dispose_GC(long /*int*/ hDC, GCData data) { + long /*int*/ gc = hDC; if (data != null) isGCCreated = false; if (OS.USE_CAIRO) return; OS.g_object_unref (gc); diff --git a/org/eclipse/swt/program/Program.java b/org/eclipse/swt/program/Program.java index d16f925..c318672 100644 --- a/org/eclipse/swt/program/Program.java +++ b/org/eclipse/swt/program/Program.java @@ -42,10 +42,10 @@ public final class Program { */ 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 @@ static int getDesktop(final Display display) { int desktop = DESKTOP_UNKNOWN; /* Get the list of properties on the root window. */ - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + 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 @@ static int getDesktop(final Display display) { */ 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 @@ static int getDesktop(final Display display) { } 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 @@ static int getDesktop(final Display display) { 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 @@ static int getDesktop(final Display display) { }); /* 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 @@ static int getDesktop(final Display display) { */ 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 @@ boolean cde_execute(String fileName) { /* 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 @@ static String cde_getAttribute(String dataType, String attrName) { 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 String cde_getAttribute(String dataType, String attrName) { 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]); @@ -309,13 +309,13 @@ static boolean cde_init(Display display) { /* Use the character encoding for the default locale */ CDE.XtToolkitInitialize(); - int /*long*/ xtContext = CDE.XtCreateApplicationContext (); - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xtContext = CDE.XtCreateApplicationContext (); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); 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); @@ -381,10 +381,10 @@ static String[] parseCommand(String cmd) { */ 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); @@ -397,7 +397,7 @@ boolean gnome_24_execute(String fileName) { */ 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); @@ -410,7 +410,7 @@ boolean gnome_execute(String fileName) { 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) { @@ -474,24 +474,24 @@ ImageData gnome_getImageData() { */ 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); @@ -513,7 +513,7 @@ static String gnome_getMimeType(String extension) { 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) { @@ -528,7 +528,7 @@ static String gnome_getMimeType(String extension) { 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; @@ -549,9 +549,9 @@ static Program gnome_getProgram(Display display, String mimeType) { byte[] 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); @@ -583,8 +583,8 @@ static boolean gnome_isExecutable(String fileName) { 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$ @@ -733,16 +733,16 @@ static Program[] getPrograms(Display display) { 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); @@ -777,7 +777,7 @@ ImageData gio_getImageData() { } 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 @@ -787,10 +787,10 @@ static Hashtable gio_getMimeInfo() { */ 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); @@ -799,11 +799,11 @@ static Hashtable gio_getMimeInfo() { } 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]); @@ -858,19 +858,19 @@ static String gio_getMimeType(String extension) { 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) { @@ -879,7 +879,7 @@ static Program gio_getProgram (Display display, int /*long*/ application) { 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) { @@ -889,9 +889,9 @@ static Program gio_getProgram (Display display, int /*long*/ application) { } } 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) { @@ -907,12 +907,12 @@ static Program gio_getProgram (Display display, int /*long*/ application) { } 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)) { @@ -934,13 +934,13 @@ static boolean gio_isExecutable(String fileName) { 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); @@ -962,9 +962,9 @@ static boolean gio_isExecutable(String fileName) { static boolean gio_launch(String fileName) { boolean result = false; byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); - int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer); + long /*int*/ file = OS.g_file_new_for_commandline_arg (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); @@ -981,11 +981,11 @@ boolean gio_execute(String fileName) { 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); @@ -993,7 +993,7 @@ boolean gio_execute(String fileName) { 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 --git a/org/eclipse/swt/widgets/Button.java b/org/eclipse/swt/widgets/Button.java index 77d5d6b..da0b003 100644 --- a/org/eclipse/swt/widgets/Button.java +++ b/org/eclipse/swt/widgets/Button.java @@ -45,7 +45,7 @@ import org.eclipse.swt.events.*; * @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 @@ static int checkStyle (int style) { 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 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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 @@ void deregister () { if (arrowHandle != 0) display.removeWidget (arrowHandle); } -int /*long*/ fontHandle () { +long /*int*/ fontHandle () { if (labelHandle != 0) return labelHandle; return super.fontHandle (); } @@ -459,14 +459,14 @@ public String getText () { 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 @@ int /*long*/ gtk_clicked (int /*long*/ widget) { 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 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { 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) { @@ -512,8 +512,8 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { 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 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize 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 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize 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 @@ public void setImage (Image image) { 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 --git a/org/eclipse/swt/widgets/Canvas.java b/org/eclipse/swt/widgets/Canvas.java index 9ebbe8e..f45d843 100644 --- a/org/eclipse/swt/widgets/Canvas.java +++ b/org/eclipse/swt/widgets/Canvas.java @@ -144,46 +144,46 @@ public IME getIME () { 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 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b 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(); @@ -276,7 +276,7 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b // gc.copyArea (x, y, width, height, destX, destY); // gc.dispose (); //TODO: Use Cairo - 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); @@ -398,7 +398,7 @@ public void setIME (IME ime) { } void updateCaret () { - int /*long*/ imHandle = imHandle (); + long /*int*/ imHandle = imHandle (); if (imHandle == 0) return; GdkRectangle rect = new GdkRectangle (); rect.x = caret.x; diff --git a/org/eclipse/swt/widgets/Caret.java b/org/eclipse/swt/widgets/Caret.java index 800ef44..2297748 100644 --- a/org/eclipse/swt/widgets/Caret.java +++ b/org/eclipse/swt/widgets/Caret.java @@ -97,14 +97,14 @@ void createWidget (int index) { boolean drawCaret () { if (parent == null) return false; if (parent.isDisposed ()) return false; - int /*long*/ window = parent.paintWindow (); + long /*int*/ window = parent.paintWindow (); if (OS.USE_CAIRO) { - int /*long*/ cairo = OS.gdk_cairo_create(window); + long /*int*/ cairo = OS.gdk_cairo_create(window); if (cairo == 0) error(SWT.ERROR_NO_HANDLES); Cairo.cairo_set_source_rgb(cairo, 1, 1, 1); Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_DIFFERENCE); if (image != null && !image.isDisposed() && image.mask == 0) { - int /*long*/ surface = Cairo.cairo_get_target(cairo); + long /*int*/ surface = Cairo.cairo_get_target(cairo); int nWidth = 0; switch (Cairo.cairo_surface_get_type(surface)) { case Cairo.CAIRO_SURFACE_TYPE_IMAGE: @@ -130,12 +130,12 @@ boolean drawCaret () { Cairo.cairo_destroy(cairo); return true; } - int /*long*/ gc = OS.gdk_gc_new (window); + 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 --git a/org/eclipse/swt/widgets/ColorDialog.java b/org/eclipse/swt/widgets/ColorDialog.java index aab3285..dea297d 100644 --- a/org/eclipse/swt/widgets/ColorDialog.java +++ b/org/eclipse/swt/widgets/ColorDialog.java @@ -126,19 +126,19 @@ public RGB[] getRGBs() { */ 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); @@ -153,7 +153,7 @@ public RGB open () { } OS.gtk_color_selection_set_has_palette (dialog.colorsel, true); if (rgbs != null) { - int /*long*/ colors = OS.g_malloc(GdkColor.sizeof * rgbs.length); + long /*int*/ colors = OS.g_malloc(GdkColor.sizeof * rgbs.length); for (int i=0; i> 8) & 0xFF; rgb = new RGB (red, green, blue); } - int /*long*/ settings = OS.gtk_settings_get_default (); + long /*int*/ settings = OS.gtk_settings_get_default (); if (settings != 0) { - int /*long*/ [] ptr = new int /*long*/ [1]; + long /*int*/ [] ptr = new long /*int*/ [1]; OS.g_object_get (settings, OS.gtk_color_palette, ptr, 0); if (ptr [0] != 0) { int length = OS.strlen (ptr [0]); diff --git a/org/eclipse/swt/widgets/Combo.java b/org/eclipse/swt/widgets/Combo.java index 72d62d0..4451fca 100644 --- a/org/eclipse/swt/widgets/Combo.java +++ b/org/eclipse/swt/widgets/Combo.java @@ -57,9 +57,9 @@ import org.eclipse.swt.events.*; * @noextend This class is not intended to be subclassed by clients. */ public class Combo extends Composite { - int /*long*/ buttonHandle, entryHandle, textRenderer, cellHandle, popupHandle, menuHandle; + long /*int*/ buttonHandle, entryHandle, 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 selectionAdded; @@ -323,9 +323,9 @@ void clearText () { 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); @@ -348,10 +348,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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]; @@ -366,7 +366,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { GtkRequisition arrowRequesition = new GtkRequisition (); OS.gtk_widget_size_request (buttonHandle, arrowRequesition); GtkRequisition listRequesition = new GtkRequisition (); - int /*long*/ listParent = OS.gtk_bin_get_child(popupHandle); + long /*int*/ listParent = OS.gtk_bin_get_child(popupHandle); OS.gtk_widget_size_request (listParent, listRequesition); width = Math.max (listRequesition.width, width) + arrowRequesition.width; width = wHint == SWT.DEFAULT ? width : wHint; @@ -397,7 +397,7 @@ void createHandle (int index) { 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*/ 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); @@ -479,15 +479,15 @@ void deregister () { if (entryHandle != 0) display.removeWidget (entryHandle); if (popupHandle != 0) display.removeWidget (popupHandle); if (menuHandle != 0) display.removeWidget (menuHandle); - int /*long*/ imContext = imContext (); + long /*int*/ imContext = imContext (); if (imContext != 0) display.removeWidget (imContext); } -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); } @@ -496,18 +496,18 @@ boolean filterKey (int keyval, int /*long*/ event) { return false; } -int /*long*/ findPopupHandle (int /*long*/ oldList) { - int /*long*/ result = 0; - int /*long*/ currentList = OS.gtk_window_list_toplevels(); - int /*long*/ oldFromList = oldList; - int /*long*/ newFromList = OS.g_list_last(currentList); +long /*int*/ findPopupHandle (long /*int*/ oldList) { + long /*int*/ result = 0; + long /*int*/ currentList = OS.gtk_window_list_toplevels(); + long /*int*/ oldFromList = oldList; + long /*int*/ newFromList = OS.g_list_last(currentList); boolean isFound; while (newFromList != 0) { - int /*long*/ newToplevel = OS.g_list_data(newFromList); + long /*int*/ newToplevel = OS.g_list_data(newFromList); isFound = false; oldFromList = oldList; while (oldFromList != 0) { - int /*long*/ oldToplevel = OS.g_list_data(oldFromList); + long /*int*/ oldToplevel = OS.g_list_data(oldFromList); if (newToplevel == oldToplevel) { isFound = true; break; @@ -536,9 +536,9 @@ void findButtonHandle() { */ OS.gtk_container_forall (handle, display.allChildrenProc, 0); if (display.allChildren != 0) { - int /*long*/ list = display.allChildren; + long /*int*/ list = display.allChildren; while (list != 0) { - int /*long*/ widget = OS.g_list_data (list); + long /*int*/ widget = OS.g_list_data (list); if (OS.GTK_IS_BUTTON (widget)) { buttonHandle = widget; break; @@ -553,9 +553,9 @@ void findButtonHandle() { void findMenuHandle() { OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0); if (display.allChildren != 0) { - int /*long*/ list = display.allChildren; + long /*int*/ list = display.allChildren; while (list != 0) { - int /*long*/ widget = OS.g_list_data (list); + long /*int*/ widget = OS.g_list_data (list); if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) { menuHandle = widget; break; @@ -567,7 +567,7 @@ void findMenuHandle() { } } -void fixModal (int /*long*/ group, int /*long*/ modalGroup) { +void fixModal (long /*int*/ group, long /*int*/ modalGroup) { if (popupHandle != 0) { if (group != 0) { OS.gtk_window_group_add_window (group, popupHandle); @@ -589,7 +589,7 @@ void fixIM () { * 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; @@ -599,12 +599,12 @@ void fixIM () { gdkEventKey = 0; } -int /*long*/ fontHandle () { +long /*int*/ fontHandle () { if (entryHandle != 0) return entryHandle; return super.fontHandle (); } -int /*long*/ focusHandle () { +long /*int*/ focusHandle () { if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle; if (entryHandle != 0) return entryHandle; return super.focusHandle (); @@ -629,9 +629,9 @@ void hookEvents () { } 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, menuHandle}; + long /*int*/ [] handles = new long /*int*/ [] {buttonHandle, entryHandle, menuHandle}; for (int i=0; iSample 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; @@ -104,15 +104,15 @@ static int checkStyle (int style) { } 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) { @@ -206,7 +206,7 @@ protected void checkSubclass () { /* Do nothing - Subclassing is allowed */ } -int /*long*/ childStyle () { +long /*int*/ childStyle () { if (scrolledHandle != 0) return 0; return super.childStyle (); } @@ -267,9 +267,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) { 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) error (SWT.ERROR_NO_HANDLES); @@ -367,7 +367,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs 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) { @@ -375,12 +375,12 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY); x += pt.x + offsetX; y += pt.y + offsetY; - int /*long*/ surface = control.backgroundImage.surface; + long /*int*/ surface = control.backgroundImage.surface; if (surface == 0) { - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + 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); surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]); @@ -388,7 +388,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs } else { Cairo.cairo_surface_reference(surface); } - 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) { @@ -406,7 +406,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs 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) { @@ -464,7 +464,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De } } -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); @@ -503,15 +503,15 @@ void fixTabList (Control control) { 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 ()) { @@ -524,12 +524,12 @@ void fixZOrder () { } } -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); @@ -590,7 +590,7 @@ int getChildrenCount () { * 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); @@ -604,7 +604,7 @@ public Rectangle getClientArea () { 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); @@ -685,8 +685,8 @@ public Control [] getTabList () { 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 ()) { @@ -700,7 +700,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -711,7 +711,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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 (); @@ -723,7 +723,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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; @@ -737,8 +737,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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 @@ -758,30 +758,30 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { 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) { @@ -790,16 +790,16 @@ int /*long*/ gtk_realize (int /*long*/ widget) { 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; @@ -823,7 +823,7 @@ boolean hooksKeys () { return hooks (SWT.KeyDown) || hooks (SWT.KeyUp); } -int /*long*/ imHandle () { +long /*int*/ imHandle () { return imHandle; } @@ -1118,16 +1118,16 @@ void markLayout (boolean changed, boolean all) { } } -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); @@ -1155,20 +1155,20 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) { 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); @@ -1200,7 +1200,7 @@ void moveChildren(int oldWidth) { 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); @@ -1243,12 +1243,12 @@ Point minimumSize (int wHint, int hHint, boolean changed) { 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 --git a/org/eclipse/swt/widgets/Control.java b/org/eclipse/swt/widgets/Control.java index 7404d61..a387015 100644 --- a/org/eclipse/swt/widgets/Control.java +++ b/org/eclipse/swt/widgets/Control.java @@ -44,8 +44,8 @@ import org.eclipse.swt.internal.gtk.*; * @noextend This class is not intended to be subclassed by clients. */ public abstract class Control extends Widget implements Drawable { - int /*long*/ fixedHandle; - int /*long*/ redrawWindow, enableWindow; + long /*int*/ fixedHandle; + long /*int*/ redrawWindow, enableWindow; int drawCount; Composite parent; Cursor cursor; @@ -104,13 +104,13 @@ Font defaultFont () { 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) { +void drawBackground (Control control, long /*int*/ window, long /*int*/ region, int x, int y, int width, int height) { if (OS.USE_CAIRO) { - int /*long*/ cairo = OS.gdk_cairo_create(window); + long /*int*/ cairo = OS.gdk_cairo_create(window); if (cairo == 0) error (SWT.ERROR_NO_HANDLES); if (region != 0) { OS.gdk_cairo_region(cairo, region); @@ -121,7 +121,7 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region, Cairo.cairo_translate (cairo, -pt.x, -pt.y); x += pt.x; y += pt.y; - int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface); + long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface); if (pattern == 0) error (SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT); if ((style & SWT.MIRRORED) != 0) { @@ -139,7 +139,7 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region, Cairo.cairo_destroy(cairo); return; } - int /*long*/ gdkGC = OS.gdk_gc_new (window); + 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); @@ -156,8 +156,8 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region, } 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; @@ -169,16 +169,16 @@ void enableWidget (boolean enabled) { 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); } @@ -190,7 +190,7 @@ void fixFocus (Control focusControl) { 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 @@ -202,7 +202,7 @@ void fixStyle () { 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 @@ -216,7 +216,7 @@ void fixStyle (int /*long*/ handle) { */ 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); @@ -224,11 +224,11 @@ void fixStyle (int /*long*/ handle) { } } -int /*long*/ focusHandle () { +long /*int*/ focusHandle () { return handle; } -int /*long*/ fontHandle () { +long /*int*/ fontHandle () { return handle; } @@ -256,7 +256,7 @@ boolean hasFocus () { 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); @@ -268,7 +268,7 @@ void hookEvents () { 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); @@ -277,7 +277,7 @@ void hookEvents () { 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); @@ -293,7 +293,7 @@ void hookEvents () { * 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); @@ -305,7 +305,7 @@ void hookEvents () { } /* 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); @@ -322,7 +322,7 @@ void hookEvents () { /* 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); @@ -330,11 +330,11 @@ void hookEvents () { 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]); @@ -342,14 +342,14 @@ int /*long*/ hoverProc (int /*long*/ widget) { 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); @@ -357,8 +357,8 @@ int /*long*/ paintHandle () { 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); } @@ -384,27 +384,27 @@ public boolean print (GC gc) { 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); - int /*long*/ drawable = data.drawable; + long /*int*/ drawable = data.drawable; if (drawable == 0) drawable = OS.gdk_get_default_root_window(); printWidget (gc, drawable, OS.gdk_drawable_get_depth (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]; @@ -412,13 +412,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, 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); @@ -434,7 +434,7 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, 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]; @@ -445,18 +445,18 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); - 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + 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) 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) error(SWT.ERROR_NO_HANDLES); Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST); Cairo.cairo_set_source(cairo, pattern); @@ -472,13 +472,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, 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]); @@ -592,7 +592,7 @@ void checkMirrored () { if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED; } -int /*long*/ childStyle () { +long /*int*/ childStyle () { return parent.childStyle (); } @@ -652,7 +652,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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 (); @@ -678,7 +678,7 @@ void forceResize () { * 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 (); @@ -736,7 +736,7 @@ Accessible _getAccessible () { */ 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); @@ -801,7 +801,7 @@ void markLayout (boolean changed, boolean all) { /* 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 @@ -812,8 +812,8 @@ void modifyStyle (int /*long*/ handle, int /*long*/ style) { } 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 @@ -831,13 +831,13 @@ void moveHandle (int x, int y) { } 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 (); @@ -961,7 +961,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize */ 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) { @@ -1026,7 +1026,7 @@ public void setLocation(int x, int y) { */ 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); @@ -1076,15 +1076,15 @@ public void setSize (Point size) { 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) { @@ -1092,7 +1092,7 @@ void setRelations () { * 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) { @@ -1140,7 +1140,7 @@ boolean isDescribedByLabel () { return true; } -boolean isFocusHandle (int /*long*/ widget) { +boolean isFocusHandle (long /*int*/ widget) { return widget == focusHandle (); } @@ -1281,7 +1281,7 @@ public void setLayoutData (Object layoutData) { */ 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]; @@ -1330,7 +1330,7 @@ public Point toControl (Point point) { */ 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; @@ -2221,7 +2221,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) { 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 @@ -2276,8 +2276,8 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean 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); } @@ -2299,13 +2299,13 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De 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); } @@ -2319,7 +2319,7 @@ int /*long*/ fixedMapProc (int /*long*/ widget) { return 0; } -void fixModal(int /*long*/ group, int /*long*/ modalGroup) { +void fixModal(long /*int*/ group, long /*int*/ modalGroup) { } /** @@ -2345,7 +2345,7 @@ public boolean forceFocus () { 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); @@ -2353,8 +2353,8 @@ boolean forceFocus (int /*long*/ focusHandle) { // 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 */ @@ -2415,7 +2415,7 @@ public Image getBackgroundImage () { } 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); @@ -2423,7 +2423,7 @@ GdkColor getBgColor () { } 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); @@ -2523,8 +2523,8 @@ public Font getFont () { 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)); } @@ -2549,7 +2549,7 @@ GdkColor getForegroundColor () { } 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); @@ -2561,7 +2561,7 @@ Point getIMCaretPos () { } 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); @@ -2618,7 +2618,7 @@ public Menu getMenu () { 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 (); @@ -2787,11 +2787,11 @@ public boolean getVisible () { 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; @@ -2806,10 +2806,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo 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; @@ -2856,13 +2856,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo 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; @@ -2873,7 +2873,7 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) { 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 @@ -2886,7 +2886,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) { 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; @@ -2916,7 +2916,7 @@ boolean checkSubwindow () { 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) { @@ -2958,7 +2958,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { } } 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; @@ -2974,7 +2974,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { 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 (); @@ -2995,34 +2995,34 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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); } @@ -3031,7 +3031,7 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -3050,16 +3050,16 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { 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; @@ -3074,15 +3074,15 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -3095,7 +3095,7 @@ int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) { 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))) { @@ -3105,7 +3105,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { 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]; @@ -3115,22 +3115,22 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { 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], SWT.MENU_KEYBOARD) ? 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) { @@ -3139,7 +3139,7 @@ int /*long*/ gtk_realize (int /*long*/ widget) { 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) { @@ -3155,25 +3155,25 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) { 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); } 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 @@ -3182,8 +3182,8 @@ int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ even 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; @@ -3202,7 +3202,7 @@ int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ even 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); } @@ -3221,11 +3221,11 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { * * @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) error (SWT.ERROR_NO_HANDLES); - int /*long*/ gc; + long /*int*/ gc; if (OS.USE_CAIRO) { gc = OS.gdk_cairo_create (window); } else { @@ -3252,7 +3252,7 @@ public int /*long*/ internal_new_GC (GCData data) { return gc; } -int /*long*/ imHandle () { +long /*int*/ imHandle () { return 0; } @@ -3271,9 +3271,9 @@ int /*long*/ imHandle () { * * @noreference This method is not intended to be referenced by clients. */ -public void internal_dispose_GC (int /*long*/ hDC, GCData data) { +public void internal_dispose_GC (long /*int*/ hDC, GCData data) { checkWidget (); - int /*long*/ gc = hDC; + long /*int*/ gc = hDC; if (OS.USE_CAIRO) { Cairo.cairo_destroy (gc); } else { @@ -3416,7 +3416,7 @@ boolean mnemonicMatch (char key) { 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); } @@ -3492,7 +3492,7 @@ void redrawChildren () { 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]; @@ -3546,7 +3546,7 @@ void releaseWidget () { 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); @@ -3571,7 +3571,7 @@ void releaseWidget () { 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 { @@ -3584,8 +3584,8 @@ void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) { * 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 (); @@ -3639,7 +3639,7 @@ void sendFocusEvent (int type) { } } -boolean sendHelpEvent (int /*long*/ helpType) { +boolean sendHelpEvent (long /*int*/ helpType) { Control control = this; while (control != null) { if (control.hooks (SWT.Help)) { @@ -3670,7 +3670,7 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen 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]; @@ -3726,7 +3726,7 @@ public void setBackground (Color color) { } 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 (); @@ -3743,10 +3743,10 @@ public void setBackground (Color color) { } } -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; @@ -3814,7 +3814,7 @@ public void setBackgroundImage (Image image) { } void setBackgroundPixmap (Image image) { - int /*long*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (paintHandle ()); if (window != 0) { if (image.pixmap != 0) { OS.gdk_window_set_back_pixmap (window, image.pixmap, false); @@ -3826,11 +3826,11 @@ void setBackgroundPixmap (Image image) { * * For now draw background in windowProc(). */ -// int /*long*/ surface = image.surface; +// long /*int*/ surface = image.surface; // int type = Cairo.cairo_surface_get_type(surface); // switch (type) { // case Cairo.CAIRO_SURFACE_TYPE_XLIB: -// int /*long*/ pixmap = OS.gdk_pixmap_foreign_new(Cairo.cairo_xlib_surface_get_drawable(surface)); +// long /*int*/ pixmap = OS.gdk_pixmap_foreign_new(Cairo.cairo_xlib_surface_get_drawable(surface)); // OS.gdk_window_set_back_pixmap (window, pixmap, false); // OS.g_object_unref(pixmap); // break; @@ -3889,14 +3889,14 @@ public void setCursor (Cursor cursor) { 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); OS.XFlush (xDisplay); } } @@ -3964,9 +3964,9 @@ public void setEnabled (boolean enabled) { } } 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); @@ -4028,7 +4028,7 @@ public void setFont (Font font) { checkWidget(); if (((state & FONT) == 0) && font == null) return; this.font = font; - int /*long*/ fontDesc; + long /*int*/ fontDesc; if (font == null) { fontDesc = defaultFont ().handle; } else { @@ -4043,7 +4043,7 @@ public void setFont (Font font) { setFontDescription (fontDesc); } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { OS.gtk_widget_modify_font (handle, font); } @@ -4074,7 +4074,7 @@ public void setForeground (Color color) { } 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 (); @@ -4102,7 +4102,7 @@ void setInitialBounds () { * 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 { @@ -4211,7 +4211,7 @@ public boolean setParent (Composite parent) { 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); int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (topHandle); @@ -4231,7 +4231,7 @@ public boolean setParent (Composite parent) { 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); /* @@ -4262,7 +4262,7 @@ void setParentBackground () { if (fixedHandle != 0) setBackgroundColor (fixedHandle, null); } -void setParentWindow (int /*long*/ widget) { +void setParentWindow (long /*int*/ widget) { } boolean setRadioSelection (boolean value) { @@ -4297,7 +4297,7 @@ public void setRedraw (boolean redraw) { 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); @@ -4308,7 +4308,7 @@ public void setRedraw (boolean redraw) { } 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; @@ -4423,7 +4423,7 @@ public void setTouchEnabled(boolean enabled) { 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 @@ -4504,11 +4504,11 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi } } - 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; @@ -4516,7 +4516,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi 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); @@ -4527,7 +4527,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi 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); @@ -4615,8 +4615,8 @@ boolean showMenu (int x, int y, int detail) { 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); @@ -5058,7 +5058,7 @@ void update (boolean all, boolean flush) { // 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 (); @@ -5076,7 +5076,7 @@ void updateLayout (boolean all) { /* 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 ((state & OBSCURED) != 0) break; @@ -5085,8 +5085,8 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us 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; drawBackground(control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height); } @@ -5096,10 +5096,10 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us 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 --git a/org/eclipse/swt/widgets/DateTime.java b/org/eclipse/swt/widgets/DateTime.java index 6497d40..00c150a 100644 --- a/org/eclipse/swt/widgets/DateTime.java +++ b/org/eclipse/swt/widgets/DateTime.java @@ -435,7 +435,7 @@ void dropDownCalendar(boolean drop) { display.addFilter(SWT.MouseDown, clickListener); } -int /*long*/ focusHandle () { +long /*int*/ focusHandle () { if (text != null) return text.handle; return super.focusHandle (); } @@ -687,17 +687,17 @@ public int getYear () { } } -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 --git a/org/eclipse/swt/widgets/Decorations.java b/org/eclipse/swt/widgets/Decorations.java index 70e1d66..aea02d3 100644 --- a/org/eclipse/swt/widgets/Decorations.java +++ b/org/eclipse/swt/widgets/Decorations.java @@ -103,7 +103,7 @@ public class Decorations extends Canvas { Menu [] menus; Control savedFocus; Button defaultButton, saveDefault; - int /*long*/ accelGroup, vboxHandle; + long /*int*/ accelGroup, vboxHandle; Decorations () { /* Do nothing */ @@ -172,17 +172,17 @@ void _setImages (Image [] images) { 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 = ImageList.createPixbuf (image); + long /*int*/ pixbuf = ImageList.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]); @@ -233,7 +233,7 @@ void createAccelGroup () { accelGroup = OS.gtk_accel_group_new (); if (accelGroup == 0) 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); } @@ -244,7 +244,7 @@ void createWidget (int index) { 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); @@ -547,7 +547,7 @@ boolean restoreFocus () { */ 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); @@ -766,7 +766,7 @@ boolean traverseReturn () { * 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 --git a/org/eclipse/swt/widgets/DirectoryDialog.java b/org/eclipse/swt/widgets/DirectoryDialog.java index cd40603..9c62fb7 100644 --- a/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/org/eclipse/swt/widgets/DirectoryDialog.java @@ -119,9 +119,9 @@ public String open () { } 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 { @@ -129,11 +129,11 @@ String openChooserDialog () { } 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); @@ -151,7 +151,7 @@ String openChooserDialog () { * 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); @@ -159,9 +159,9 @@ String openChooserDialog () { } 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); @@ -177,7 +177,7 @@ String openChooserDialog () { 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); @@ -197,14 +197,14 @@ String openChooserDialog () { 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); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path); if (path != utf8Ptr) 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]; diff --git a/org/eclipse/swt/widgets/Display.java b/org/eclipse/swt/widgets/Display.java index 3f8300e..3108218 100644 --- a/org/eclipse/swt/widgets/Display.java +++ b/org/eclipse/swt/widgets/Display.java @@ -99,30 +99,30 @@ public class Display extends Device { /* 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; @@ -153,7 +153,7 @@ public class Display extends Device { /* Input method resources */ Control imControl; - int /*long*/ preeditWindow, preeditLabel; + long /*int*/ preeditWindow, preeditLabel; /* Sync/Async Widget Communication */ Synchronizer synchronizer = new Synchronizer (this); @@ -174,40 +174,40 @@ public class Display extends Device { 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$ @@ -216,27 +216,27 @@ public class Display extends Device { boolean idleNeeded; /* GtkTreeView callbacks */ - 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; @@ -248,14 +248,14 @@ public class Display extends Device { 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; @@ -286,7 +286,7 @@ public class Display extends Device { int lastEventTime, lastUserEventTime; /* Pango layout constructor */ - int /*long*/ pangoLayoutNewProc; + long /*int*/ pangoLayoutNewProc; /* Custom Resize */ double resizeLocationX, resizeLocationY; @@ -294,16 +294,16 @@ public class Display extends Device { 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 = { @@ -551,16 +551,16 @@ void addLayoutDeferred (Composite comp) { 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]; @@ -568,7 +568,7 @@ void addGdkEvent (int /*long*/ event) { 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); @@ -619,7 +619,7 @@ public void addListener (int eventType, Listener listener) { 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); @@ -627,7 +627,7 @@ int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) { return 0; } -void addMouseHoverTimeout (int /*long*/ handle) { +void addMouseHoverTimeout (long /*int*/ handle) { if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId); mouseHoverId = OS.g_timeout_add (400, mouseHoverProc, handle); mouseHoverHandle = handle; @@ -661,7 +661,7 @@ void addSkinnableWidget (Widget widget) { 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; @@ -734,12 +734,12 @@ public void beep () { if (!OS.GDK_WINDOWING_X11 ()) { OS.gdk_flush (); } else { - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); 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); @@ -762,7 +762,7 @@ static void checkDisplay (Thread thread, boolean multiple) { } } -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: @@ -778,7 +778,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /* default: return 0; } - int /*long*/ window = 0; + long /*int*/ window = 0; if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) { window = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent)); } else { @@ -787,7 +787,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /* 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); @@ -812,7 +812,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /* 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; @@ -910,11 +910,11 @@ void createDisplay (DeviceData data) { if (OS.GTK_VERSION < OS.VERSION(2, 24, 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); - 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]; @@ -1012,9 +1012,9 @@ void createDisplay (DeviceData data) { 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 (xDisplay, atomName, false); + long /*int*/ atom = OS.XInternAtom (xDisplay, atomName, false); OS.XSetSelectionOwner (xDisplay, atom, xWindow, OS.CurrentTime); OS.XGetSelectionOwner (xDisplay, atom); } @@ -1027,9 +1027,9 @@ void createDisplay (DeviceData data) { } 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; @@ -1037,7 +1037,7 @@ Image createImage (String name) { 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); @@ -1089,7 +1089,7 @@ protected void destroy () { void destroyDisplay () { } -int /*long*/ emissionProc (int /*long*/ ihint, int /*long*/ n_param_values, int /*long*/ param_values, int /*long*/ data) { +long /*int*/ emissionProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) { if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) { OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL); } @@ -1158,7 +1158,7 @@ void error (int code) { SWT.error (code); } -int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) { +long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) { /* * Use gdk_event_get_time() rather than event.time or * gtk_get_current_event_time(). If the event does not @@ -1215,7 +1215,7 @@ int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) { * * @noreference This method is not intended to be referenced by clients. */ -public Widget findWidget (int /*long*/ handle) { +public Widget findWidget (long /*int*/ handle) { checkDevice (); return getWidget (handle); } @@ -1244,7 +1244,7 @@ public Widget findWidget (int /*long*/ handle) { * * @since 3.1 */ -public Widget findWidget (int /*long*/ handle, int /*long*/ id) { +public Widget findWidget (long /*int*/ handle, long /*int*/ id) { checkDevice (); return null; } @@ -1266,12 +1266,12 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) { * * @since 3.3 */ -public Widget findWidget (Widget widget, int /*long*/ id) { +public Widget findWidget (Widget widget, long /*int*/ id) { checkDevice (); return null; } -static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class_data) { +static long /*int*/ fixedClassInitProc (long /*int*/ g_class, long /*int*/ class_data) { GtkWidgetClass klass = new GtkWidgetClass (); OS.memmove (klass, g_class); klass.map = fixedMapProc; @@ -1281,21 +1281,21 @@ static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class return 0; } -static int /*long*/ fixedMapProc (int /*long*/ handle) { +static long /*int*/ fixedMapProc (long /*int*/ handle) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.fixedMapProc (handle); return 0; } -static int /*long*/ fixedSizeAllocateProc (int /*long*/ handle, int /*long*/ allocation) { +static long /*int*/ fixedSizeAllocateProc (long /*int*/ handle, long /*int*/ allocation) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.fixedSizeAllocateProc (handle, allocation); return OS.Call (oldFixedSizeAllocateProc, handle, allocation); } -static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ class_data) { +static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ class_data) { GtkCellRendererClass klass = new GtkCellRendererClass (); OS.memmove (klass, g_class); klass.render = rendererRenderProc; @@ -1304,28 +1304,28 @@ static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ cl return 0; } -static int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ handle, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) { +static long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.rendererGetSizeProc (cell, handle, cell_area, x_offset, y_offset, width, height); return 0; } -static int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ handle, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) { +static long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { Display display = getCurrent (); Widget widget = display.getWidget (handle); if (widget != null) return widget.rendererRenderProc (cell, window, handle, background_area, cell_area, expose_area, flags); return 0; } -void flushExposes (int /*long*/ window, boolean all) { +void flushExposes (long /*int*/ window, boolean all) { OS.gdk_flush (); OS.gdk_flush (); if (OS.GDK_WINDOWING_X11 ()) { this.flushWindow = window; this.flushAll = all; - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ xEvent = OS.g_malloc (XEvent.sizeof); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xEvent = OS.g_malloc (XEvent.sizeof); OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0); OS.g_free (xEvent); this.flushWindow = 0; @@ -1378,7 +1378,7 @@ public static Display getCurrent () { int getCaretBlinkTime () { // checkDevice (); - int /*long*/ settings = OS.gtk_settings_get_default (); + long /*int*/ settings = OS.gtk_settings_get_default (); if (settings == 0) return 500; int [] buffer = new int [1]; OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0); @@ -1408,9 +1408,9 @@ int getCaretBlinkTime () { public Control getCursorControl () { checkDevice(); int[] x = new int[1], y = new int[1]; - int /*long*/ handle = 0; - int /*long*/ [] user_data = new int /*long*/ [1]; - int /*long*/ window = OS.gdk_window_at_pointer (x,y); + long /*int*/ handle = 0; + long /*int*/ [] user_data = new long /*int*/ [1]; + long /*int*/ window = OS.gdk_window_at_pointer (x,y); if (window != 0) { OS.gdk_window_get_user_data (window, user_data); handle = user_data [0]; @@ -1423,8 +1423,8 @@ public Control getCursorControl () { if (!OS.GDK_WINDOWING_X11 ()) return null; OS.gdk_error_trap_push (); int[] unusedInt = new int[1]; - int /*long*/[] unusedPtr = new int /*long*/[1], buffer = new int /*long*/[1]; - int /*long*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay); + long /*int*/[] unusedPtr = new long /*int*/[1], buffer = new long /*int*/[1]; + long /*int*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay); do { if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) { handle = 0; @@ -1432,7 +1432,7 @@ public Control getCursorControl () { } if ((xWindow = buffer [0]) != 0) { xParent = xWindow; - int /*long*/ gdkWindow = 0; + long /*int*/ gdkWindow = 0; if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) { gdkWindow = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), xWindow); } else { @@ -1457,15 +1457,15 @@ public Control getCursorControl () { return null; } -static GtkBorder getEntryInnerBorder (int /*long*/ handle) { +static GtkBorder getEntryInnerBorder (long /*int*/ handle) { GtkBorder gtkBorder = new GtkBorder(); if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { - int /*long*/ border = OS.gtk_entry_get_inner_border (handle); + long /*int*/ border = OS.gtk_entry_get_inner_border (handle); if (border != 0) { OS.memmove (gtkBorder, border, GtkBorder.sizeof); return gtkBorder; } - int /*long*/ [] borderPtr = new int /*long*/ [1]; + long /*int*/ [] borderPtr = new long /*int*/ [1]; OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0); if (borderPtr[0] != 0) { OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof); @@ -1490,7 +1490,7 @@ boolean filters (int eventType) { 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); @@ -1606,19 +1606,19 @@ public Object getData () { 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; } @@ -1680,7 +1680,7 @@ public int getDismissalAlignment () { 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; @@ -1700,7 +1700,7 @@ public int getDismissalAlignment () { */ 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]; @@ -1725,8 +1725,8 @@ public Control getFocusControl () { 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); @@ -1823,12 +1823,12 @@ Dialog getModalDialog () { */ 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_get_default_root_window(), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) { return null; } @@ -1859,7 +1859,7 @@ public Monitor [] getMonitors () { 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) { @@ -2179,12 +2179,12 @@ void initializeSystemColors () { 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) 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; @@ -2194,7 +2194,7 @@ void initializeSystemColors () { 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; @@ -2281,8 +2281,8 @@ void initializeSystemColors () { 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); } @@ -2355,10 +2355,10 @@ public boolean getTouchEnabled() { 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]; @@ -2366,7 +2366,7 @@ Widget getWidget (int /*long*/ handle) { return null; } -int /*long*/ idleProc (int /*long*/ data) { +long /*int*/ idleProc (long /*int*/ data) { boolean result = runAsyncMessages (false); if (!result) { synchronized (idleLock) { @@ -2396,7 +2396,7 @@ protected void init () { } 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 */ @@ -2601,8 +2601,8 @@ void initializeCallbacks () { } void initializeSubclasses () { - 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); @@ -2620,10 +2620,10 @@ void initializeSystemSettings () { * 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; } @@ -2638,9 +2638,9 @@ void initializeWidgetTable () { void initializeWindowManager () { /* Get the window manager name */ windowManager = ""; //$NON-NLS-1$ - 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) { @@ -2667,8 +2667,8 @@ void initializeWindowManager () { * * @noreference This method is not intended to be referenced by clients. */ -public void internal_dispose_GC (int /*long*/ hDC, GCData data) { - int /*long*/ gc = hDC; +public void internal_dispose_GC (long /*int*/ hDC, GCData data) { + long /*int*/ gc = hDC; if (OS.USE_CAIRO) { Cairo.cairo_destroy (gc); } else { @@ -2698,10 +2698,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) { * * @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()) error(SWT.ERROR_DEVICE_DISPOSED); - int /*long*/ root = OS.gdk_get_default_root_window(); - int /*long*/ gc; + long /*int*/ root = OS.gdk_get_default_root_window(); + long /*int*/ gc; if (OS.USE_CAIRO) { gc = OS.gdk_cairo_create (root); if (gc == 0) error (SWT.ERROR_NO_HANDLES); @@ -2814,7 +2814,7 @@ public Point map (Control from, Control to, int x, int y) { 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; @@ -2822,7 +2822,7 @@ public Point map (Control from, Control to, int x, int y) { 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]; @@ -2891,7 +2891,7 @@ static char mbcsToWcs (char ch) { 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); @@ -2943,7 +2943,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei 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; @@ -2951,7 +2951,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei 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]; @@ -2962,7 +2962,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei 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); @@ -3042,13 +3042,13 @@ public boolean post (Event event) { 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); 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; @@ -3130,7 +3130,7 @@ void postEvent (Event event) { 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); @@ -3390,8 +3390,8 @@ void releaseDisplay () { signalProc = 0; /* Dispose subclass */ - 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; @@ -3450,9 +3450,9 @@ public void removeFilter (int eventType, Listener listener) { 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); @@ -3501,7 +3501,7 @@ public void removeListener (int eventType, Listener listener) { eventTable.unhook (eventType, listener); } -void removeMouseHoverTimeout (int /*long*/ handle) { +void removeMouseHoverTimeout (long /*int*/ handle) { if (handle != mouseHoverHandle) return; if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId); mouseHoverId = 0; @@ -3518,7 +3518,7 @@ void removePopup (Menu menu) { } } -Widget removeWidget (int /*long*/ handle) { +Widget removeWidget (long /*int*/ handle) { if (handle == 0) return null; lastWidget = null; Widget widget = null; @@ -3722,8 +3722,8 @@ public static void setAppVersion (String version) { public void setCursorLocation (int x, int y) { checkDevice (); if (OS.GDK_WINDOWING_X11 ()) { - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - int /*long*/ xWindow = OS.XDefaultRootWindow (xDisplay); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xWindow = OS.XDefaultRootWindow (xDisplay); OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y); } } @@ -3791,7 +3791,7 @@ public void setData (String key, Object value) { } 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); @@ -3880,10 +3880,10 @@ public void setData (Object data) { 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); @@ -3958,9 +3958,9 @@ void showIMWindow (Control control) { 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 (); @@ -4014,7 +4014,7 @@ public boolean sleep () { 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)) { @@ -4025,7 +4025,7 @@ public boolean sleep () { 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) { /* @@ -4119,7 +4119,7 @@ public void timerExec (int milliseconds, Runnable runnable) { } } -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) { @@ -4131,7 +4131,7 @@ int /*long*/ timerProc (int /*long*/ i) { return 0; } -int /*long*/ caretProc (int /*long*/ clientData) { +long /*int*/ caretProc (long /*int*/ clientData) { caretId = 0; if (currentCaret == null) { return 0; @@ -4146,13 +4146,13 @@ int /*long*/ caretProc (int /*long*/ clientData) { 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); @@ -4210,13 +4210,13 @@ void setCurrentCaret (Caret caret) { caretId = OS.g_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; @@ -4226,14 +4226,14 @@ int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ u 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_x11_display_get_xdisplay(OS.gdk_display_get_default()), xWindow, atom, 0, -1, true, OS.AnyPropertyType, type, format, nitems, bytes_after, data); @@ -4365,31 +4365,31 @@ static char wcsToMbcs (char ch) { 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 --git a/org/eclipse/swt/widgets/ExpandBar.java b/org/eclipse/swt/widgets/ExpandBar.java index cd9e405..8a99483 100644 --- a/org/eclipse/swt/widgets/ExpandBar.java +++ b/org/eclipse/swt/widgets/ExpandBar.java @@ -138,7 +138,7 @@ void createHandle (int index) { 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); @@ -178,11 +178,11 @@ void destroyItem (ExpandItem item) { layoutItems (index, true); } -int /*long*/ eventHandle () { +long /*int*/ eventHandle () { return fixedHandle; } -boolean forceFocus (int /*long*/ focusHandle) { +boolean forceFocus (long /*int*/ focusHandle) { if (lastFocus != null && lastFocus.setFocus ()) return true; for (int i = 0; i < itemCount; i++) { ExpandItem item = items [i]; @@ -288,9 +288,9 @@ public int getSpacing () { return spacing; } -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; - 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) { @@ -349,13 +349,13 @@ void layoutItems (int index, boolean setScrollbar) { } } -int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { - int /*long*/ result = super.gtk_size_allocate (widget, allocation); +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 fixedHandle; } @@ -404,7 +404,7 @@ void reskinChildren (int flags) { super.reskinChildren (flags); } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { super.setFontDescription (font); for (int i = 0; i < itemCount; i++) { items[i].setFontDescription (font); @@ -435,7 +435,7 @@ void setScrollbar () { 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; @@ -455,7 +455,7 @@ void setScrollbar () { 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 --git a/org/eclipse/swt/widgets/ExpandItem.java b/org/eclipse/swt/widgets/ExpandItem.java index 5bd8366..5497665 100644 --- a/org/eclipse/swt/widgets/ExpandItem.java +++ b/org/eclipse/swt/widgets/ExpandItem.java @@ -39,7 +39,7 @@ public class ExpandItem extends Item { 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; @@ -309,7 +309,7 @@ int getPreferredWidth (GC gc) { 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; @@ -317,23 +317,23 @@ int /*long*/ gtk_activate (int /*long*/ widget) { 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; } @@ -490,7 +490,7 @@ boolean setFocus () { 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); @@ -529,7 +529,7 @@ public void setImage (Image image) { 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); @@ -564,7 +564,7 @@ void showWidget (int index) { if (labelHandle != 0) OS.gtk_widget_show (labelHandle); } -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 --git a/org/eclipse/swt/widgets/FileDialog.java b/org/eclipse/swt/widgets/FileDialog.java index b57f25a..23ba263 100644 --- a/org/eclipse/swt/widgets/FileDialog.java +++ b/org/eclipse/swt/widgets/FileDialog.java @@ -45,7 +45,7 @@ public class FileDialog extends Dialog { 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 @@ String computeResultChooserDialog () { /* 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 @@ String computeResultChooserDialog () { } 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 { @@ -123,8 +123,8 @@ String computeResultChooserDialog () { } if (name != utf8Ptr) 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]; @@ -144,11 +144,11 @@ String computeResultChooserDialog () { } 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); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path); @@ -156,8 +156,8 @@ String computeResultChooserDialog () { } } 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]; @@ -171,9 +171,9 @@ String computeResultChooserDialog () { } } 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]; @@ -317,7 +317,7 @@ String openChooserDialog () { 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); @@ -327,10 +327,10 @@ String openChooserDialog () { 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); @@ -347,7 +347,7 @@ String openChooserDialog () { 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); @@ -394,7 +394,7 @@ void presetChooserDialog () { * 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); } @@ -425,7 +425,7 @@ void presetChooserDialog () { * 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); @@ -447,10 +447,10 @@ void presetChooserDialog () { /* 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); diff --git a/org/eclipse/swt/widgets/FontDialog.java b/org/eclipse/swt/widgets/FontDialog.java index 81e2e1d..905110d 100644 --- a/org/eclipse/swt/widgets/FontDialog.java +++ b/org/eclipse/swt/widgets/FontDialog.java @@ -151,28 +151,28 @@ public RGB getRGB () { * */ 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); @@ -187,7 +187,7 @@ public FontData open () { 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); @@ -208,12 +208,12 @@ public FontData open () { } 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 --git a/org/eclipse/swt/widgets/Group.java b/org/eclipse/swt/widgets/Group.java index 40e6c20..29857a3 100644 --- a/org/eclipse/swt/widgets/Group.java +++ b/org/eclipse/swt/widgets/Group.java @@ -41,7 +41,7 @@ import org.eclipse.swt.graphics.*; * @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 @@ protected void checkSubclass () { if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); } -int /*long*/ clientHandle () { +long /*int*/ clientHandle () { return clientHandle; } @@ -157,7 +157,7 @@ void enableWidget (boolean enabled) { OS.gtk_widget_set_sensitive (labelHandle, enabled); } -int /*long*/ eventHandle () { +long /*int*/ eventHandle () { return fixedHandle; } @@ -201,7 +201,7 @@ boolean mnemonicMatch (char key) { return mnemonicMatch (labelHandle, key); } -int /*long*/ parentingHandle() { +long /*int*/ parentingHandle() { return fixedHandle; } @@ -227,7 +227,7 @@ void setBackgroundColor (GdkColor color) { setBackgroundColor(fixedHandle, color); } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { super.setFontDescription (font); OS.gtk_widget_modify_font (labelHandle, font); } diff --git a/org/eclipse/swt/widgets/IME.java b/org/eclipse/swt/widgets/IME.java index 4a4e2c0..11e85a9 100644 --- a/org/eclipse/swt/widgets/IME.java +++ b/org/eclipse/swt/widgets/IME.java @@ -242,14 +242,14 @@ public boolean getWideCaret () { return false; } -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 (!isInlineEnabled ()) return 0; - int /*long*/ imHandle = imHandle (); + long /*int*/ imHandle = imHandle (); if (imHandle != 0) OS.gtk_im_context_reset (imHandle); return 0; } -int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) { +long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ textPtr) { if (!isInlineEnabled ()) return 0; boolean doit = true; ranges = null; @@ -278,14 +278,14 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) { return doit ? 0 : 1; } -int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { +long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { if (!isInlineEnabled ()) return 0; ranges = null; styles = null; commitCount = 0; - int /*long*/ imHandle = imHandle (); - int /*long*/ [] preeditString = new int /*long*/ [1]; - int /*long*/ [] pangoAttrs = new int /*long*/ [1]; + long /*int*/ imHandle = imHandle (); + long /*int*/ [] preeditString = new long /*int*/ [1]; + long /*int*/ [] pangoAttrs = new long /*int*/ [1]; int [] cursorPos = new int [1]; OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos); caretOffset = cursorPos [0]; @@ -297,7 +297,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { chars = Converter.mbcsToWcs (null, buffer); if (pangoAttrs [0] != 0) { int count = 0; - int /*long*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]); + long /*int*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]); while (OS.pango_attr_iterator_next (iterator)) count++; OS.pango_attr_iterator_destroy (iterator); ranges = new int [count * 2]; @@ -312,7 +312,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { ranges [i * 2] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + start [0]); ranges [i * 2 + 1] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1; styles [i] = new TextStyle (null, null, null); - int /*long*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND); + long /*int*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND); if (attr != 0) { OS.memmove (attrColor, attr, PangoAttrColor.sizeof); GdkColor color = new GdkColor (); @@ -395,7 +395,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { return 1; } -int /*long*/ imHandle () { +long /*int*/ imHandle () { return parent.imHandle (); } diff --git a/org/eclipse/swt/widgets/Label.java b/org/eclipse/swt/widgets/Label.java index 3bceccd..ce3c51d 100644 --- a/org/eclipse/swt/widgets/Label.java +++ b/org/eclipse/swt/widgets/Label.java @@ -50,7 +50,7 @@ import org.eclipse.swt.graphics.*; * @noextend This class is not intended to be subclassed by clients. */ public class Label extends Control { - int /*long*/ frameHandle, labelHandle, imageHandle; + long /*int*/ frameHandle, labelHandle, imageHandle; ImageList imageList; Image image; String text; @@ -132,7 +132,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0; if (fixWrap || frameHandle != 0) forceResize (); if (fixWrap) { - int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle); + long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle); int pangoWidth = OS.pango_layout_get_width (labelLayout); if (wHint != SWT.DEFAULT) { OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE); @@ -176,11 +176,11 @@ public Point computeSize (int wHint, int hHint, boolean changed) { * muliple lines of text. */ if (hHint == SWT.DEFAULT && labelHandle != 0) { - int /*long*/ layout = OS.gtk_label_get_layout (labelHandle); - int /*long*/ context = OS.pango_layout_get_context (layout); - int /*long*/ lang = OS.pango_context_get_language (context); - int /*long*/ font = getFontDescription (); - int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang); + long /*int*/ layout = OS.gtk_label_get_layout (labelHandle); + long /*int*/ context = OS.pango_layout_get_context (layout); + long /*int*/ lang = OS.pango_context_get_language (context); + long /*int*/ font = getFontDescription (); + long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang); 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); @@ -189,7 +189,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { OS.g_object_get (labelHandle, OS.ypad, buffer, 0); fontHeight += 2 * buffer [0]; if (frameHandle != 0) { - int /*long*/ style = OS.gtk_widget_get_style (frameHandle); + long /*int*/ style = OS.gtk_widget_get_style (frameHandle); fontHeight += 2 * OS.gtk_style_get_ythickness (style); fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle); } @@ -251,7 +251,7 @@ void deregister () { if (imageHandle != 0) display.removeWidget (imageHandle); } -int /*long*/ eventHandle () { +long /*int*/ eventHandle () { return fixedHandle; } @@ -484,7 +484,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize 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); @@ -529,7 +529,7 @@ public void setImage (Image image) { if (image != null) { 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); OS.gtk_widget_hide (labelHandle); OS.gtk_widget_show (imageHandle); diff --git a/org/eclipse/swt/widgets/Link.java b/org/eclipse/swt/widgets/Link.java index 8fee01a..87947c3 100644 --- a/org/eclipse/swt/widgets/Link.java +++ b/org/eclipse/swt/widgets/Link.java @@ -281,8 +281,8 @@ public String getText () { 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; GdkEventButton gdkEvent = new GdkEventButton (); OS.memmove (gdkEvent, event, GdkEventButton.sizeof); @@ -320,8 +320,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { return result; } -int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { - int /*long*/ result = super.gtk_button_release_event (widget, event); +long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) { + long /*int*/ result = super.gtk_button_release_event (widget, event); if (result != 0) return result; if (focusIndex == -1) return result; GdkEventButton gdkEvent = new GdkEventButton (); @@ -344,8 +344,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) return result; } -int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { - int /*long*/ result = super.gtk_event_after (widget, gdkEvent); +long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { + long /*int*/ result = super.gtk_event_after (widget, gdkEvent); GdkEvent event = new GdkEvent (); OS.memmove (event, gdkEvent, GdkEvent.sizeof); switch (event.type) { @@ -356,7 +356,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { 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; GdkEventExpose gdkEvent = new GdkEventExpose (); OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof); @@ -396,8 +396,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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; if (focusIndex == -1) return result; GdkEventKey gdkEvent = new GdkEventKey (); @@ -426,8 +426,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { return result; } -int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { - int /*long*/ result = super.gtk_motion_notify_event (widget, event); +long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { + long /*int*/ result = super.gtk_motion_notify_event (widget, event); if (result != 0) return result; GdkEventMotion gdkEvent = new GdkEventMotion (); OS.memmove (gdkEvent, event, GdkEventMotion.sizeof); @@ -692,7 +692,7 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize) return result; } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { super.setFontDescription (font); layout.setFont (Font.gtk_new (display, font)); } diff --git a/org/eclipse/swt/widgets/List.java b/org/eclipse/swt/widgets/List.java index 99b7654..683626f 100644 --- a/org/eclipse/swt/widgets/List.java +++ b/org/eclipse/swt/widgets/List.java @@ -40,7 +40,7 @@ import org.eclipse.swt.events.*; * @noextend This class is not intended to be subclassed by clients. */ public class List extends Scrollable { - int /*long*/ modelHandle; + long /*int*/ modelHandle; static final int TEXT_COLUMN = 0; @@ -96,7 +96,7 @@ public void add (String string) { checkWidget(); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); byte [] buffer = Converter.wcsToMbcs (null, string, true); - int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED); OS.gtk_list_store_append (modelHandle, iter); OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1); @@ -134,7 +134,7 @@ public void add (String string, int index) { error (SWT.ERROR_INVALID_RANGE); } byte [] buffer = Converter.wcsToMbcs (null, string, true); - int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); + long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ()); if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED); /* * Feature in GTK. It is much faster to append to a list store @@ -196,14 +196,14 @@ void createHandle (int index) { * Columns: * 0 - text */ - int /*long*/ [] types = new int /*long*/ [] {OS.G_TYPE_STRING ()}; + long /*int*/ [] types = new long /*int*/ [] {OS.G_TYPE_STRING ()}; 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); if (handle == 0) error (SWT.ERROR_NO_HANDLES); - int /*long*/ textRenderer = OS.gtk_cell_renderer_text_new (); + long /*int*/ textRenderer = OS.gtk_cell_renderer_text_new (); if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES); - 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); OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true); OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN); @@ -213,7 +213,7 @@ void createHandle (int index) { 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; @@ -279,8 +279,8 @@ void deregister() { public void deselect (int index) { checkWidget(); if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return; - 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); OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); OS.gtk_tree_selection_unselect_iter (selection, iter); @@ -310,8 +310,8 @@ public void deselect (int start, int end) { if (start >= count && end >= count) return; start = Math.min (count - 1, Math.max (0, start)); end = Math.min (count - 1, Math.max (0, end)); - 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); @@ -341,9 +341,9 @@ public void deselect (int start, int end) { 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); @@ -998,8 +998,8 @@ public void remove (int [] indices) { 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); } @@ -1156,9 +1156,9 @@ public void select (int [] indices) { if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); int length = indices.length; if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return; - 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 _setVisible (boolean visible) { } } -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 @@ void createHandle (int index) { 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 createHandle (int index) { } } -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 @@ void createIMMenu (int /*long*/ imHandle) { 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 @@ void fixMenus (Decorations newParent) { 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 boolean getEnabled () { */ 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 MenuItem getItem (int index) { */ 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 int getItemCount () { */ 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 @@ public MenuItem [] getItems () { 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 @@ public int open () { handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer); if (handle == 0) 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 @@ public int open () { * 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 @@ public int open () { 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 --git a/org/eclipse/swt/widgets/Monitor.java b/org/eclipse/swt/widgets/Monitor.java index f22948a..1ea2c09 100644 --- a/org/eclipse/swt/widgets/Monitor.java +++ b/org/eclipse/swt/widgets/Monitor.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.*; * @since 3.0 */ public final class Monitor { - int /*long*/ handle; + long /*int*/ handle; int x, y, width, height; int clientX, clientY, clientWidth, clientHeight; diff --git a/org/eclipse/swt/widgets/ProgressBar.java b/org/eclipse/swt/widgets/ProgressBar.java index ad416a4..d550a17 100644 --- a/org/eclipse/swt/widgets/ProgressBar.java +++ b/org/eclipse/swt/widgets/ProgressBar.java @@ -161,8 +161,8 @@ public int getState () { 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 @@ -275,7 +275,7 @@ public void setState (int state) { //NOT IMPLEMENTED } -int /*long*/ timerProc (int /*long*/ widget) { +long /*int*/ timerProc (long /*int*/ widget) { if (isVisible ()) OS.gtk_progress_bar_pulse (handle); return 1; } @@ -298,7 +298,7 @@ void updateBar (int selection, int minimum, int maximum) { * 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 --git a/org/eclipse/swt/widgets/Sash.java b/org/eclipse/swt/widgets/Sash.java index 34f8213..25a22a4 100644 --- a/org/eclipse/swt/widgets/Sash.java +++ b/org/eclipse/swt/widgets/Sash.java @@ -40,7 +40,7 @@ import org.eclipse.swt.events.*; 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; @@ -145,12 +145,12 @@ void createHandle (int index) { void drawBand (int x, int y, int width, int height) { if ((style & SWT.SMOOTH) != 0) return; //TODO: Use Cairo - 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); @@ -163,8 +163,8 @@ void drawBand (int x, int y, int width, int height) { 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); @@ -172,7 +172,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) 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]); @@ -210,8 +210,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) 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); @@ -240,8 +240,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPt 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) { @@ -251,8 +251,8 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -287,9 +287,9 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { 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. */ @@ -326,8 +326,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { 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 (); @@ -389,7 +389,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr 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); } @@ -430,7 +430,7 @@ public void removeSelectionListener(SelectionListener listener) { eventTable.unhook (SWT.DefaultSelection,listener); } -void setCursor (int /*long*/ cursor) { +void setCursor (long /*int*/ cursor) { super.setCursor (cursor != 0 ? cursor : defaultCursor); } diff --git a/org/eclipse/swt/widgets/Scale.java b/org/eclipse/swt/widgets/Scale.java index 55e9f89..bca61a0 100644 --- a/org/eclipse/swt/widgets/Scale.java +++ b/org/eclipse/swt/widgets/Scale.java @@ -126,7 +126,7 @@ void createHandle (int index) { 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 @@ void hookEvents () { */ 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 getIncrement () { */ 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 getMaximum () { */ 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 getMinimum () { */ 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 getPageIncrement () { */ 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 --git a/org/eclipse/swt/widgets/ScrollBar.java b/org/eclipse/swt/widgets/ScrollBar.java index 77cc837..65f44da 100644 --- a/org/eclipse/swt/widgets/ScrollBar.java +++ b/org/eclipse/swt/widgets/ScrollBar.java @@ -84,7 +84,7 @@ import org.eclipse.swt.events.*; */ public class ScrollBar extends Widget { Scrollable parent; - int /*long*/ adjustmentHandle; + long /*int*/ adjustmentHandle; int detail; boolean dragSent; @@ -355,7 +355,7 @@ public Rectangle getThumbBounds () { } 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 @@ public Rectangle getThumbTrackBounds () { } 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 Rectangle getThumbTrackBounds () { */ 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 @@ public boolean getVisible () { } } -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 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) { 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 --git a/org/eclipse/swt/widgets/Scrollable.java b/org/eclipse/swt/widgets/Scrollable.java index 6d20f58..b984889 100644 --- a/org/eclipse/swt/widgets/Scrollable.java +++ b/org/eclipse/swt/widgets/Scrollable.java @@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.*; * @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 @@ public Scrollable (Composite parent, int style) { super (parent, style); } -int /*long*/ clientHandle () { +long /*int*/ clientHandle () { return handle; } @@ -116,7 +116,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { 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 int getBorderWidth () { 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); @@ -258,8 +258,8 @@ public ScrollBar getVerticalBar () { 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 @@ -293,7 +293,7 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) { 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); @@ -346,9 +346,9 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole 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); @@ -396,7 +396,7 @@ void showWidget () { 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 (); @@ -408,7 +408,7 @@ void updateScrollBarValue (ScrollBar bar) { 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 --git a/org/eclipse/swt/widgets/Shell.java b/org/eclipse/swt/widgets/Shell.java index 7cb66e1..a8f36dd 100644 --- a/org/eclipse/swt/widgets/Shell.java +++ b/org/eclipse/swt/widgets/Shell.java @@ -118,7 +118,7 @@ import org.eclipse.swt.events.*; * @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 @@ public Shell (Display display, int style) { 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 @@ public Shell (Shell parent, int style) { 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 @@ public static Shell gtk_new (Display display, int /*long*/ handle) { * * @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 @@ void adjustTrim () { 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 @@ void bringToTop (boolean force) { 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 @@ void bringToTop (boolean force) { * 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 @@ void checkOpen () { if (!opened) resized = false; } -int /*long*/ childStyle () { +long /*int*/ childStyle () { return 0; } @@ -691,7 +691,7 @@ void createHandle (int index) { } 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); } @@ -711,7 +711,7 @@ void createHandle (int index) { 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(); @@ -808,7 +808,7 @@ void hookEvents () { 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; @@ -849,7 +849,7 @@ void releaseParent () { /* Do nothing */ } -int /*long*/ topHandle () { +long /*int*/ topHandle () { return shellHandle; } @@ -880,15 +880,15 @@ void fixShell (Shell newShell, Control control) { } } -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 () { @@ -1150,7 +1150,7 @@ public Shell [] getShells () { 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) { @@ -1174,7 +1174,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { 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]) { @@ -1187,25 +1187,25 @@ int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -1229,7 +1229,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { 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: @@ -1246,13 +1246,13 @@ int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) { 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; } @@ -1262,17 +1262,17 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) { 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 (); @@ -1331,8 +1331,8 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { } 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_unref (cursor); display.resizeMode = mode; @@ -1344,7 +1344,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { 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; @@ -1352,8 +1352,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { 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]; @@ -1376,7 +1376,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { 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) { @@ -1387,9 +1387,9 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { 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) { @@ -1415,7 +1415,7 @@ int /*long*/ gtk_realize (int /*long*/ widget) { 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; @@ -1683,13 +1683,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); OS.XFlush (xDisplay); } } @@ -1722,9 +1722,9 @@ public void setEnabled (boolean enabled) { 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; @@ -1739,7 +1739,7 @@ public void setEnabled (boolean enabled) { if (!OS.GDK_WINDOWING_X11 ()) { OS.gdk_flush (); } else { - int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); OS.XFlush (xDisplay); } } @@ -1813,7 +1813,7 @@ void setInitialBounds () { 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 ()); @@ -1848,13 +1848,13 @@ public void setMenuBar (Menu menu) { 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); @@ -2109,7 +2109,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations) { 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; @@ -2134,12 +2134,12 @@ void showWidget () { 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 (); @@ -2157,7 +2157,7 @@ int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*lon 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; } @@ -2204,7 +2204,7 @@ int trimWidth () { 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 (); @@ -2380,23 +2380,23 @@ void releaseWidget () { 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) { char [] chars = fixMnemonic (string, false); buffer = Converter.wcsToMbcs (null, chars, true); } - int /*long*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget); + long /*int*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget); boolean same = false; if (buffer == null && oldTooltip == 0) { same = true; @@ -2406,7 +2406,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str if (oldTooltip != 0) OS.g_free(oldTooltip); if (same) return; - int /*long*/ eventPtr = 0; + long /*int*/ eventPtr = 0; if (OS.GTK_VERSION < OS.VERSION (2, 18, 0)) { OS.gtk_widget_set_tooltip_text (rootWidget, null); /* @@ -2417,11 +2417,11 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str * 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which * contain the proper x and y coordinates. */ - int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget); + 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); @@ -2449,9 +2449,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str char [] chars = fixMnemonic (string, false); buffer = Converter.wcsToMbcs (null, chars, true); } - int /*long*/ tipData = OS.gtk_tooltips_data_get(tipWidget); + long /*int*/ tipData = OS.gtk_tooltips_data_get(tipWidget); if (tipData != 0) { - int /*long*/ oldTooltip = OS.GTK_TOOLTIPS_GET_TIP_TEXT(tipData); + long /*int*/ oldTooltip = OS.GTK_TOOLTIPS_GET_TIP_TEXT(tipData); if (string == null && oldTooltip == 0) { return; } else if (string != null && oldTooltip != 0) { @@ -2479,7 +2479,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str * where it's deprecated. */ 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; @@ -2495,9 +2495,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str 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]) { /* @@ -2511,7 +2511,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str 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 --git a/org/eclipse/swt/widgets/Slider.java b/org/eclipse/swt/widgets/Slider.java index 8b20f25..5b3b4f0 100644 --- a/org/eclipse/swt/widgets/Slider.java +++ b/org/eclipse/swt/widgets/Slider.java @@ -153,7 +153,7 @@ void createHandle (int index) { 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 @@ void createHandle (int index) { 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 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) { 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 hookEvents () { 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 Point computeSize (int wHint, int hHint, boolean changed) { */ 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 getIncrement () { */ 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 getMaximum () { */ 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 getMinimum () { */ 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 getPageIncrement () { */ 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 getSelection () { */ 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 setIncrement (int value) { */ 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 setMaximum (int value) { 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 setSelection (int value) { 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 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i if (increment < 1) return; if (pageIncrement < 1) return; thumb = Math.min (thumb, maximum - minimum); - 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 --git a/org/eclipse/swt/widgets/Spinner.java b/org/eclipse/swt/widgets/Spinner.java index d112820..0801e36 100644 --- a/org/eclipse/swt/widgets/Spinner.java +++ b/org/eclipse/swt/widgets/Spinner.java @@ -45,7 +45,7 @@ import org.eclipse.swt.events.*; 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 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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 Point computeSize (int wHint, int hHint, boolean changed) { 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 @@ public Rectangle computeTrim (int x, int y, int width, int height) { 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 @@ void createHandle (int index) { 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 @@ public void cut () { 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 @@ void fixIM () { * 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 @@ GdkColor getBackgroundColor () { 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 @@ GdkColor getForegroundColor () { */ 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 getIncrement () { */ 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 getMaximum () { */ 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 getMinimum () { */ 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 getPageIncrement () { */ 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 int getSelection () { */ 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 @@ public int getDigits () { } 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 @@ int /*long*/ gtk_changed (int /*long*/ widget) { * 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 @@ int /*long*/ gtk_changed (int /*long*/ widget) { 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 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) { 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 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int / 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 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /* 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 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /* 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 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { 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 @@ void hookEvents () { 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 @@ void hookEvents () { } } -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 @@ public void paste () { void register () { super.register (); - int /*long*/ imContext = imContext (); + long /*int*/ imContext = imContext (); if (imContext != 0) display.addWidget (imContext, this); } @@ -876,14 +876,14 @@ void setBackgroundColor (GdkColor color) { 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_unref (defaultCursor); } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { super.setFontDescription (font); } @@ -906,7 +906,7 @@ void setForegroundColor (GdkColor color) { 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; @@ -932,7 +932,7 @@ public void setIncrement (int value) { */ 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; @@ -959,7 +959,7 @@ public void setMaximum (int value) { */ 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; @@ -986,7 +986,7 @@ public void setMinimum (int value) { 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; @@ -1073,7 +1073,7 @@ public void setDigits (int value) { 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); @@ -1143,7 +1143,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int * 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); } @@ -1157,9 +1157,9 @@ boolean translateTraversal (GdkEventKey keyEvent) { 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]); @@ -1178,7 +1178,7 @@ String verifyText (String string, int start, int end) { 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); @@ -1199,7 +1199,7 @@ String verifyText (String string, int start, int end) { 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 --git a/org/eclipse/swt/widgets/TabFolder.java b/org/eclipse/swt/widgets/TabFolder.java index 3dc637f..cfad258 100644 --- a/org/eclipse/swt/widgets/TabFolder.java +++ b/org/eclipse/swt/widgets/TabFolder.java @@ -101,8 +101,8 @@ protected void checkSubclass () { 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); @@ -140,7 +140,7 @@ public void addSelectionListener(SelectionListener listener) { 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; @@ -165,7 +165,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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; @@ -202,7 +202,7 @@ void createWidget (int index) { } 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); @@ -214,15 +214,15 @@ void createItem (TabItem item, int index) { 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); @@ -284,7 +284,7 @@ void destroyItem (TabItem item) { } } -int /*long*/ eventHandle () { +long /*int*/ eventHandle () { return handle; } @@ -306,7 +306,7 @@ int /*long*/ eventHandle () { 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); @@ -335,7 +335,7 @@ public TabItem getItem (int index) { 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); @@ -359,7 +359,7 @@ public TabItem getItem(Point point) { */ 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); @@ -429,11 +429,11 @@ public int getSelectionIndex () { 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 (); @@ -478,7 +478,7 @@ void hookEvents () { 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); @@ -495,7 +495,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { 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); @@ -520,7 +520,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { boolean mnemonicHit (char key) { int itemCount = getItemCount (); for (int i=0; i= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { 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]; @@ -506,19 +506,19 @@ void createColumn (TableColumn column, int index) { 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]; int [] ptr1 = new int [1]; for (int i=0; i 0) { TableColumn checkColumn = columns [0]; @@ -601,7 +601,7 @@ void createHandle (int index) { 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); @@ -616,7 +616,7 @@ void createHandle (int index) { 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; @@ -658,11 +658,11 @@ void createItem (TableColumn column, int index) { } 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); @@ -671,7 +671,7 @@ void createItem (TableColumn column, int index) { 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; @@ -737,7 +737,7 @@ void createItem (TableItem item, int index) { 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); @@ -749,9 +749,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, 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) { @@ -849,7 +849,7 @@ public void deselect (int index) { 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); @@ -874,7 +874,7 @@ public void deselect (int index) { 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; @@ -905,7 +905,7 @@ public void deselect (int [] indices) { 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= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { @@ -1574,10 +1574,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) { if (list == 0) return 0; int count = OS.g_list_length (list); - int /*long*/ pixbufRenderer = 0; + long /*int*/ pixbufRenderer = 0; int i = 0; while (i < count) { - int /*long*/ renderer = OS.g_list_nth_data (list, i); + long /*int*/ renderer = OS.g_list_nth_data (list, i); if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) { pixbufRenderer = renderer; break; @@ -1606,15 +1606,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) { */ public TableItem [] getSelection () { checkWidget(); - int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); - int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null); + long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null); if (list != 0) { int count = OS.g_list_length (list); int [] treeSelection = new int [count]; int length = 0; for (int i=0; i= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { @@ -1778,10 +1778,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) { } if (list == 0) return 0; int count = OS.g_list_length (list); - int /*long*/ textRenderer = 0; + long /*int*/ textRenderer = 0; int i = 0; while (i < count) { - int /*long*/ renderer = OS.g_list_nth_data (list, i); + long /*int*/ renderer = OS.g_list_nth_data (list, i); if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) { textRenderer = renderer; break; @@ -1806,22 +1806,22 @@ int /*long*/ getTextRenderer (int /*long*/ column) { */ public int getTopIndex () { checkWidget(); - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; OS.gtk_widget_realize (handle); if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0; if (path [0] == 0) return 0; - int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]); + long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]); int[] index = new int [1]; if (indices != 0) OS.memmove (index, indices, 4); OS.gtk_tree_path_free (path [0]); return index [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) { GdkEventButton gdkEvent = new GdkEventButton (); OS.memmove (gdkEvent, event, GdkEventButton.sizeof); if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0; - int /*long*/ result = super.gtk_button_press_event (widget, event); + long /*int*/ result = super.gtk_button_press_event (widget, event); if (result != 0) return result; /* * Feature in GTK. In a multi-select table view, when multiple items are already @@ -1833,10 +1833,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { */ int button = gdkEvent.button; if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) { - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.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])) result = 1; OS.gtk_tree_path_free (path [0]); } @@ -1851,10 +1851,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { * widget from automatically selecting the first item. */ if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) { - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.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); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); OS.gtk_tree_view_set_cursor (handle, path [0], 0, false); OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -1874,13 +1874,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { return result; } -int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { - int /*long*/ window = OS.GDK_EVENT_WINDOW (event); +long /*int*/ gtk_button_release_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_button_release_event (widget, event); } -int /*long*/ gtk_changed (int /*long*/ widget) { +long /*int*/ gtk_changed (long /*int*/ widget) { TableItem item = getFocusItem (); if (item != null) { Event event = new Event (); @@ -1890,7 +1890,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) { return 0; } -int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { +long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { switch (OS.GDK_EVENT_TYPE (gdkEvent)) { case OS.GDK_EXPOSE: { /* @@ -1909,22 +1909,22 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { return super.gtk_event_after (widget, gdkEvent); } -int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { +long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) { if ((state & OBSCURED) != 0) return 0; if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) { Control control = findBackgroundControl (); if (control != null) { GdkEventExpose gdkEvent = new GdkEventExpose (); OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof); - int /*long*/ window = OS.gtk_tree_view_get_bin_window (handle); + long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle); if (window == gdkEvent.window) { int [] width = new int [1], height = new int [1]; OS.gdk_drawable_get_size (window, width, height); int bottom = 0; if (itemCount != 0) { - 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, 0, itemCount - 1); - int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); + long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter); GdkRectangle rect = new GdkRectangle (); OS.gtk_tree_view_get_cell_area (handle, path, 0, rect); bottom = rect.y + rect.height; @@ -1940,8 +1940,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { return super.gtk_expose_event (widget, eventPtr); } -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 @@ -1954,15 +1954,15 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) { return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : 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_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) { TableItem item = null; - int /*long*/ indices = OS.gtk_tree_path_get_indices (path); + long /*int*/ indices = OS.gtk_tree_path_get_indices (path); if (indices != 0) { int [] index = new int []{-1}; OS.memmove (index, indices, 4); @@ -1974,30 +1974,30 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long return 0; } -int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) { +long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_deleted); } return 0; } -int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) { +long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_inserted); } 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; } 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; - int /*long*/ indices = OS.gtk_tree_path_get_indices (path); + long /*int*/ indices = OS.gtk_tree_path_get_indices (path); if (indices != 0) { int [] index = new int [1]; OS.memmove (index, indices, 4); @@ -2012,7 +2012,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) { 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 @@ -2023,17 +2023,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { 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); @@ -2046,13 +2046,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { } 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); if (checkRenderer != 0) { @@ -2143,9 +2143,9 @@ public int indexOf (TableItem item) { */ public boolean isSelected (int index) { checkWidget(); - int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); + long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); byte [] buffer = Converter.wcsToMbcs (null, Integer.toString (index), true); - int /*long*/ path = OS.gtk_tree_path_new_from_string (buffer); + long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer); boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path); OS.gtk_tree_path_free (path); return answer; @@ -2153,7 +2153,7 @@ public boolean isSelected (int index) { boolean mnemonicHit (char key) { 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; @@ -2534,18 +2534,18 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /* return 0; } -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++) { @@ -2559,7 +2559,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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; @@ -2573,7 +2573,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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); @@ -2587,7 +2587,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l } //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); @@ -2625,7 +2625,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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); @@ -2636,7 +2636,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l } } } - 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)); @@ -2646,7 +2646,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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)) { @@ -2658,7 +2658,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) { if (hooks (SWT.PaintItem)) { GdkRectangle rect = new GdkRectangle (); - 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; @@ -2722,8 +2722,8 @@ void resetCustomDraw () { 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 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 (); @@ -156,7 +156,7 @@ boolean _getChecked () { } 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 (); @@ -168,7 +168,7 @@ Color _getForeground () { 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 (); @@ -181,7 +181,7 @@ Color _getForeground (int index) { 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; @@ -195,7 +195,7 @@ Image _getImage (int index) { 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 ""; @@ -219,7 +219,7 @@ void clear () { OS.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1); } for (int i=Table.FOREGROUND_COLUMN; i 0; @@ -358,15 +358,15 @@ public Color getBackground (int index) { 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); @@ -541,18 +541,18 @@ public Image getImage (int index) { 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); @@ -651,19 +651,19 @@ public Rectangle getTextBounds (int index) { if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); // TODO fully test on early and later versions of GTK // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem - 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; @@ -702,12 +702,12 @@ public Rectangle getTextBounds (int index) { 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); @@ -812,16 +812,16 @@ public void setBackground (int index, Color color) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -885,7 +885,7 @@ public void setFont (Font font){ 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, @@ -936,7 +936,7 @@ public void setFont (int index, Font font) { if (oldFont != null && oldFont.equals (font)) return; int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; - 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, @@ -954,16 +954,16 @@ public void setFont (int index, Font font) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -1059,16 +1059,16 @@ public void setForeground (int index, Color color){ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -1131,7 +1131,7 @@ public void setImage (int index, Image image) { } 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 (); @@ -1158,10 +1158,10 @@ public void setImage (int index, Image image) { */ if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) { 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) { /* @@ -1169,7 +1169,7 @@ public void setImage (int index, Image image) { * 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 --git a/org/eclipse/swt/widgets/Text.java b/org/eclipse/swt/widgets/Text.java index cb3415c..dc71cd3 100644 --- a/org/eclipse/swt/widgets/Text.java +++ b/org/eclipse/swt/widgets/Text.java @@ -57,9 +57,9 @@ import org.eclipse.swt.events.*; * @noextend This class is not intended to be subclassed by clients. */ public class Text extends Scrollable { - int /*long*/ bufferHandle; + long /*int*/ bufferHandle; int tabs = 8, lastEventTime = 0; - int /*long*/ gdkEventKey = 0; + long /*int*/ gdkEventKey = 0; int fixStart = -1, fixEnd = -1; boolean doubleClick; String message = ""; @@ -392,7 +392,7 @@ public void append (String string) { OS.gtk_text_buffer_get_end_iter (bufferHandle, position); OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length); OS.gtk_text_buffer_place_cursor (bufferHandle, position); - 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); } applySegments (); @@ -429,7 +429,7 @@ void applySegments () { separator [0] = segmentsChars [i]; } byte [] buffer = Converter.wcsToMbcs (null, separator, false); - int /*long*/ ptr = OS.gtk_entry_get_text (handle); + long /*int*/ ptr = OS.gtk_entry_get_text (handle); pos [0] = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]); OS.gtk_editable_insert_text (handle, buffer, buffer.length, pos); } @@ -443,7 +443,7 @@ void applySegments () { byte [] endIter = new byte [ITER_SIZEOF]; for (int i = 0; i < nSegments; i++) { 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); OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i)); OS.g_free (ptr); if (segmentsChars != null && segmentsChars.length > i) { @@ -466,7 +466,7 @@ void clearSegments (boolean applyText) { OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); if (applyText) { OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT); - int /*long*/ ptr = OS.gtk_entry_get_text (handle); + long /*int*/ ptr = OS.gtk_entry_get_text (handle); int start, end; for (int i = 0; i < nSegments; i++) { start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]); @@ -485,7 +485,7 @@ void clearSegments (boolean applyText) { byte [] startIter = new byte [ITER_SIZEOF], endIter = new byte [ITER_SIZEOF]; for (int i = 0; i < nSegments; i++) { 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); OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i])); OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1)); OS.gtk_text_buffer_delete (bufferHandle, start, end); @@ -512,8 +512,8 @@ public void clearSelection () { OS.gtk_editable_select_region (handle, position, position); } else { byte [] position = new byte [ITER_SIZEOF]; - 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_get_iter_at_mark (bufferHandle, position, insertMark); OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, position); OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, position); @@ -527,13 +527,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int[] w = new int [1], h = new int [1]; if ((style & SWT.SINGLE) != 0) { OS.gtk_widget_realize (handle); - int /*long*/ layout = OS.gtk_entry_get_layout (handle); + long /*int*/ layout = OS.gtk_entry_get_layout (handle); OS.pango_layout_get_size (layout, w, h); } else { byte [] start = new byte [ITER_SIZEOF], end = new byte [ITER_SIZEOF]; OS.gtk_text_buffer_get_bounds (bufferHandle, start, end); - int /*long*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true); - int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, text); + long /*int*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true); + long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, text); OS.g_free (text); OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE); OS.pango_layout_get_size (layout, w, h); @@ -543,7 +543,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int height = OS.PANGO_PIXELS (h [0]); if ((style & SWT.SINGLE) != 0 && message.length () > 0) { byte [] buffer = Converter.wcsToMbcs (null, message, true); - int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); + long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer); OS.pango_layout_get_size (layout, w, h); OS.g_object_unref (layout); width = Math.max (width, OS.PANGO_PIXELS (w [0])); @@ -562,7 +562,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { 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); } @@ -607,7 +607,7 @@ public void copy () { 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); clearSegments (true); OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard); applySegments (); @@ -631,7 +631,7 @@ public void cut () { 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); clearSegments (true); OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle)); applySegments (); @@ -670,7 +670,7 @@ char [] deprocessText (char [] text, int start, int end) { void deregister () { super.deregister (); if (bufferHandle != 0) display.removeWidget (bufferHandle); - int /*long*/ imContext = imContext (); + long /*int*/ imContext = imContext (); if (imContext != 0) display.removeWidget (imContext); } @@ -698,9 +698,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean 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]; @@ -719,15 +719,15 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean 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); } @@ -746,7 +746,7 @@ void fixIM () { * 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; @@ -763,7 +763,7 @@ GdkColor getBackgroundColor () { 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); } @@ -787,7 +787,7 @@ public int getCaretLineNumber () { 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); } @@ -812,7 +812,7 @@ public Point getCaretLocation () { } 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 (); @@ -820,7 +820,7 @@ public Point getCaretLocation () { 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); @@ -847,15 +847,15 @@ public int getCaretPosition () { checkWidget (); int result; if ((style & SWT.SINGLE) != 0) { - int /*long*/ ptr = OS.gtk_entry_get_text (handle); + long /*int*/ ptr = OS.gtk_entry_get_text (handle); result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (handle)); } else { 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); result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (position)); OS.g_free (ptr); } @@ -876,13 +876,13 @@ public int getCharCount () { checkWidget (); int result; if ((style & SWT.SINGLE) != 0) { - int /*long*/ ptr = OS.gtk_entry_get_text (handle); + long /*int*/ ptr = OS.gtk_entry_get_text (handle); result = (int)/*64*/OS.g_utf16_strlen (ptr, -1); } else { byte [] startIter = new byte [ITER_SIZEOF]; byte [] endIter = new byte [ITER_SIZEOF]; 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); result = (int)/*64*/OS.g_utf16_strlen(ptr, -1); OS.g_free (ptr); } @@ -1051,16 +1051,16 @@ public int getOrientation () { 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); } @@ -1092,7 +1092,7 @@ public Point getSelection () { 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]); selection = new Point (start [0], end [0]); @@ -1102,7 +1102,7 @@ public Point getSelection () { 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); @@ -1167,7 +1167,7 @@ public int getTabs () { 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); @@ -1247,7 +1247,7 @@ public String getText (int start, int end) { */ public char [] getTextChars () { checkWidget (); - int /*long*/ address; + long /*int*/ address; if ((style & SWT.SINGLE) != 0) { address = OS.gtk_entry_get_text (handle); } else { @@ -1345,13 +1345,13 @@ public int getTopPixel () { 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); @@ -1366,7 +1366,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { } -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 @@ -1375,7 +1375,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) { * 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); @@ -1393,14 +1393,14 @@ int /*long*/ gtk_changed (int /*long*/ widget) { } 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; @@ -1442,7 +1442,7 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) { 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]; @@ -1452,7 +1452,7 @@ int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*lo 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); @@ -1484,9 +1484,9 @@ int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*lo 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); @@ -1516,7 +1516,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int / 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 @@ -1532,7 +1532,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { 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; @@ -1541,29 +1541,29 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { return super.gtk_event_after (widget, gdkEvent); } -int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { +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); @@ -1586,19 +1586,19 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { case SWT.CENTER: x = (width - rect.width) / 2; break; case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break; } - int /*long*/ style = OS.gtk_widget_get_style (handle); + 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 (); OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, baseColor); if (OS.USE_CAIRO) { - int /*long*/ cairo = OS.gdk_cairo_create(window); + long /*int*/ cairo = OS.gdk_cairo_create(window); Cairo.cairo_set_source_rgba(cairo, (textColor.red & 0xFFFF) / (float)0xFFFF, (textColor.green & 0xFFFF) / (float)0xFFFF, (textColor.blue & 0xFFFF) / (float)0xFFFF, 1); Cairo.cairo_move_to(cairo, x, y); OS.pango_cairo_show_layout(cairo, layout); Cairo.cairo_destroy(cairo); } else { - int /*long*/ gc = OS.gdk_gc_new (window); + long /*int*/ gc = OS.gdk_gc_new (window); OS.gdk_draw_layout_with_colors (window, gc, x, y, layout, textColor, baseColor); OS.g_object_unref (gc); } @@ -1608,13 +1608,13 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { 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 @@ -1623,13 +1623,13 @@ int /*long*/ gtk_grab_focus (int /*long*/ widget) { * 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; @@ -1641,7 +1641,7 @@ int /*long*/ gtk_icon_release (int /*long*/ widget, int /*long*/ icon_pos, int / 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]; @@ -1649,7 +1649,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /* 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]; @@ -1689,7 +1689,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /* 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) { boolean handleSegments = false, segmentsCleared = false; if (hooks (SWT.Segments) || filters (SWT.Segments)) { GdkEventKey gdkEvent = new GdkEventKey (); @@ -1702,7 +1702,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { } } } - int /*long*/ result = super.gtk_key_press_event (widget, event); + long /*int*/ result = super.gtk_key_press_event (widget, event); if (result != 0) fixIM (); if (gdkEventKey == -1) result = 1; gdkEventKey = 0; @@ -1712,7 +1712,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) { 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); @@ -1720,7 +1720,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { 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); @@ -1733,7 +1733,7 @@ int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter } 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); @@ -1773,7 +1773,7 @@ void hookEvents () { 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 ()); @@ -1795,7 +1795,7 @@ void hookEvents () { OS.g_signal_connect_closure (handle, OS.direction_changed, display.closures [DIRECTION_CHANGED], true); } -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; } @@ -1837,16 +1837,16 @@ public void insert (String string) { } 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); } applySegments (); } -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 @@ -1882,7 +1882,7 @@ public void paste () { 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); clearSegments (true); OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle)); applySegments (); @@ -1892,7 +1892,7 @@ public void paste () { 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); } @@ -1907,7 +1907,7 @@ void releaseWidget () { * 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)); } } @@ -2034,8 +2034,8 @@ public void selectAll () { 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); } @@ -2046,8 +2046,8 @@ void setBackgroundColor (GdkColor color) { 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_unref (defaultCursor); @@ -2126,7 +2126,7 @@ public void setEditable (boolean editable) { } } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { super.setFontDescription (font); setTabStops (tabs); } @@ -2209,19 +2209,19 @@ public void setSelection (int start) { checkWidget (); start = translateOffset (start); 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); } } @@ -2256,7 +2256,7 @@ public void setSelection (int start, int end) { start = translateOffset (start); end = translateOffset (end); 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); @@ -2265,14 +2265,14 @@ public void setSelection (int start, int end) { 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); } @@ -2338,7 +2338,7 @@ public void setTabs (int tabs) { 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); @@ -2435,7 +2435,7 @@ void setText (char [] text) { OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT); 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); @@ -2515,7 +2515,7 @@ public void setTopIndex (int index) { 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); @@ -2534,9 +2534,9 @@ boolean translateTraversal (GdkEventKey keyEvent) { 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]); @@ -2578,7 +2578,7 @@ String verifyText (String string, int start, int end) { 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); @@ -2600,7 +2600,7 @@ String verifyText (String string, int start, int end) { return event.text; } -int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) { +long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case BACKSPACE: @@ -2622,7 +2622,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) { return super.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) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case DIRECTION_CHANGED: { @@ -2635,7 +2635,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us return super.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) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case DELETE_FROM_CURSOR: { @@ -2651,7 +2651,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar return super.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) { if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) { switch ((int)/*64*/user_data) { case MOVE_CURSOR: { diff --git a/org/eclipse/swt/widgets/ToolBar.java b/org/eclipse/swt/widgets/ToolBar.java index 2c77f9d..c6c4964 100644 --- a/org/eclipse/swt/widgets/ToolBar.java +++ b/org/eclipse/swt/widgets/ToolBar.java @@ -204,11 +204,11 @@ Widget [] computeTabList () { return result; } -int /*long*/ eventHandle () { +long /*int*/ eventHandle () { return fixedHandle; } -int /*long*/ enterExitHandle() { +long /*int*/ enterExitHandle() { return handle; } @@ -226,10 +226,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De } } -boolean forceFocus (int /*long*/ focusHandle) { +boolean forceFocus (long /*int*/ focusHandle) { int dir = OS.GTK_DIR_TAB_FORWARD; if ((style & SWT.MIRRORED) != 0) dir = OS.GTK_DIR_TAB_BACKWARD; - int /*long*/ childHandle = handle; + long /*int*/ childHandle = handle; if (currentFocusItem != null) childHandle = currentFocusItem.handle; /* * Feature in GTK. GtkToolBar takes care of navigating through @@ -298,7 +298,7 @@ public ToolItem getItem (Point point) { */ 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); @@ -327,13 +327,13 @@ public ToolItem [] getItems () { } 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, 6, 0)) { - int /*long*/ list = OS.gtk_container_get_children(eventHandle); + long /*int*/ list = OS.gtk_container_get_children(eventHandle); eventHandle = OS.g_list_nth_data(list, 0); if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.closures [CLICKED], false); } @@ -737,7 +737,7 @@ void hookEvents () { OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false); OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], 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); } @@ -936,7 +936,7 @@ public void setDisabledImage (Image image) { */ public void setEnabled (boolean enabled) { checkWidget(); - int /*long*/ topHandle = topHandle (); + long /*int*/ topHandle = topHandle (); if (OS.GTK_WIDGET_SENSITIVE (topHandle) == enabled) return; OS.gtk_widget_set_sensitive (topHandle, enabled); if (enabled) { @@ -970,7 +970,7 @@ boolean setFocus () { return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD); } -void setFontDescription (int /*long*/ font) { +void setFontDescription (long /*int*/ font) { if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font); } @@ -1024,7 +1024,7 @@ public void setImage (Image image) { } else { imageList.put (imageIndex, image); } - int /*long*/ pixbuf = imageList.getPixbuf (imageIndex); + long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf); } else { OS.gtk_image_set_from_pixbuf(imageHandle, 0); @@ -1183,10 +1183,10 @@ public void setToolTipText (String string) { } void setToolTipText (Shell shell, String newString) { - int /*long*/ child = OS.gtk_bin_get_child (handle); + long /*int*/ child = OS.gtk_bin_get_child (handle); if ((style & SWT.DROP_DOWN) != 0) { if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) { - int /*long*/ list = OS.gtk_container_get_children (child); + long /*int*/ list = OS.gtk_container_get_children (child); child = OS.g_list_nth_data (list, 0); } if (arrowHandle != 0) shell.setToolTipText (arrowHandle, newString); diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java index 94dbc00..818053e 100644 --- a/org/eclipse/swt/widgets/ToolTip.java +++ b/org/eclipse/swt/widgets/ToolTip.java @@ -46,7 +46,7 @@ public class ToolTip extends Widget { String text, message; TrayItem item; int x, y, timerId; - int /*long*/ layoutText = 0, layoutMessage = 0; + long /*int*/ layoutText = 0, layoutMessage = 0; int [] borderPolygon; boolean spikeAbove, autohide; @@ -134,7 +134,7 @@ public void addSelectionListener (SelectionListener listener) { } void configure () { - int /*long*/ screen = OS.gdk_screen_get_default (); + long /*int*/ screen = OS.gdk_screen_get_default (); OS.gtk_widget_realize (handle); int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (handle)); GdkRectangle dest = new GdkRectangle (); @@ -248,9 +248,9 @@ void configure () { OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT); } } - int /*long*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE); + long /*int*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE); 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, rgn, 0, 0); OS.gdk_region_destroy (rgn); } @@ -292,13 +292,13 @@ void createWidget (int index) { void deregister () { super.deregister (); 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.removeWidget (tipWindow); } } void destroyWidget () { - int /*long*/ topHandle = topHandle (); + long /*int*/ topHandle = topHandle (); if (parent != null) parent.removeTooTip (this); releaseHandle (); if (topHandle != 0 && (state & HANDLE) != 0) { @@ -331,7 +331,7 @@ Point getLocation () { int x = this.x; int y = this.y; if (item != null) { - int /*long*/ itemHandle = item.handle; + long /*int*/ itemHandle = item.handle; if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) { GdkRectangle area = new GdkRectangle (); OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0); @@ -339,7 +339,7 @@ Point getLocation () { 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; @@ -459,21 +459,21 @@ public String getText () { 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); + long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle); //TODO: Use Cairo - int /*long*/ gdkGC = OS.gdk_gc_new (window); + 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; @@ -487,8 +487,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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, @@ -518,11 +518,11 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { 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 (); @@ -541,7 +541,7 @@ void hookEvents () { 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); @@ -572,7 +572,7 @@ public boolean isVisible () { 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); } } @@ -660,7 +660,7 @@ public void setLocation (int x, int y) { 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); } @@ -752,13 +752,13 @@ public void setText (String string) { 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); @@ -792,7 +792,7 @@ public void setVisible (boolean visible) { 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); @@ -801,7 +801,7 @@ public void setVisible (boolean visible) { OS.gtk_widget_set_tooltip_text(vboxHandle, buffer); } else { 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); } @@ -811,7 +811,7 @@ public void setVisible (boolean visible) { if ((style & SWT.BALLOON) != 0) { OS.gtk_widget_hide (handle); } else { - int /*long*/ vboxHandle = parent.vboxHandle; + long /*int*/ vboxHandle = parent.vboxHandle; byte[] buffer = Converter.wcsToMbcs(null, "", true); if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) { OS.gtk_widget_set_tooltip_text(vboxHandle, buffer); @@ -822,11 +822,11 @@ public void setVisible (boolean visible) { } } -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 --git a/org/eclipse/swt/widgets/TouchSource.java b/org/eclipse/swt/widgets/TouchSource.java index 7caf92a..101ba27 100644 --- a/org/eclipse/swt/widgets/TouchSource.java +++ b/org/eclipse/swt/widgets/TouchSource.java @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.*; * @since 3.7 */ public final class TouchSource { - int /*long*/ handle; + long /*int*/ handle; boolean direct; Rectangle bounds; @@ -49,7 +49,7 @@ public final class TouchSource { * @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 --git a/org/eclipse/swt/widgets/Tracker.java b/org/eclipse/swt/widgets/Tracker.java index 099cbf0..0b136e9 100644 --- a/org/eclipse/swt/widgets/Tracker.java +++ b/org/eclipse/swt/widgets/Tracker.java @@ -42,7 +42,7 @@ import org.eclipse.swt.events.*; 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,15 +306,15 @@ Rectangle [] computeProportions (Rectangle [] rects) { } void drawRectangles (Rectangle [] rects) { - int /*long*/ window = OS.gdk_get_default_root_window(); + long /*int*/ window = OS.gdk_get_default_root_window(); if (parent != null) { window = OS.GTK_WIDGET_WINDOW (parent.paintHandle()); } if (window == 0) return; //TODO: Use Cairo - 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); @@ -367,17 +367,17 @@ public boolean getStippled () { } 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); @@ -511,8 +511,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) { 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 (); @@ -521,7 +521,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr 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]) { @@ -712,7 +712,7 @@ public boolean open () { Display display = this.display; while (tracking) { if (parent != null && parent.isDisposed ()) break; - int /*long*/ eventPtr; + long /*int*/ eventPtr; while (true) { display.runSkin (); display.runDeferredLayouts (); @@ -725,7 +725,7 @@ public boolean open () { } } 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 --git a/org/eclipse/swt/widgets/TrayItem.java b/org/eclipse/swt/widgets/TrayItem.java index 2a82fb8..8bce2a2 100644 --- a/org/eclipse/swt/widgets/TrayItem.java +++ b/org/eclipse/swt/widgets/TrayItem.java @@ -40,8 +40,8 @@ public class TrayItem extends Item { Tray parent; ToolTip toolTip; String toolTipText; - int /*long*/ imageHandle; - int /*long*/ tooltipsHandle; + long /*int*/ imageHandle; + long /*int*/ tooltipsHandle; ImageList imageList; Image highlightImage; @@ -165,20 +165,20 @@ void createHandle (int index) { 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); - 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_x11_display_get_xdisplay(OS.gdk_display_get_default()); + 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; @@ -187,7 +187,7 @@ void createHandle (int index) { 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); @@ -273,7 +273,7 @@ public String getToolTipText () { 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 @@ -281,10 +281,10 @@ int /*long*/ gtk_activate (int /*long*/ widget) { * 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); @@ -298,7 +298,7 @@ int /*long*/ gtk_activate (int /*long*/ widget) { 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; @@ -314,13 +314,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) 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) error(SWT.ERROR_NO_HANDLES); GdkImage gdkImage = new GdkImage(); OS.memmove (gdkImage, gdkImagePtr); @@ -339,7 +339,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { } } 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 (); } @@ -347,7 +347,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { return 0; } -int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) { +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. @@ -517,7 +517,7 @@ public void setImage (Image image) { } 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 --git a/org/eclipse/swt/widgets/Tree.java b/org/eclipse/swt/widgets/Tree.java index 02052a5..643a691 100644 --- a/org/eclipse/swt/widgets/Tree.java +++ b/org/eclipse/swt/widgets/Tree.java @@ -75,9 +75,9 @@ import org.eclipse.swt.events.*; * @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 @@ void _addListener (int eventType, Listener listener) { } } -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 @@ TreeItem _getItem (int /*long*/ iter) { 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 @@ TreeItem _getItem (int /*long*/ parentIter, int index) { 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 @@ static int checkStyle (int style) { 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); @@ -245,7 +245,7 @@ int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*lo setData = checkData (item); } } - int /*long*/ [] ptr = new int /*long*/ [1]; + long /*int*/ [] ptr = new long /*int*/ [1]; if (setData) { if (isPixbuf) { ptr [0] = 0; @@ -381,7 +381,7 @@ public void addTreeListener(TreeListener listener) { 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() @@ -395,7 +395,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) { 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 */ @@ -410,16 +410,16 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) { } OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0); width += 2 * w [0]; - int /*long*/ list = 0; + long /*int*/ list = 0; if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { 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]; @@ -432,7 +432,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) { 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)); @@ -478,8 +478,8 @@ public void clear(int index, boolean all) { 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); @@ -514,10 +514,10 @@ public void clearAll (boolean all) { 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) { @@ -545,15 +545,15 @@ public Point computeSize (int wHint, int hHint, boolean changed) { 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; - int /*long*/ [] ptr = new int /*long*/ [1]; + long /*int*/ [] ptr = new long /*int*/ [1]; int [] ptr1 = new int [1]; 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); OS.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1); @@ -562,7 +562,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int if (index != -1) { item = items [index]; if (item != null) { - int /*long*/ oldItem = item.handle; + long /*int*/ oldItem = item.handle; oldItems[oldIndex++] = oldItem; /* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */ for (int j = 0; j < FOREGROUND_COLUMN; j++) { @@ -614,7 +614,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int } } 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); @@ -647,16 +647,16 @@ void createColumn (TreeColumn column, int index) { 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); setModel (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]; @@ -707,7 +707,7 @@ void createHandle (int index) { 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); @@ -722,7 +722,7 @@ void createHandle (int index) { 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 @@ void createItem (TreeColumn column, int index) { } 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 @@ void createItem (TreeColumn column, int index) { 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 (TreeColumn column, int index) { } } -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 @@ void createItem (TreeItem item, int /*long*/ parentIter, int index) { 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); @@ -848,9 +848,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, 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) { @@ -954,7 +954,7 @@ public void deselect (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); boolean fixColumn = showFirstColumn (); - 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); @@ -972,7 +972,7 @@ public void deselect (TreeItem item) { 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); @@ -986,7 +986,7 @@ void destroyItem (TreeColumn column) { index++; } if (index == columnCount) return; - int /*long*/ columnHandle = column.handle; + long /*int*/ columnHandle = column.handle; if (columnCount == 1) { firstCustomDraw = column.customDraw; } @@ -994,11 +994,11 @@ void destroyItem (TreeColumn column) { 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); setModel (newModel); createColumn (null, 0); @@ -1006,13 +1006,13 @@ void destroyItem (TreeColumn column) { for (int i=0; i= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { @@ -1644,10 +1644,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) { } if (list == 0) return 0; int count = OS.g_list_length (list); - int /*long*/ pixbufRenderer = 0; + long /*int*/ pixbufRenderer = 0; int i = 0; while (i < count) { - int /*long*/ renderer = OS.g_list_nth_data (list, i); + long /*int*/ renderer = OS.g_list_nth_data (list, i); if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) { pixbufRenderer = renderer; break; @@ -1676,15 +1676,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) { */ public TreeItem[] getSelection () { checkWidget(); - int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); - int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null); + long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null); if (list != 0) { int count = OS.g_list_length (list); TreeItem [] treeSelection = new TreeItem [count]; int length = 0; for (int i=0; i= OS.VERSION(2, 12, 0)) { list = OS.gtk_cell_layout_get_cells(column); } else { @@ -1770,10 +1770,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) { } if (list == 0) return 0; int count = OS.g_list_length (list); - int /*long*/ textRenderer = 0; + long /*int*/ textRenderer = 0; int i = 0; while (i < count) { - int /*long*/ renderer = OS.g_list_nth_data (list, i); + long /*int*/ renderer = OS.g_list_nth_data (list, i); if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) { textRenderer = renderer; break; @@ -1800,12 +1800,12 @@ int /*long*/ getTextRenderer (int /*long*/ column) { */ public TreeItem getTopItem () { checkWidget (); - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; OS.gtk_widget_realize (handle); if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return null; if (path [0] == 0) return null; 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 [0])) { item = _getItem (iter); } @@ -1814,11 +1814,11 @@ public TreeItem getTopItem () { return item; } -int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) { GdkEventButton gdkEvent = new GdkEventButton (); OS.memmove (gdkEvent, event, GdkEventButton.sizeof); if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0; - int /*long*/ result = super.gtk_button_press_event (widget, event); + long /*int*/ result = super.gtk_button_press_event (widget, event); if (result != 0) return result; /* * Feature in GTK. In a multi-select tree view, when multiple items are already @@ -1830,10 +1830,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { */ int button = gdkEvent.button; if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) { - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.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])) result = 1; OS.gtk_tree_path_free (path [0]); } @@ -1848,10 +1848,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { * widget from automatically selecting the first item. */ if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) { - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.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); OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); OS.gtk_tree_view_set_cursor (handle, path [0], 0, false); OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED); @@ -1871,13 +1871,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) { return result; } -int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) { - int /*long*/ window = OS.GDK_EVENT_WINDOW (event); +long /*int*/ gtk_button_release_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_button_release_event (widget, event); } -int /*long*/ gtk_changed (int /*long*/ widget) { +long /*int*/ gtk_changed (long /*int*/ widget) { TreeItem item = getFocusItem (); if (item != null) { Event event = new Event (); @@ -1887,7 +1887,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) { return 0; } -int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { +long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { switch (OS.GDK_EVENT_TYPE (gdkEvent)) { case OS.GDK_EXPOSE: { /* @@ -1906,32 +1906,32 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) { return super.gtk_event_after (widget, gdkEvent); } -int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) { +long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) { // FIXME - this flag is never cleared. It should be cleared when the expand all operation completes. if (expand != 0 && open_all != 0) expandAll = true; 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 ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) { Control control = findBackgroundControl (); if (control != null) { GdkEventExpose gdkEvent = new GdkEventExpose (); OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof); - int /*long*/ window = OS.gtk_tree_view_get_bin_window (handle); + long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle); if (window == gdkEvent.window) { int [] width = new int [1], height = new int [1]; OS.gdk_drawable_get_size (window, width, height); - int /*long*/ parent = 0; + long /*int*/ parent = 0; int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parent); GdkRectangle rect = new GdkRectangle (); boolean expanded = true; while (itemCount != 0 && expanded && height [0] > (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); @@ -1948,14 +1948,14 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) { return super.gtk_expose_event (widget, eventPtr); } -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 @@ -1968,10 +1968,10 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) { 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); @@ -1984,21 +1984,21 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long return 0; } -int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) { +long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_deleted); } return 0; } -int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) { +long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { if (ignoreAccessibility) { OS.g_signal_stop_emission_by_name (model, OS.row_inserted); } 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; @@ -2006,7 +2006,7 @@ int /*long*/ gtk_start_interactive_search(int /*long*/ widget) { 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]]; @@ -2044,7 +2044,7 @@ int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /* 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]]; @@ -2086,11 +2086,11 @@ int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*lo 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); } @@ -2106,7 +2106,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) { 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 @@ -2117,17 +2117,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { 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); @@ -2140,13 +2140,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) { } 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); @@ -2215,10 +2215,10 @@ public int indexOf (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); int index = -1; - 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); @@ -2231,7 +2231,7 @@ public int indexOf (TreeItem item) { 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; @@ -2391,7 +2391,7 @@ public void removeAll () { 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; @@ -2475,19 +2475,19 @@ public void removeTreeListener(TreeListener listener) { 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); OS.call_get_size (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; @@ -2514,8 +2514,8 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /* 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; } @@ -2532,11 +2532,11 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /* return 0; } -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++) { @@ -2550,7 +2550,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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; @@ -2564,7 +2564,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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); @@ -2578,7 +2578,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l } //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)) { @@ -2615,7 +2615,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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); @@ -2626,7 +2626,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l } } } - 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)); @@ -2636,7 +2636,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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)) { @@ -2649,7 +2649,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l 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); @@ -2726,8 +2726,8 @@ void resetCustomDraw () { 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++) { @@ -3146,7 +3146,7 @@ public void setSelection (TreeItem [] items) { 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); @@ -3239,7 +3239,7 @@ public void setTopItem (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (item.parent != this) return; - 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)) { @@ -3314,10 +3314,10 @@ boolean showFirstColumn () { */ 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 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 (); @@ -241,7 +241,7 @@ boolean _getChecked () { } 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 (); @@ -253,7 +253,7 @@ Color _getForeground () { 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 (); @@ -266,7 +266,7 @@ Color _getForeground (int index) { 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; @@ -280,7 +280,7 @@ Image _getImage (int index) { 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$ @@ -300,7 +300,7 @@ void clear () { OS.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1); } for (int i=Tree.FOREGROUND_COLUMN; i= 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 @@ public Rectangle getBounds () { // 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; @@ -585,7 +585,7 @@ public boolean getChecked () { */ 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; @@ -737,18 +737,18 @@ public Rectangle getImageBounds (int index) { // 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; @@ -883,12 +883,12 @@ public Tree getParent () { */ 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); } @@ -946,19 +946,19 @@ public Rectangle getTextBounds (int index) { if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0); // TODO fully test on early and later versions of GTK // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem - 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; @@ -1032,8 +1032,8 @@ public int indexOf (TreeItem item) { 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; @@ -1041,9 +1041,9 @@ public int indexOf (TreeItem item) { 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); @@ -1055,13 +1055,13 @@ public int indexOf (TreeItem item) { } 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); @@ -1102,15 +1102,15 @@ void releaseWidget () { */ 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); @@ -1215,16 +1215,16 @@ public void setBackground (int index, Color color) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -1275,7 +1275,7 @@ public void setChecked (boolean checked) { */ 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.gtk_tree_view_row_expanded (parent.handle, path)) { if (expanded) { OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW); @@ -1318,7 +1318,7 @@ public void setFont (Font font){ 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, @@ -1369,7 +1369,7 @@ public void setFont (int index, Font font) { if (oldFont != null && oldFont.equals (font)) return; int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; - 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, @@ -1387,16 +1387,16 @@ public void setFont (int index, Font font) { boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -1494,16 +1494,16 @@ public void setForeground (int index, Color color){ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw; if (!customDraw) { if ((parent.style & SWT.VIRTUAL) == 0) { - 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); } @@ -1568,7 +1568,7 @@ public void setImage (int index, Image image) { } 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 (); @@ -1597,10 +1597,10 @@ public void setImage (int index, Image image) { */ if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) { 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) { /* @@ -1608,7 +1608,7 @@ public void setImage (int index, Image image) { * 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 --git a/org/eclipse/swt/widgets/Widget.java b/org/eclipse/swt/widgets/Widget.java index 4876ab5..08d042e 100644 --- a/org/eclipse/swt/widgets/Widget.java +++ b/org/eclipse/swt/widgets/Widget.java @@ -56,7 +56,7 @@ public abstract class Widget { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ handle; + public long /*int*/ handle; int style, state; Display display; EventTable eventTable; @@ -298,7 +298,7 @@ public void addDisposeListener (DisposeListener listener) { addListener (SWT.Dispose, typedListener); } -int /*long*/ paintWindow () { +long /*int*/ paintWindow () { return 0; } @@ -314,7 +314,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int return style; } -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) { return 0; } @@ -435,7 +435,7 @@ void deregister () { } void destroyWidget () { - int /*long*/ topHandle = topHandle (); + long /*int*/ topHandle = topHandle (); releaseHandle (); if (topHandle != 0 && (state & HANDLE) != 0) { OS.gtk_widget_destroy (topHandle); @@ -634,285 +634,285 @@ public int getStyle () { } -int /*long*/ gtk_activate (int /*long*/ widget) { +long /*int*/ gtk_activate (long /*int*/ widget) { 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) { return 0; } -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 0; } -int /*long*/ gtk_changed (int /*long*/ widget) { +long /*int*/ gtk_changed (long /*int*/ widget) { return 0; } -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) { return 0; } -int /*long*/ gtk_clicked (int /*long*/ widget) { +long /*int*/ gtk_clicked (long /*int*/ widget) { return 0; } -int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) { +long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) { return 0; } -int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) { +long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) { return 0; } -int /*long*/ gtk_day_selected (int /*long*/ widget) { +long /*int*/ gtk_day_selected (long /*int*/ widget) { return 0; } -int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) { +long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) { return 0; } -int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) { return 0; } -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) { 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) { 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) { return 0; } -int /*long*/ gtk_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) { +long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) { return 0; } -int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) { 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) { return 0; } -int /*long*/ gtk_grab_focus (int /*long*/ widget) { +long /*int*/ gtk_grab_focus (long /*int*/ widget) { return 0; } -int /*long*/ gtk_hide (int /*long*/ widget) { +long /*int*/ gtk_hide (long /*int*/ widget) { return 0; } -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) { return 0; } -int /*long*/ gtk_input (int /*long*/ widget, int /*long*/ arg1) { +long /*int*/ gtk_input (long /*int*/ widget, long /*int*/ arg1) { 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) { 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) { GdkEventKey gdkEvent = new GdkEventKey (); OS.memmove (gdkEvent, event, GdkEventKey.sizeof); return sendKeyEvent (SWT.KeyDown, gdkEvent) ? 0 : 1; } -int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) { GdkEventKey gdkEvent = new GdkEventKey (); OS.memmove (gdkEvent, event, GdkEventKey.sizeof); return sendKeyEvent (SWT.KeyUp, gdkEvent) ? 0 : 1; } -int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_map (int /*long*/ widget) { +long /*int*/ gtk_map (long /*int*/ widget) { return 0; } -int /*long*/ gtk_map_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_map_event (long /*int*/ widget, long /*int*/ event) { 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 0; } -int /*long*/ gtk_month_changed (int /*long*/ widget) { +long /*int*/ gtk_month_changed (long /*int*/ widget) { return 0; } -int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_output (int /*long*/ widget) { +long /*int*/ gtk_output (long /*int*/ widget) { return 0; } -int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) { +long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) { return 0; } -int /*long*/ gtk_popup_menu (int /*long*/ widget) { +long /*int*/ gtk_popup_menu (long /*int*/ widget) { return 0; } -int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) { +long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) { return 0; } -int /*long*/ gtk_realize (int /*long*/ widget) { +long /*int*/ gtk_realize (long /*int*/ widget) { return 0; } -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) { return 0; } -int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) { +long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) { return 0; } -int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) { +long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) { return 0; } -int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) { +long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) { return 0; } -int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_select (int /*long*/ item) { +long /*int*/ gtk_select (long /*int*/ item) { return 0; } -int /*long*/ gtk_selection_done (int /*long*/ menushell) { +long /*int*/ gtk_selection_done (long /*int*/ menushell) { return 0; } -int /*long*/ gtk_show (int /*long*/ widget) { +long /*int*/ gtk_show (long /*int*/ widget) { return 0; } -int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) { +long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) { return 0; } -int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { +long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) { return 0; } -int /*long*/ gtk_status_icon_popup_menu (int /*long*/ handle, int /*long*/ button, int /*long*/ activate_time) { +long /*int*/ gtk_status_icon_popup_menu (long /*int*/ handle, long /*int*/ button, long /*int*/ activate_time) { return 0; } -int /*long*/ gtk_start_interactive_search (int /*long*/ widget) { +long /*int*/ gtk_start_interactive_search (long /*int*/ widget) { return 0; } -int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) { +long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) { return 0; } -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) { 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) { 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) { 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) { return 0; } -int /*long*/ gtk_timer () { +long /*int*/ gtk_timer () { return 0; } -int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) { +long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) { return 0; } -int /*long*/ gtk_unmap (int /*long*/ widget) { +long /*int*/ gtk_unmap (long /*int*/ widget) { return 0; } -int /*long*/ gtk_unmap_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_unmap_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int /*long*/ gtk_unrealize (int /*long*/ widget) { +long /*int*/ gtk_unrealize (long /*int*/ widget) { return 0; } -int /*long*/ gtk_value_changed (int /*long*/ adjustment) { +long /*int*/ gtk_value_changed (long /*int*/ adjustment) { 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) { return 0; } -int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) { +long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) { return 0; } -int fontHeight (int /*long*/ font, int /*long*/ widgetHandle) { - int /*long*/ context = OS.gtk_widget_get_pango_context (widgetHandle); - int /*long*/ lang = OS.pango_context_get_language (context); - int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang); +int fontHeight (long /*int*/ font, long /*int*/ widgetHandle) { + long /*int*/ context = OS.gtk_widget_get_pango_context (widgetHandle); + long /*int*/ lang = OS.pango_context_get_language (context); + long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang); int ascent = OS.pango_font_metrics_get_ascent (metrics); int descent = OS.pango_font_metrics_get_descent (metrics); OS.pango_font_metrics_unref (metrics); return OS.PANGO_PIXELS (ascent + descent); } -int /*long*/ filterProc(int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) { +long /*int*/ filterProc(long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) { return 0; } @@ -920,11 +920,11 @@ boolean filters (int eventType) { return display.filters (eventType); } -int /*long*/ fixedMapProc (int /*long*/ widget) { +long /*int*/ fixedMapProc (long /*int*/ widget) { return 0; } -int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) { +long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) { return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr); } @@ -1027,15 +1027,15 @@ boolean hooks (int eventType) { return eventTable.hooks (eventType); } -int /*long*/ hoverProc (int /*long*/ widget) { +long /*int*/ hoverProc (long /*int*/ widget) { return 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) { return 0; } -boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) { +boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) { if (!mnemonicMatch (mnemonicHandle, key)) return false; OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE); boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false); @@ -1043,13 +1043,13 @@ boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) { return result; } -boolean mnemonicMatch (int /*long*/ mnemonicHandle, char key) { +boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) { int keyval1 = OS.gdk_keyval_to_lower (OS.gdk_unicode_to_keyval (key)); int keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle)); return keyval1 == keyval2; } -void modifyStyle (int /*long*/ handle, int /*long*/ style) { +void modifyStyle (long /*int*/ handle, long /*int*/ style) { OS.gtk_widget_modify_style (handle, style); } @@ -1194,11 +1194,11 @@ protected void removeListener (int eventType, SWTEventListener handler) { eventTable.unhook (eventType, handler); } -int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ handle, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) { +long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) { return 0; } -int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ handle, 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*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) { return 0; } @@ -1329,7 +1329,7 @@ boolean sendKeyEvent (int type, GdkEventKey keyEvent) { char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) { int index = 0, count = 0, state = 0; - int /*long*/ ptr = 0; + long /*int*/ ptr = 0; if (keyEvent == null) { ptr = OS.gtk_get_current_event (); if (ptr != 0) { @@ -1393,7 +1393,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) { return; } if (event == null) event = new Event (); - int /*long*/ ptr = OS.gtk_get_current_event (); + long /*int*/ ptr = OS.gtk_get_current_event (); if (ptr != 0) { GdkEvent gdkEvent = new GdkEvent (); OS.memmove (gdkEvent, ptr, GdkEvent.sizeof); @@ -1527,11 +1527,11 @@ public void setData (String key, Object value) { if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL); } -void setForegroundColor (int /*long*/ handle, GdkColor color) { +void setForegroundColor (long /*int*/ handle, GdkColor color) { setForegroundColor (handle, color, true); } -void setForegroundColor (int /*long*/ handle, GdkColor color, boolean setStateActive) { +void setForegroundColor (long /*int*/ handle, GdkColor color, boolean setStateActive) { /* * Feature in GTK. When the widget doesn't have focus, then * gtk_default_draw_flat_box () changes the background color state_type @@ -1539,7 +1539,7 @@ void setForegroundColor (int /*long*/ handle, GdkColor color, boolean setStateAc * gtk_paint_flat_box or gtk_default_draw_flat_box have to pass false for * setStateActive. */ - int /*long*/ style = OS.gtk_widget_get_modifier_style (handle); + long /*int*/ style = OS.gtk_widget_get_modifier_style (handle); OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color); if (setStateActive) OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color); OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color); @@ -1677,15 +1677,15 @@ boolean setTabItemFocus (boolean next) { return 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) { 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) { 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) { return 0; } @@ -1704,11 +1704,11 @@ public String toString () { return getName () + " {" + string + "}"; } -int /*long*/ topHandle () { +long /*int*/ topHandle () { return handle; } -int /*long*/ timerProc (int /*long*/ widget) { +long /*int*/ timerProc (long /*int*/ widget) { return 0; } @@ -1716,7 +1716,7 @@ boolean translateTraversal (int event) { return false; } -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: return gtk_activate (handle); case CHANGED: return gtk_changed (handle); @@ -1743,13 +1743,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ 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) { switch ((int)/*64*/user_data) { case EXPOSE_EVENT_INVERSE: { 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) return 0; return (state & OBSCURED) != 0 ? 1 : 0; } @@ -1792,7 +1792,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us } } -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) { switch ((int)/*64*/user_data) { case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1); case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1); @@ -1808,7 +1808,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar } } -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) { switch ((int)/*64*/user_data) { case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2); case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2); -- 1.7.10.4 debian/patches/64/make_jni64.diff0000644000000000000000000000046512163212507013633 0ustar 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 debian/manifest0000644000000000000000000000155112163212507010720 0ustar usr/share/java/swt-gtk-3.8.jar: Bundle-ManifestVersion: 2 Bundle-Name: Standard Widget Toolkit Bundle-SymbolicName: org.eclipse.swt; singleton:=true Bundle-Vendor: Eclipse.org Bundle-Version: 3.8.2 Bundle-Localization: plugin Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal;x-friends:="org.eclipse.ui",org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Eclipse-ExtensibleAPI: true debian/docs0000644000000000000000000000004312163212507010035 0ustar debian/README debian/README.Debian debian/Makefile0000644000000000000000000000134412163212507010627 0ustar RELEASE=$(strip $(shell dpkg-parsechangelog | grep Version: | cut -d: -f2 | cut -d- -f1 | cut -d~ -f1)) JAVA=swt-gtk-$(RELEASE).jar CLEANFILES=*.files *.jar *-stamp JAR=fastjar JAVAC=javac -classpath . -source 1.5 -target 1.5 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 -o -name *.properties | sort > $@ %-stamp: %.files mkdir -p $* grep \.java $< | xargs -r $(JAVAC) -d $* grep \.properties $< | xargs -r cp --parents -t $* touch $@ %.jar: %-stamp $(JAR) -C $* -cf $@ . debian/libswt-webkit-gtk-3-jni.lintian-overrides0000644000000000000000000000013312163212507017032 0ustar libswt-webkit-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-webkit-gtk-*.so debian/libswt-gtk-3-jni.install0000644000000000000000000000020312163212507013555 0ustar 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 debian/source/0000755000000000000000000000000012163212507010465 5ustar debian/source/format0000644000000000000000000000001512163212507011674 0ustar 3.0 (quilt) debian/libswt-glx-gtk-3-jni.lintian-overrides0000644000000000000000000000012512163212507016340 0ustar libswt-glx-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-glx-gtk-*.so debian/libswt-gtk-3-java.lintian-overrides0000644000000000000000000000015612163212507015715 0ustar # swt-gtk-3.jar is architecture-dependent: libswt-gtk-3-java: jar-not-in-usr-share usr/lib/java/swt-gtk-*.jar debian/java-config/0000755000000000000000000000000012163212507011351 5ustar debian/java-config/libswt-gtk-3-java0000644000000000000000000000004512163212507014441 0ustar JARS=/usr/lib/java/swt-gtk-3.8.2.jar debian/compat0000644000000000000000000000000212163212507010363 0ustar 9 debian/libswt-gtk-3-java.install0000644000000000000000000000012012163212507013714 0ustar swt-gtk-*.jar usr/lib/java debian/java-config/libswt-gtk* usr/share/java-config debian/libswt-cairo-gtk-3-jni.lintian-overrides0000644000000000000000000000013112163212507016640 0ustar libswt-cairo-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-cairo-gtk-*.so debian/copyright0000644000000000000000000012667212163212507011136 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: SWT Upstream-Contact: The Eclipse Foundation Source: http://www.eclipse.org/swt/ Files: * Copyright: 2000-2011 IBM Corporation and others License: EPL-1.0 Files: debian/* Copyright: 2009-2010 Adrian Perez 2004-2009 Shaun Jackman 2011-2012 أحمد المحمودي (Ahmed El-Mahmoudy) License: GPL-3+ Files: gnome*.[c|h] os*[.c|h] atk*.[c|h] Copyright: 2000-2010 IBM Corporation and others License: LGPL-2.1 Files: cairo*.[c|h] org/eclipse/swt/internal/cairo/* Copyright: 2000-2009 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-2011 IBM Corporation 1998-1999 Netscape Communications Corporation License: MPL-1.1 Files: org/eclipse/swt/internal/accessibility/gtk/* Copyright: 2000-2010 IBM Corporation License: LGPL-2.1 Files: org/eclipse/swt/internal/gtk/[^X]*.java Copyright: 2000-2011 IBM Corporation and others License: LGPL-2.1 Files: org/eclipse/swt/internal/gnome/* Copyright: 2000-2010 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 Files: webkitgtk* org/eclipse/internal/webkit/* Copyright: 2009-2011 IBM Corporation and others License: LGPL-2.1 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: GPL-2+ 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 2 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 2 can be found in /usr/share/common-licenses/GPL-2. 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. debian/gbp.conf0000644000000000000000000000005512163212507010604 0ustar [DEFAULT] pristine-tar = True compression=xz debian/control0000644000000000000000000001156612163212507010601 0ustar Source: swt-gtk Section: libs Priority: optional Maintainer: Debian Java Maintainers Uploaders: Adrian Perez , أحمد المحمودي (Ahmed El-Mahmoudy) , Jakub Adam , Niels Thykier Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev, libxcb-render-util0-dev, libxt-dev, libglib2.0-dev (>= 2.35), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, fastjar, cdbs, patchutils, debhelper (>= 9), libwebkitgtk-dev, javahelper, dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/swt-gtk.git Vcs-Browser: http://anonscm.debian.org/gitweb/?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 Conflicts: libswt3.2-gtk-jni, libswt3.2-gtk-java, libswt-gtk-3.4-java, libswt-gtk-3.4-jni, libswt-gtk-3.5-jni, libswt-gnome-gtk-3.5-jni, libswt-cairo-gtk-3.5-jni, libswt-mozilla-gtk-3.5-jni Breaks: libswt-gnome-gtk-3-jni (<< 3.8.0~rc2-2~), libswt-cairo-gtk-3-jni (<< 3.8.0~rc2-2~), libswt-glx-gtk-3-jni (<< 3.8.0~rc2-2~), libswt-webkit-gtk-3-jni (<< 3.8.0~rc2-2~), eclipse-rcp (<< 3.8) Description: Standard Widget Toolkit for GTK+ Java library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. Package: libswt-gtk-3-jni Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libswt-gnome-gtk-3-jni Breaks: libswt-gtk-3-java (<< ${binary:Version}), libswt-gtk-3-java (>> ${binary:Version}) Description: Standard Widget Toolkit for GTK+ JNI library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . This package includes the JNI libraries (atk, awt, gtk, pi). Package: libswt-gnome-gtk-3-jni Architecture: any Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Standard Widget Toolkit for GTK+ GNOME JNI library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . This package includes the GNOME JNI library. Package: libswt-cairo-gtk-3-jni Architecture: any Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Standard Widget Toolkit for GTK+ Cairo JNI library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . This package includes the Cairo JNI libraries. Package: libswt-glx-gtk-3-jni Architecture: any Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Standard Widget Toolkit for GTK+ GLX JNI library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . This package includes the GLX JNI libraries. Package: libswt-webkit-gtk-3-jni Architecture: any Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Breaks: libswt-gtk-3-java (<< ${binary:Version}), libswt-gtk-3-java (>> ${binary:Version}) Description: Standard Widget Toolkit for GTK+ WebKit JNI library The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . 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 Java GUI toolkit. For platforms with existing SWT implementations it provides efficient, portable and fast access to native controls and user interface facilities. . This package contains a native library built using gcj. debian/libswt-webkit-gtk-3-jni.install0000644000000000000000000000004412163212507015043 0ustar libswt-webkit-*[0-9].so usr/lib/jni