[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.5.1-5-18-gca69ee2
Ahmed El-Mahmoudy
aelmahmoudy-guest at alioth.debian.org
Tue Mar 29 15:48:38 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".
The branch, master has been updated
via ca69ee2c54dd7d98b3a07ee161bf0deceebbc719 (commit)
via 0751a0270e11c9660008c2f1ce06717eca2ca6c4 (commit)
via c8ebb112953b9dd1a655691e91b6b6cbd40517aa (commit)
via 2753c22b98772bcd32c588fb702c8c9bef506c4f (commit)
via 11c35fdda91cdacdb44a212e24d5b2d521966c61 (commit)
via e32cfc89ed43f6db08eb05af81dc771ba2c8c36a (commit)
via 4093696efa1ca17909e8c042207da07676b789bb (commit)
via 52010cd6b2759142a1bb867945f70a496cd5d033 (commit)
via c901c35a7eeb2fc864b1bd81ca560c35faeb223a (commit)
from d69e7a0c7d9717427763edb5eba10d412b41ce47 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ca69ee2c54dd7d98b3a07ee161bf0deceebbc719
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Tue Mar 29 17:42:54 2011 +0200
Added patch headers
commit 0751a0270e11c9660008c2f1ce06717eca2ca6c4
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Tue Mar 29 17:32:38 2011 +0200
Put libswt-gtk-3.6-java-gcj in java section
commit c8ebb112953b9dd1a655691e91b6b6cbd40517aa
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Mon Mar 28 12:04:38 2011 +0200
Added common/04-fix-webkit-includes.patch (based on a patch from
Ubuntu), to fix a missing include for WebKit (>= 1.3) JNI.
commit 2753c22b98772bcd32c588fb702c8c9bef506c4f
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Mon Mar 28 11:34:58 2011 +0200
Added common/02-webkit_linkage.patch patch from Ubuntu to fix linkage
for WebKit (>= 1.3)
commit 11c35fdda91cdacdb44a212e24d5b2d521966c61
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Sun Mar 27 22:54:46 2011 +0200
debian/Makefile, debian/java-config/libswt-gtk-3.6-java,
debian/libswt-gtk-3.6-java.links, debian/libswt-gtk-3.6-java.postinst,
debian/libswt-gtk-3.6-java.prerm: 3.6.1 => 3.6.2
commit e32cfc89ed43f6db08eb05af81dc771ba2c8c36a
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Sun Mar 27 22:48:52 2011 +0200
Updated 64/arch64.diff patch (from Ubuntu package)
commit 4093696efa1ca17909e8c042207da07676b789bb
Merge: c901c35 52010cd
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Sun Mar 27 22:21:27 2011 +0200
Merge commit 'upstream/3.6.2'
commit c901c35a7eeb2fc864b1bd81ca560c35faeb223a
Author: Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Sun Mar 27 22:19:59 2011 +0200
Remove debian/gbp.conf
-----------------------------------------------------------------------
Summary of changes:
build.sh | 55 +-
cairo_custom.h | 16 +-
debian/Makefile | 2 +-
debian/control | 1 +
debian/gbp.conf | 2 -
debian/java-config/libswt-gtk-3.6-java | 2 +-
debian/libswt-gtk-3.6-java.links | 2 +-
debian/libswt-gtk-3.6-java.postinst | 2 +-
debian/libswt-gtk-3.6-java.prerm | 2 +-
debian/patches/64/arch64.diff | 9210 ++++++++++----------
debian/patches/common/02-webkit_linkage.patch | 15 +
debian/patches/common/04-fix-webkit-includes.patch | 17 +
gnome.h | 14 +-
make_aix.mak | 198 +
make_common.mak | 4 +-
.../swt/accessibility/AccessibleObject.java | 40 +-
org/eclipse/swt/browser/Mozilla.java | 2 -
org/eclipse/swt/browser/WebKit.java | 6 +-
org/eclipse/swt/graphics/Device.java | 25 +-
org/eclipse/swt/internal/Library.java | 2 +-
org/eclipse/swt/internal/gtk/OS.java | 27 +-
org/eclipse/swt/internal/webkit/WebKitGTK.java | 16 +-
org/eclipse/swt/program/Program.java | 13 +-
os.c | 48 +
os_custom.c | 31 +-
os_custom.h | 469 +-
os_stats.c | 8 +-
os_stats.h | 4 +
swt.h | 7 +-
version.txt | 2 +-
webkitgtk.c | 16 +-
31 files changed, 5343 insertions(+), 4915 deletions(-)
diff --git a/build.sh b/build.sh
index 032587e..55f98da 100755
--- a/build.sh
+++ b/build.sh
@@ -29,12 +29,22 @@ if [ "${OS}" = "" ]; then
OS=`uname -s`
fi
case $OS in
+ "AIX")
+ SWT_OS=aix
+ MAKEFILE=make_aix.mak
+ ;;
+ "HP-UX")
+ SWT_OS=hpux
+ MAKEFILE=make_hpux.mak
+ ;;
"SunOS")
SWT_OS=solaris
PROC=`uname -i`
MAKEFILE=make_solaris.mak
- if uname -p > /dev/null 2>&1; then
- MODEL=`uname -p`
+ if [ "${MODEL}" = "" ]; then
+ if uname -p > /dev/null 2>&1; then
+ MODEL=`uname -p`
+ fi
fi
if [ ${MODEL} = 'i386' ]; then
MAKEFILE=make_solaris_x86.mak
@@ -67,6 +77,10 @@ case $MODEL in
SWT_ARCH=x86_64
AWT_ARCH=amd64
;;
+ "sparc64")
+ SWT_ARCH=$MODEL
+ AWT_ARCH=sparcv9
+ ;;
i?86)
SWT_ARCH=x86
AWT_ARCH=i386
@@ -78,17 +92,36 @@ case $MODEL in
esac
echo "Model is ${MODEL}"
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
if [ ${MODEL} = 'ppc64' ]; then
- SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
- XLIB64="${XLIB64} -L/usr/lib64"
- SWT_LFLAGS=-m64
- export SWT_LFLAGS
+ if [ ${OS} = 'AIX' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
+ SWT_LFLAGS=-maix64
+ export SWT_LFLAGS
+ else
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
+ XLIB64="${XLIB64} -L/usr/lib64"
+ SWT_LFLAGS=-m64
+ export SWT_LFLAGS
+ fi
+ fi
+ if [ ${MODEL} = 'ia64' ]; then
+ if [ ${OS} = 'HP-UX' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -mlp64"
+ SWT_LFLAGS=-mlp64
+ export SWT_LFLAGS
+ fi
+ fi
+ if [ ${MODEL} = 'sparc64' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -xarch=v9"
+ SWT_LFLAGS="-xarch=v9"
+ SWT_CDE_64SUFFIX="/64"
+ export SWT_LFLAGS SWT_CDE_64SUFFIX
fi
export SWT_PTR_CFLAGS
fi
@@ -98,7 +131,7 @@ if [ ${MODEL} = 's390' ]; then
export SWT_LFLAGS SWT_PTR_CFLAGS
fi
-if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
+if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" ]; then
echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
MAKE_GNOME=make_gnome
else
@@ -114,7 +147,7 @@ else
echo " *** Advanced graphics support using cairo will not be compiled."
fi
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
@@ -149,7 +182,7 @@ fi
# Find AWT if available
if [ -z "${AWT_LIB_PATH}" ]; then
- if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.so ]; then
+ if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then
AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH}
export AWT_LIB_PATH
else
@@ -158,7 +191,7 @@ if [ -z "${AWT_LIB_PATH}" ]; then
fi
fi
-if [ -f ${AWT_LIB_PATH}/libjawt.so ]; then
+if [ -f ${AWT_LIB_PATH}/libjawt.* ]; then
echo "libjawt.so found, the SWT/AWT integration library will be compiled."
MAKE_AWT=make_awt
else
diff --git a/cairo_custom.h b/cairo_custom.h
index 9d0ae8d..44c5e55 100644
--- a/cairo_custom.h
+++ b/cairo_custom.h
@@ -20,7 +20,15 @@
* ***** END LICENSE BLOCK ***** */
/* Libraries for dynamic loaded functions */
-#define cairo_pdf_surface_set_size_LIB "libcairo.so.2"
-#define cairo_ps_surface_set_size_LIB "libcairo.so.2"
-#define cairo_surface_set_fallback_resolution_LIB "libcairo.so.2"
-#define cairo_surface_get_type_LIB "libcairo.so.2"
+#ifdef AIX
+#define LIB_CAIRO "libcairo.a(libcairo.so.2)"
+#elif HPUX
+#define LIB_CAIRO "libcairo.so"
+#else
+#define LIB_CAIRO "libcairo.so.2"
+#endif
+
+#define cairo_pdf_surface_set_size_LIB LIB_CAIRO
+#define cairo_ps_surface_set_size_LIB LIB_CAIRO
+#define cairo_surface_set_fallback_resolution_LIB LIB_CAIRO
+#define cairo_surface_get_type_LIB LIB_CAIRO
diff --git a/debian/Makefile b/debian/Makefile
index 3455697..5095e09 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,4 +1,4 @@
-RELEASE=3.6.1
+RELEASE=3.6.2
JAVA=swt-gtk-$(RELEASE).jar
CLEANFILES=*.files *.jar *-stamp
diff --git a/debian/control b/debian/control
index 59d5ffd..54a456a 100644
--- a/debian/control
+++ b/debian/control
@@ -95,6 +95,7 @@ Description: Standard Widget Toolkit for GTK+ WebKit JNI library
Package: libswt-gtk-3.6-java-gcj
Architecture: any
+Section: java
Depends: ${misc:Depends}, ${shlibs:Depends},
libswt-cairo-gtk-3.6-jni (= ${binary:Version}),
libswt-glx-gtk-3.6-jni (= ${binary:Version}),
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index f09a0c5..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-debian-branch = experimental
diff --git a/debian/java-config/libswt-gtk-3.6-java b/debian/java-config/libswt-gtk-3.6-java
index 59d8612..151b67d 100644
--- a/debian/java-config/libswt-gtk-3.6-java
+++ b/debian/java-config/libswt-gtk-3.6-java
@@ -1 +1 @@
-JARS=/usr/lib/java/swt-gtk-3.6.1.jar
+JARS=/usr/lib/java/swt-gtk-3.6.2.jar
diff --git a/debian/libswt-gtk-3.6-java.links b/debian/libswt-gtk-3.6-java.links
index ab4eda7..980ee42 100644
--- a/debian/libswt-gtk-3.6-java.links
+++ b/debian/libswt-gtk-3.6-java.links
@@ -1 +1 @@
-usr/lib/java/swt-gtk-3.6.1.jar usr/share/java/swt-gtk-3.6.1.jar
+usr/lib/java/swt-gtk-3.6.2.jar usr/share/java/swt-gtk-3.6.2.jar
diff --git a/debian/libswt-gtk-3.6-java.postinst b/debian/libswt-gtk-3.6-java.postinst
index 8b05ff6..3406439 100644
--- a/debian/libswt-gtk-3.6-java.postinst
+++ b/debian/libswt-gtk-3.6-java.postinst
@@ -6,7 +6,7 @@ case "$1" in
update-alternatives --install \
/usr/share/java/swt.jar \
swt.jar \
- /usr/lib/java/swt-gtk-3.6.1.jar \
+ /usr/lib/java/swt-gtk-3.6.2.jar \
103
;;
diff --git a/debian/libswt-gtk-3.6-java.prerm b/debian/libswt-gtk-3.6-java.prerm
index 07ea2c3..e1ea3a5 100644
--- a/debian/libswt-gtk-3.6-java.prerm
+++ b/debian/libswt-gtk-3.6-java.prerm
@@ -4,7 +4,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
update-alternatives --remove swt.jar \
- /usr/lib/java/swt-gtk-3.6.1.jar
+ /usr/lib/java/swt-gtk-3.6.2.jar
;;
failed-upgrade)
;;
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/arch64.diff
index b7fd3f8..6ce1024 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/arch64.diff
@@ -1,7 +1,7 @@
-diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java
---- x86/org/eclipse/swt/accessibility/AccessibleFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -144,13 +144,13 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/AccessibleFactory.java swt-gtk-3.6.2/org/eclipse/swt/accessibility/AccessibleFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/AccessibleFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/accessibility/AccessibleFactory.java 2011-03-21 11:34:23.115736911 +0000
+@@ -144,13 +144,13 @@ class AccessibleFactory {
static final Callback InitValueIfaceCB;
static final Callback GTypeInfo_base_init_factory;
/* interface definitions */
@@ -22,7 +22,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
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$
-@@ -274,15 +274,15 @@
+@@ -274,15 +274,15 @@ class AccessibleFactory {
return callback;
}
@@ -41,7 +41,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
LONG type = null;
while (widgetType != 0 && (type = (LONG)Factories.get(new LONG(widgetType))) == null) {
widgetType = OS.g_type_parent (widgetType);
-@@ -291,14 +291,14 @@
+@@ -291,14 +291,14 @@ class AccessibleFactory {
return ((LONG)type).value;
}
@@ -58,7 +58,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
ATK.atk_object_initialize (result, widget);
return result;
}
-@@ -306,10 +306,10 @@
+@@ -306,10 +306,10 @@ class AccessibleFactory {
if (accessible.accessibleObject != null) {
return accessible.accessibleObject.handle;
}
@@ -72,7 +72,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AccessibleObject object = new AccessibleObject (type, widget, accessible, false);
accessible.accessibleObject = object;
accessible.addRelations ();
-@@ -317,16 +317,16 @@
+@@ -317,16 +317,16 @@ class AccessibleFactory {
}
static AccessibleObject createChildAccessible (Accessible accessible, int childId) {
@@ -92,7 +92,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = childId;
Vector listeners = accessible.accessibleControlListeners;
-@@ -384,11 +384,11 @@
+@@ -384,11 +384,11 @@ class AccessibleFactory {
if (value) swtTypeName += "Value"; //$NON-NLS-1$
byte[] nameBytes = Converter.wcsToMbcs(null, swtTypeName, true);
@@ -106,7 +106,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
OS.g_type_query (parentType, queryPtr);
GTypeQuery query = new GTypeQuery ();
OS.memmove (query, queryPtr, GTypeQuery.sizeof);
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,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;
@@ -115,7 +115,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
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);
-@@ -411,7 +411,7 @@
+@@ -411,7 +411,7 @@ class AccessibleFactory {
return type;
}
@@ -124,7 +124,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkObjectFactoryClass objectClass = new AtkObjectFactoryClass ();
ATK.memmove (objectClass, klass);
objectClass.create_accessible = AtkObjectFactoryCB_create_accessible.getAddress ();
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ class AccessibleFactory {
return 0;
}
@@ -133,7 +133,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, klass);
objectClass.get_name = AtkObjectCB_get_name.getAddress ();
-@@ -431,7 +431,7 @@
+@@ -431,7 +431,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 ();
@@ -142,7 +142,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
GObjectClass objectClassStruct = new GObjectClass ();
OS.memmove (objectClassStruct, gObjectClass);
objectClassStruct.finalize = GObjectClass_finalize.getAddress ();
-@@ -440,7 +440,7 @@
+@@ -440,7 +440,7 @@ class AccessibleFactory {
return 0;
}
@@ -151,7 +151,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkActionIface inter = new AtkActionIface ();
ATK.memmove (inter, iface);
inter.do_action = AtkActionCB_do_action.getAddress ();
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ class AccessibleFactory {
return 0;
}
@@ -160,7 +160,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkComponentIface inter = new AtkComponentIface ();
ATK.memmove (inter, iface);
inter.get_extents = AtkComponentCB_get_extents.getAddress ();
-@@ -463,7 +463,7 @@
+@@ -463,7 +463,7 @@ class AccessibleFactory {
return 0;
}
@@ -169,7 +169,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkHypertextIface inter = new AtkHypertextIface ();
ATK.memmove (inter, iface);
inter.get_link = AtkHypertextCB_get_link.getAddress ();
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ class AccessibleFactory {
return 0;
}
@@ -178,7 +178,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkSelectionIface inter = new AtkSelectionIface ();
ATK.memmove (inter, iface);
inter.is_child_selected = AtkSelectionCB_is_child_selected.getAddress ();
-@@ -482,7 +482,7 @@
+@@ -482,7 +482,7 @@ class AccessibleFactory {
return 0;
}
@@ -187,7 +187,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkTableIface inter = new AtkTableIface ();
ATK.memmove (inter, iface);
inter.ref_at = AtkTableCB_ref_at.getAddress();
-@@ -512,7 +512,7 @@
+@@ -512,7 +512,7 @@ class AccessibleFactory {
return 0;
}
@@ -196,7 +196,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkTextIface inter = new AtkTextIface ();
ATK.memmove (inter, iface);
inter.get_range_extents = AtkTextCB_get_range_extents.getAddress ();
-@@ -537,7 +537,7 @@
+@@ -537,7 +537,7 @@ class AccessibleFactory {
return 0;
}
@@ -205,7 +205,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkValueIface inter = new AtkValueIface ();
ATK.memmove (inter, iface);
inter.get_current_value = AtkValueCB_get_current_value.getAddress ();
-@@ -549,10 +549,10 @@
+@@ -549,10 +549,10 @@ class AccessibleFactory {
}
static void registerAccessible (Accessible accessible) {
@@ -220,7 +220,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
/* 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);
-@@ -564,10 +564,10 @@
+@@ -564,10 +564,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 ();
@@ -234,7 +234,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType);
Factories.put (new LONG (widgetType), new LONG (parentType));
}
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ class AccessibleFactory {
}
static void unregisterAccessible (Accessible accessible) {
@@ -243,10 +243,10 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
Accessibles.remove (new LONG (widget));
if (AccessibleObject.DEBUG) AccessibleObject.print("-->Deregister=" + accessible.control + " " + widget); //$NON-NLS-1$
}
-diff -urN x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/swt/accessibility/Accessible.java
---- x86/org/eclipse/swt/accessibility/Accessible.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/accessibility/Accessible.java 2010-09-09 12:02:46.000000000 +0000
-@@ -446,14 +446,14 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/Accessible.java swt-gtk-3.6.2/org/eclipse/swt/accessibility/Accessible.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/Accessible.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/accessibility/Accessible.java 2011-03-21 11:34:23.145736485 +0000
+@@ -446,14 +446,14 @@ public class Accessible {
return accessibleObject;
}
@@ -266,10 +266,10 @@ diff -urN x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/s
if (OS.GTK_WIDGET_VISIBLE (widget)) {
result = widget;
break;
-diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/eclipse/swt/accessibility/AccessibleObject.java
---- x86/org/eclipse/swt/accessibility/AccessibleObject.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleObject.java 2010-09-09 12:02:46.000000000 +0000
-@@ -21,7 +21,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/AccessibleObject.java swt-gtk-3.6.2/org/eclipse/swt/accessibility/AccessibleObject.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/accessibility/AccessibleObject.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/accessibility/AccessibleObject.java 2011-03-21 11:34:23.135736623 +0000
+@@ -21,7 +21,7 @@ import org.eclipse.swt.internal.accessib
import org.eclipse.swt.internal.gtk.*;
class AccessibleObject {
@@ -278,7 +278,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int index = -1, id = ACC.CHILDID_SELF;
Accessible accessible;
AccessibleObject parent;
-@@ -32,10 +32,10 @@
+@@ -32,10 +32,10 @@ class AccessibleObject {
*/
boolean isLightweight = false;
@@ -293,7 +293,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
static final Hashtable AccessibleObjects = new Hashtable (9);
static final boolean DEBUG = Device.DEBUG;
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ class AccessibleObject {
COLUMN_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "column", true)); //$NON-NLS-1$
}
@@ -302,7 +302,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
super ();
handle = ATK.g_object_new (type, 0);
ATK.atk_object_initialize (handle, widget);
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ class AccessibleObject {
System.out.println (str);
}
@@ -311,7 +311,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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 @@
+@@ -68,7 +68,7 @@ class AccessibleObject {
return null;
}
@@ -320,7 +320,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkAction_do_action");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -329,7 +329,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.do_action != 0) {
parentResult = ATK.call (iface.do_action, atkObject, index);
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ class AccessibleObject {
return parentResult;
}
@@ -338,7 +338,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkAction_get_n_actions");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -109,7 +109,7 @@
+@@ -109,7 +109,7 @@ class AccessibleObject {
return event.count;
}
}
@@ -347,7 +347,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_n_actions != 0) {
parentResult = ATK.call (iface.get_n_actions, atkObject);
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ class AccessibleObject {
return parentResult;
}
@@ -356,7 +356,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkAction_get_description");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ class AccessibleObject {
return descriptionPtr = getStringPtr (event.result);
}
}
@@ -365,7 +365,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_description != 0) {
parentResult = ATK.call (iface.get_description, atkObject, index);
-@@ -144,10 +144,10 @@
+@@ -144,10 +144,10 @@ class AccessibleObject {
return parentResult;
}
@@ -378,7 +378,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_keybinding != 0) {
parentResult = ATK.call (iface.get_keybinding, atkObject, index);
-@@ -187,10 +187,10 @@
+@@ -187,10 +187,10 @@ class AccessibleObject {
return parentResult;
}
@@ -391,7 +391,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_name != 0) {
parentResult = ATK.call (iface.get_name, atkObject, index);
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ class AccessibleObject {
return parentResult;
}
@@ -400,7 +400,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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 @@
+@@ -241,7 +241,7 @@ class AccessibleObject {
return null;
}
@@ -409,7 +409,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkComponent_get_extents: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
OS.memmove (x, new int[] {0}, 4);
-@@ -291,7 +291,7 @@
+@@ -291,7 +291,7 @@ class AccessibleObject {
return 0;
}
@@ -418,7 +418,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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 @@
+@@ -332,7 +332,7 @@ class AccessibleObject {
return 0;
}
@@ -427,7 +427,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkComponent_get_size");
AccessibleObject object = getAccessibleObject (atkObject);
OS.memmove (width, new int[] {0}, 4);
-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ class AccessibleObject {
return 0;
}
@@ -436,7 +436,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkComponent_ref_accessible_at_point: " + atkObject + " " + x + "," + y);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ class AccessibleObject {
}
}
}
@@ -445,7 +445,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -400,7 +400,7 @@
+@@ -400,7 +400,7 @@ class AccessibleObject {
return parentResult;
}
@@ -454,7 +454,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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)));
-@@ -409,7 +409,7 @@
+@@ -409,7 +409,7 @@ class AccessibleObject {
return null;
}
@@ -463,7 +463,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkHypertext_get_link");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -427,7 +427,7 @@
+@@ -427,7 +427,7 @@ class AccessibleObject {
return result != null ? result.getAccessibleObject().handle : 0;
}
}
@@ -472,7 +472,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_link != 0) {
parentResult = ATK.call (iface.get_link, atkObject, link_index);
-@@ -435,7 +435,7 @@
+@@ -435,7 +435,7 @@ class AccessibleObject {
return parentResult;
}
@@ -481,7 +481,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkHypertext_get_n_links");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -451,7 +451,7 @@
+@@ -451,7 +451,7 @@ class AccessibleObject {
return event.count;
}
}
@@ -490,7 +490,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_n_links != 0) {
parentResult = ATK.call (iface.get_n_links, atkObject);
-@@ -459,7 +459,7 @@
+@@ -459,7 +459,7 @@ class AccessibleObject {
return parentResult;
}
@@ -499,7 +499,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkHypertext_get_link_index");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ class AccessibleObject {
return event.index;
}
}
@@ -508,7 +508,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_link_index != 0) {
parentResult = ATK.call (iface.get_link_index, atkObject, char_index);
-@@ -485,16 +485,16 @@
+@@ -485,16 +485,16 @@ class AccessibleObject {
return parentResult;
}
@@ -528,7 +528,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_description != 0) {
parentResult = ATK.call (objectClass.get_description, atkObject);
-@@ -520,10 +520,10 @@
+@@ -520,10 +520,10 @@ class AccessibleObject {
return parentResult;
}
@@ -541,7 +541,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_attributes != 0) {
parentResult = ATK.call (objectClass.get_attributes, atkObject);
-@@ -541,48 +541,48 @@
+@@ -541,48 +541,48 @@ class AccessibleObject {
}
AtkAttribute attr = new AtkAttribute();
if (event.leftMargin != -1) {
@@ -550,7 +550,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.rightMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -558,7 +558,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.topMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -566,7 +566,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.topMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.bottomMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -574,7 +574,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.bottomMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.indent != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -582,7 +582,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.justify) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -590,14 +590,14 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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_list_append(parentResult, attrPtr);
+ 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) {
-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ class AccessibleObject {
if (event.attributes != null) {
int end = event.attributes.length / 2 * 2;
for (int i = 0; i < end; i+= 2) {
@@ -606,7 +606,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
-@@ -610,10 +610,10 @@
+@@ -610,10 +610,10 @@ class AccessibleObject {
return parentResult;
}
@@ -619,7 +619,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_name != 0) {
parentResult = ATK.call (objectClass.get_name, atkObject);
-@@ -639,10 +639,10 @@
+@@ -639,10 +639,10 @@ class AccessibleObject {
return parentResult;
}
@@ -632,7 +632,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_n_children != 0) {
parentResult = ATK.call (objectClass.get_n_children, atkObject);
-@@ -666,7 +666,7 @@
+@@ -666,7 +666,7 @@ class AccessibleObject {
return parentResult;
}
@@ -641,7 +641,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkObject_get_index_in_parent: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -690,12 +690,12 @@
+@@ -690,12 +690,12 @@ class AccessibleObject {
}
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_index_in_parent == 0) return 0;
@@ -656,7 +656,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkObject_get_parent: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -706,12 +706,12 @@
+@@ -706,12 +706,12 @@ class AccessibleObject {
}
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_parent == 0) return 0;
@@ -671,7 +671,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkObject_get_role: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -791,7 +791,7 @@
+@@ -791,7 +791,7 @@ class AccessibleObject {
return ATK.call (objectClass.get_role, atkObject);
}
@@ -680,7 +680,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkObject_ref_child: " + index + " of: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null && object.id == ACC.CHILDID_SELF) {
-@@ -824,10 +824,10 @@
+@@ -824,10 +824,10 @@ class AccessibleObject {
return ATK.call (objectClass.ref_child, atkObject, index);
}
@@ -693,7 +693,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.ref_state_set != 0) {
parentResult = ATK.call (objectClass.ref_state_set, atkObject);
-@@ -837,7 +837,7 @@
+@@ -837,7 +837,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleControlListeners;
int length = listeners.size();
if (length > 0) {
@@ -702,7 +702,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = object.id;
event.detail = -1;
-@@ -877,7 +877,7 @@
+@@ -877,7 +877,7 @@ class AccessibleObject {
return parentResult;
}
@@ -711,7 +711,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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)));
-@@ -886,10 +886,10 @@
+@@ -886,10 +886,10 @@ class AccessibleObject {
return null;
}
@@ -724,7 +724,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkSelectionIface iface = getSelectionIface (atkObject);
if (iface != null && iface.is_child_selected != 0) {
parentResult = ATK.call (iface.is_child_selected, atkObject, index);
-@@ -915,10 +915,10 @@
+@@ -915,10 +915,10 @@ class AccessibleObject {
return parentResult;
}
@@ -737,7 +737,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkSelectionIface iface = getSelectionIface (atkObject);
if (iface != null && iface.ref_selection != 0) {
parentResult = ATK.call (iface.ref_selection, atkObject, index);
-@@ -945,7 +945,7 @@
+@@ -945,7 +945,7 @@ class AccessibleObject {
return parentResult;
}
@@ -746,7 +746,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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)));
-@@ -954,7 +954,7 @@
+@@ -954,7 +954,7 @@ class AccessibleObject {
return null;
}
@@ -755,7 +755,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_ref_at");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -977,7 +977,7 @@
+@@ -977,7 +977,7 @@ class AccessibleObject {
}
}
}
@@ -764,7 +764,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.ref_at != 0) {
parentResult = ATK.call (iface.ref_at, atkObject, row, column);
-@@ -985,7 +985,7 @@
+@@ -985,7 +985,7 @@ class AccessibleObject {
return parentResult;
}
@@ -773,7 +773,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_index_at");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1010,7 +1010,7 @@
+@@ -1010,7 +1010,7 @@ class AccessibleObject {
return row * event.count + column;
}
}
@@ -782,7 +782,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_index_at != 0) {
parentResult = ATK.call (iface.get_index_at, atkObject, row, column);
-@@ -1018,7 +1018,7 @@
+@@ -1018,7 +1018,7 @@ class AccessibleObject {
return parentResult;
}
@@ -791,7 +791,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_column_at_index: " + atkObject + " " + index);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1031,12 +1031,12 @@
+@@ -1031,12 +1031,12 @@ class AccessibleObject {
AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
listener.getColumnCount(event);
}
@@ -806,7 +806,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_at_index != 0) {
parentResult = ATK.call (iface.get_column_at_index, atkObject, index);
-@@ -1044,7 +1044,7 @@
+@@ -1044,7 +1044,7 @@ class AccessibleObject {
return parentResult;
}
@@ -815,7 +815,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_row_at_index: " + atkObject + " " + index);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1057,12 +1057,12 @@
+@@ -1057,12 +1057,12 @@ class AccessibleObject {
AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
listener.getColumnCount(event);
}
@@ -830,7 +830,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_at_index != 0) {
parentResult = ATK.call (iface.get_row_at_index, atkObject, index);
-@@ -1070,10 +1070,10 @@
+@@ -1070,10 +1070,10 @@ class AccessibleObject {
return parentResult;
}
@@ -843,7 +843,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_n_columns != 0) {
parentResult = ATK.call (iface.get_n_columns, atkObject);
-@@ -1095,10 +1095,10 @@
+@@ -1095,10 +1095,10 @@ class AccessibleObject {
return parentResult;
}
@@ -856,7 +856,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_n_rows != 0) {
parentResult = ATK.call (iface.get_n_rows, atkObject);
-@@ -1120,10 +1120,10 @@
+@@ -1120,10 +1120,10 @@ class AccessibleObject {
return parentResult;
}
@@ -869,7 +869,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_extent_at != 0) {
parentResult = ATK.call (iface.get_column_extent_at, atkObject, row, column);
-@@ -1159,10 +1159,10 @@
+@@ -1159,10 +1159,10 @@ class AccessibleObject {
return parentResult;
}
@@ -882,7 +882,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_extent_at != 0) {
parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column);
-@@ -1198,7 +1198,7 @@
+@@ -1198,7 +1198,7 @@ class AccessibleObject {
return parentResult;
}
@@ -891,7 +891,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_caption");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1215,7 +1215,7 @@
+@@ -1215,7 +1215,7 @@ class AccessibleObject {
if (result != null) return result.getAccessibleObject().handle;
}
}
@@ -900,7 +900,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_caption != 0) {
parentResult = ATK.call (iface.get_caption, atkObject);
-@@ -1223,7 +1223,7 @@
+@@ -1223,7 +1223,7 @@ class AccessibleObject {
return parentResult;
}
@@ -909,7 +909,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_summary");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1240,7 +1240,7 @@
+@@ -1240,7 +1240,7 @@ class AccessibleObject {
if (result != null) return result.getAccessibleObject().handle;
}
}
@@ -918,7 +918,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_summary != 0) {
parentResult = ATK.call (iface.get_summary, atkObject);
-@@ -1248,10 +1248,10 @@
+@@ -1248,10 +1248,10 @@ class AccessibleObject {
return parentResult;
}
@@ -931,7 +931,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_description != 0) {
parentResult = ATK.call (iface.get_column_description, atkObject, column);
-@@ -1276,7 +1276,7 @@
+@@ -1276,7 +1276,7 @@ class AccessibleObject {
return parentResult;
}
@@ -940,7 +940,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_column_header");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1297,7 +1297,7 @@
+@@ -1297,7 +1297,7 @@ class AccessibleObject {
}
}
}
@@ -949,7 +949,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_header != 0) {
parentResult = ATK.call (iface.get_column_header, atkObject, column);
-@@ -1305,10 +1305,10 @@
+@@ -1305,10 +1305,10 @@ class AccessibleObject {
return parentResult;
}
@@ -962,7 +962,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_description != 0) {
parentResult = ATK.call (iface.get_row_description, atkObject, row);
-@@ -1333,7 +1333,7 @@
+@@ -1333,7 +1333,7 @@ class AccessibleObject {
return parentResult;
}
@@ -971,7 +971,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_row_header");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1354,7 +1354,7 @@
+@@ -1354,7 +1354,7 @@ class AccessibleObject {
}
}
}
@@ -980,7 +980,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_header != 0) {
parentResult = ATK.call (iface.get_row_header, atkObject, row);
-@@ -1362,7 +1362,7 @@
+@@ -1362,7 +1362,7 @@ class AccessibleObject {
return parentResult;
}
@@ -989,7 +989,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_selected_columns");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1376,13 +1376,13 @@
+@@ -1376,13 +1376,13 @@ class AccessibleObject {
listener.getSelectedColumns(event);
}
int count = event.selected != null ? event.selected.length : 0;
@@ -1006,7 +1006,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_selected_columns != 0) {
parentResult = ATK.call (iface.get_selected_columns, atkObject, selected);
-@@ -1390,7 +1390,7 @@
+@@ -1390,7 +1390,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1015,7 +1015,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_get_selected_rows");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1404,13 +1404,13 @@
+@@ -1404,13 +1404,13 @@ class AccessibleObject {
listener.getSelectedRows(event);
}
int count = event.selected != null ? event.selected.length : 0;
@@ -1032,7 +1032,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_selected_rows != 0) {
parentResult = ATK.call (iface.get_selected_rows, atkObject, selected);
-@@ -1418,10 +1418,10 @@
+@@ -1418,10 +1418,10 @@ class AccessibleObject {
return parentResult;
}
@@ -1045,7 +1045,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_column_selected != 0) {
parentResult = ATK.call (iface.is_column_selected, atkObject, column);
-@@ -1444,10 +1444,10 @@
+@@ -1444,10 +1444,10 @@ class AccessibleObject {
return parentResult;
}
@@ -1058,7 +1058,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_row_selected != 0) {
parentResult = ATK.call (iface.is_row_selected, atkObject, row);
-@@ -1470,10 +1470,10 @@
+@@ -1470,10 +1470,10 @@ class AccessibleObject {
return parentResult;
}
@@ -1071,7 +1071,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_selected != 0) {
parentResult = ATK.call (iface.is_selected, atkObject, row, column);
-@@ -1509,7 +1509,7 @@
+@@ -1509,7 +1509,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1080,7 +1080,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_add_row_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1526,7 +1526,7 @@
+@@ -1526,7 +1526,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1089,7 +1089,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.add_row_selection != 0) {
parentResult = ATK.call (iface.add_row_selection, atkObject, row);
-@@ -1534,7 +1534,7 @@
+@@ -1534,7 +1534,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1098,7 +1098,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_remove_row_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1551,7 +1551,7 @@
+@@ -1551,7 +1551,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1107,7 +1107,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.remove_row_selection != 0) {
parentResult = ATK.call (iface.remove_row_selection, atkObject, row);
-@@ -1559,7 +1559,7 @@
+@@ -1559,7 +1559,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1116,7 +1116,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_add_column_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1576,7 +1576,7 @@
+@@ -1576,7 +1576,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1125,7 +1125,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.add_column_selection != 0) {
parentResult = ATK.call (iface.add_column_selection, atkObject, column);
-@@ -1584,7 +1584,7 @@
+@@ -1584,7 +1584,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1134,7 +1134,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkTable_remove_column_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1601,7 +1601,7 @@
+@@ -1601,7 +1601,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1143,7 +1143,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.remove_column_selection != 0) {
parentResult = ATK.call (iface.remove_column_selection, atkObject, column);
-@@ -1609,7 +1609,7 @@
+@@ -1609,7 +1609,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1152,7 +1152,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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)));
-@@ -1618,7 +1618,7 @@
+@@ -1618,7 +1618,7 @@ class AccessibleObject {
return null;
}
@@ -1161,7 +1161,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_character_extents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1653,21 +1653,21 @@
+@@ -1653,21 +1653,21 @@ class AccessibleObject {
return 0;
}
@@ -1187,7 +1187,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_range_extents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1704,7 +1704,7 @@
+@@ -1704,7 +1704,7 @@ class AccessibleObject {
return 0;
}
@@ -1196,7 +1196,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_run_attributes");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1721,18 +1721,18 @@
+@@ -1721,18 +1721,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;
@@ -1210,7 +1210,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.underline) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -1218,8 +1218,8 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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) {
-@@ -1746,7 +1746,7 @@
- result = OS.g_list_append(result, attrPtr);
+@@ -1746,7 +1746,7 @@ class AccessibleObject {
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.strikeout) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -1227,7 +1227,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -1755,7 +1755,7 @@
+@@ -1755,7 +1755,7 @@ class AccessibleObject {
Font font = style.font;
if (font != null && !font.isDisposed()) {
//TODO language and direction
@@ -1236,7 +1236,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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));
-@@ -1794,7 +1794,7 @@
+@@ -1794,7 +1794,7 @@ class AccessibleObject {
}
Color color = style.foreground;
if (color != null && !color.isDisposed()) {
@@ -1245,7 +1245,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -1802,7 +1802,7 @@
+@@ -1802,7 +1802,7 @@ class AccessibleObject {
}
color = style.background;
if (color != null && !color.isDisposed()) {
@@ -1254,7 +1254,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -1812,7 +1812,7 @@
+@@ -1812,7 +1812,7 @@ class AccessibleObject {
if (event.attributes != null) {
int end = event.attributes.length / 2 * 2;
for (int i = 0; i < end; i+= 2) {
@@ -1263,7 +1263,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
-@@ -1822,7 +1822,7 @@
+@@ -1822,7 +1822,7 @@ class AccessibleObject {
return result;
}
}
@@ -1272,7 +1272,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -1830,7 +1830,7 @@
+@@ -1830,7 +1830,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1281,7 +1281,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_offset_at_point");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1854,7 +1854,7 @@
+@@ -1854,7 +1854,7 @@ class AccessibleObject {
return event.offset;
}
}
@@ -1290,7 +1290,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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);
-@@ -1862,7 +1862,7 @@
+@@ -1862,7 +1862,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1299,7 +1299,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_add_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1880,7 +1880,7 @@
+@@ -1880,7 +1880,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1308,7 +1308,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.add_selection != 0) {
parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset);
-@@ -1888,7 +1888,7 @@
+@@ -1888,7 +1888,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1317,7 +1317,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_remove_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1905,7 +1905,7 @@
+@@ -1905,7 +1905,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1326,7 +1326,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.remove_selection != 0) {
parentResult = ATK.call (iface.remove_selection, atkObject, selection_num);
-@@ -1913,7 +1913,7 @@
+@@ -1913,7 +1913,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1335,7 +1335,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_set_caret_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1937,7 +1937,7 @@
+@@ -1937,7 +1937,7 @@ class AccessibleObject {
return 0;
}
@@ -1344,7 +1344,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_set_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -1956,7 +1956,7 @@
+@@ -1956,7 +1956,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
@@ -1353,7 +1353,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.set_selection != 0) {
parentResult = ATK.call (iface.set_selection, atkObject, selection_num, start_offset, end_offset);
-@@ -1964,10 +1964,10 @@
+@@ -1964,10 +1964,10 @@ class AccessibleObject {
return parentResult;
}
@@ -1366,7 +1366,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_caret_offset != 0) {
parentResult = ATK.call (iface.get_caret_offset, atkObject);
-@@ -2000,7 +2000,7 @@
+@@ -2000,7 +2000,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1375,7 +1375,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_bounded_ranges");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2021,7 +2021,7 @@
+@@ -2021,7 +2021,7 @@ class AccessibleObject {
}
int [] ranges = event.ranges;
int size = ranges == null ? 1 : ranges.length / 2;
@@ -1384,7 +1384,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextRange range = new AtkTextRange();
for (int j = 0, end = (ranges != null ? ranges.length / 2 : 1); j < end; j++) {
if (ranges != null) {
-@@ -2053,7 +2053,7 @@
+@@ -2053,7 +2053,7 @@ class AccessibleObject {
return result;
}
}
@@ -1393,7 +1393,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_bounded_ranges != 0) {
parentResult = ATK.call (iface.get_bounded_ranges, atkObject);
-@@ -2061,7 +2061,7 @@
+@@ -2061,7 +2061,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1402,7 +1402,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_character_at_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2090,7 +2090,7 @@
+@@ -2090,7 +2090,7 @@ class AccessibleObject {
return 0;
}
@@ -1411,7 +1411,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_character_count");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2115,7 +2115,7 @@
+@@ -2115,7 +2115,7 @@ class AccessibleObject {
return 0;
}
@@ -1420,7 +1420,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_n_selections");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2142,7 +2142,7 @@
+@@ -2142,7 +2142,7 @@ class AccessibleObject {
if (event.length > 0) return 1;
}
}
@@ -1429,7 +1429,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_n_selections != 0) {
parentResult = ATK.call (iface.get_n_selections, atkObject);
-@@ -2150,10 +2150,10 @@
+@@ -2150,10 +2150,10 @@ class AccessibleObject {
return parentResult;
}
@@ -1442,7 +1442,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
OS.memmove (start_offset, new int[] {0}, 4);
OS.memmove (end_offset, new int[] {0}, 4);
AtkTextIface iface = getTextIface (atkObject);
-@@ -2219,7 +2219,7 @@
+@@ -2219,7 +2219,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1451,7 +1451,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_text: " + atkObject + " " + start_offset + "," + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2256,7 +2256,7 @@
+@@ -2256,7 +2256,7 @@ class AccessibleObject {
return 0;
}
@@ -1460,7 +1460,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_text_after_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2264,7 +2264,7 @@
+@@ -2264,7 +2264,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
@@ -1469,7 +1469,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = 1;
-@@ -2504,7 +2504,7 @@
+@@ -2504,7 +2504,7 @@ class AccessibleObject {
return 0;
}
@@ -1478,7 +1478,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2512,7 +2512,7 @@
+@@ -2512,7 +2512,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
@@ -1487,7 +1487,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = 0;
-@@ -2695,7 +2695,7 @@
+@@ -2695,7 +2695,7 @@ class AccessibleObject {
return 0;
}
@@ -1496,7 +1496,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkText_get_text_before_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -2703,7 +2703,7 @@
+@@ -2703,7 +2703,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
@@ -1505,7 +1505,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = -1;
-@@ -2891,7 +2891,7 @@
+@@ -2891,7 +2891,7 @@ class AccessibleObject {
return 0;
}
@@ -1514,7 +1514,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (number == null) return;
if (OS.G_VALUE_TYPE(value) != 0) OS.g_value_unset(value);
if (number instanceof Double) {
-@@ -2909,8 +2909,8 @@
+@@ -2909,8 +2909,8 @@ class AccessibleObject {
}
}
@@ -1525,7 +1525,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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));
-@@ -2918,7 +2918,7 @@
+@@ -2918,7 +2918,7 @@ class AccessibleObject {
return new Integer(OS.g_value_get_int(value));
}
@@ -1534,7 +1534,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
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)));
-@@ -2926,7 +2926,7 @@
+@@ -2926,7 +2926,7 @@ class AccessibleObject {
}
return null;
}
@@ -1543,7 +1543,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkValue_get_current_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
-@@ -2950,7 +2950,7 @@
+@@ -2950,7 +2950,7 @@ class AccessibleObject {
return 0;
}
@@ -1552,7 +1552,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkValue_get_maximum_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
-@@ -2974,7 +2974,7 @@
+@@ -2974,7 +2974,7 @@ class AccessibleObject {
return 0;
}
@@ -1561,7 +1561,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkValue_get_minimum_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
-@@ -2998,7 +2998,7 @@
+@@ -2998,7 +2998,7 @@ class AccessibleObject {
return 0;
}
@@ -1570,7 +1570,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) print ("-->atkValue_set_current_value");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
-@@ -3015,7 +3015,7 @@
+@@ -3015,7 +3015,7 @@ class AccessibleObject {
return event.value != null ? 1 : 0;
}
}
@@ -1579,7 +1579,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkValueIface iface = getValueIface (atkObject);
if (iface != null && iface.set_current_value != 0) {
parentResult = ATK.call (iface.set_current_value, atkObject, value);
-@@ -3023,7 +3023,7 @@
+@@ -3023,7 +3023,7 @@ class AccessibleObject {
return parentResult;
}
@@ -1588,7 +1588,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
if (object == null) return null;
if (object.accessible == null) return null;
-@@ -3056,9 +3056,9 @@
+@@ -3056,9 +3056,9 @@ class AccessibleObject {
String parentText = ""; //$NON-NLS-1$
AtkTextIface iface = getTextIface (handle);
if (iface != null && iface.get_character_count != 0) {
@@ -1600,7 +1600,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (parentResult != 0) {
parentText = getString (parentResult);
OS.g_free(parentResult);
-@@ -3077,10 +3077,10 @@
+@@ -3077,10 +3077,10 @@ class AccessibleObject {
return null;
}
@@ -1614,7 +1614,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
GObjectClass objectClassStruct = new GObjectClass ();
ATK.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
-@@ -3120,8 +3120,8 @@
+@@ -3120,8 +3120,8 @@ class AccessibleObject {
ATK.memmove (gtkAccessible, object.handle);
}
if (gtkAccessible.widget == 0) return;
@@ -1625,10 +1625,10 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
OS.gdk_window_get_origin (window, x, y);
}
-diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT.java
---- x86/org/eclipse/swt/awt/SWT_AWT.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/awt/SWT_AWT.java 2010-09-09 12:02:46.000000000 +0000
-@@ -64,7 +64,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/awt/SWT_AWT.java swt-gtk-3.6.2/org/eclipse/swt/awt/SWT_AWT.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/awt/SWT_AWT.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/awt/SWT_AWT.java 2011-03-21 11:34:23.295734363 +0000
+@@ -64,7 +64,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
@@ -1637,7 +1637,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
static native final void setDebug (Frame canvas, boolean debug);
static synchronized void loadLibrary () {
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ public static Frame new_Frame (final Com
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -1646,7 +1646,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
/*
* 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 @@
+@@ -200,9 +200,9 @@ public static Frame new_Frame (final Com
if (parent.isDisposed()) return;
Shell shell = parent.getShell();
loadLibrary();
@@ -1658,7 +1658,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
OS.XSetTransientForHint(OS.GDK_DISPLAY(), awtHandle, xWindow);
}
});
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,7 @@ public static Frame new_Frame (final Com
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);
@@ -1667,10 +1667,10 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
try {
loadLibrary ();
handle = getAWTHandle (parent);
-diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/swt/browser/AppFileLocProvider.java
---- x86/org/eclipse/swt/browser/AppFileLocProvider.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/AppFileLocProvider.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,7 +46,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/AppFileLocProvider.java swt-gtk-3.6.2/org/eclipse/swt/browser/AppFileLocProvider.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/AppFileLocProvider.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/AppFileLocProvider.java 2011-03-21 11:34:23.215735487 +0000
+@@ -46,7 +46,7 @@ AppFileLocProvider (String mozillaPath,
this.profilePath = profilePath + SEPARATOR_OS;
this.isXULRunner = isXULRunner;
if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$
@@ -1679,7 +1679,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsEmbedString pathString = new nsEmbedString (profilePath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -69,24 +69,24 @@
+@@ -69,24 +69,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -1716,7 +1716,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
};
}
-@@ -105,32 +105,32 @@
+@@ -105,32 +105,32 @@ void disposeCOMInterfaces () {
}
}
@@ -1755,7 +1755,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ int Release () {
/* nsIDirectoryServiceProvider2 */
@@ -1764,7 +1764,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ int getFiles (int /*long*/ prop, int /*l
if (pluginDirs == null) {
int index = 0;
/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
@@ -1773,7 +1773,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -204,9 +204,9 @@
+@@ -204,9 +204,9 @@ int getFiles (int /*long*/ prop, int /*l
propertyValues = pluginDirs;
}
@@ -1785,7 +1785,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsISupports[] files = new nsISupports [propertyValues.length];
int index = 0;
for (int i = 0; i < propertyValues.length; i++) {
-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ int getFiles (int /*long*/ prop, int /*l
SimpleEnumerator enumerator = new SimpleEnumerator (files);
enumerator.AddRef ();
@@ -1794,7 +1794,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
return XPCOM.NS_OK;
}
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ int getFiles (int /*long*/ prop, int /*l
/* nsIDirectoryServiceProvider implementation */
@@ -1803,7 +1803,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -303,9 +303,9 @@
+@@ -303,9 +303,9 @@ int getFile(int /*long*/ prop, int /*lon
}
XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */
@@ -1815,7 +1815,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsEmbedString pathString = new nsEmbedString (propertyValue);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -318,7 +318,7 @@
+@@ -318,7 +318,7 @@ int getFile(int /*long*/ prop, int /*lon
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1824,10 +1824,10 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
localFile.Release ();
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/browser/Download_1_8.java
---- x86/org/eclipse/swt/browser/Download_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/Download_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -48,97 +48,97 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Download_1_8.java swt-gtk-3.6.2/org/eclipse/swt/browser/Download_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Download_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/Download_1_8.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -1983,7 +1983,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
};
}
-@@ -161,36 +161,36 @@
+@@ -161,36 +161,36 @@ void disposeCOMInterfaces() {
}
}
@@ -2027,7 +2027,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -203,26 +203,26 @@
+@@ -203,26 +203,26 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
@@ -2059,7 +2059,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -277,60 +277,60 @@
+@@ -277,60 +277,60 @@ int Init (int /*long*/ aSource, int /*lo
return XPCOM.NS_OK;
}
@@ -2134,7 +2134,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -338,26 +338,26 @@
+@@ -338,26 +338,26 @@ int SetCancelDownloadOnClose (int aCance
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2166,7 +2166,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
-@@ -365,7 +365,7 @@
+@@ -365,7 +365,7 @@ int OnProgressChange64_32 (int /*long*/
return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
@@ -2175,7 +2175,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
long currentKBytes = aCurTotalProgress / 1024;
long totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
-@@ -378,11 +378,11 @@
+@@ -378,11 +378,11 @@ int OnProgressChange64 (int /*long*/ aWe
return XPCOM.NS_OK;
}
@@ -2189,7 +2189,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
cancelable = null;
if (shell != null && !shell.isDisposed ()) shell.dispose ();
-@@ -391,7 +391,7 @@
+@@ -391,7 +391,7 @@ int OnStateChange (int /*long*/ aWebProg
return XPCOM.NS_OK;
}
@@ -2198,10 +2198,10 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_OK;
}
}
-diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java
---- x86/org/eclipse/swt/browser/DownloadFactory_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/DownloadFactory_1_8.java swt-gtk-3.6.2/org/eclipse/swt/browser/DownloadFactory_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/DownloadFactory_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/DownloadFactory_1_8.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -2227,7 +2227,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclips
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2260,7 +2260,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclips
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
+@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
@@ -2273,10 +2273,10 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclips
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt/browser/DownloadFactory.java
---- x86/org/eclipse/swt/browser/DownloadFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/DownloadFactory.java swt-gtk-3.6.2/org/eclipse/swt/browser/DownloadFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/DownloadFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/DownloadFactory.java 2011-03-21 11:34:23.185735915 +0000
+@@ -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}) {
@@ -2302,7 +2302,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/sw
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2335,7 +2335,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/sw
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
+@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
@@ -2348,10 +2348,10 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/sw
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browser/Download.java
---- x86/org/eclipse/swt/browser/Download.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/Download.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,63 +46,63 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Download.java swt-gtk-3.6.2/org/eclipse/swt/browser/Download.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Download.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/Download.java 2011-03-21 11:34:23.165736206 +0000
+@@ -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}) {
@@ -2463,7 +2463,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
};
}
-@@ -125,36 +125,36 @@
+@@ -125,36 +125,36 @@ void disposeCOMInterfaces () {
}
}
@@ -2507,7 +2507,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -167,13 +167,13 @@
+@@ -167,13 +167,13 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
@@ -2524,7 +2524,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -186,12 +186,12 @@
+@@ -186,12 +186,12 @@ int Init (int /*long*/ aSource, int /*lo
*/
String filename = null;
nsISupports supports = new nsISupports (aTarget);
@@ -2539,7 +2539,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -205,7 +205,7 @@
+@@ -205,7 +205,7 @@ int Init (int /*long*/ aSource, int /*lo
target.Release ();
} else { /* < 1.7 */
nsILocalFile target = new nsILocalFile (aTarget);
@@ -2548,7 +2548,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
rc = target.GetNativeLeafName (aNativeTarget);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aNativeTarget);
-@@ -259,54 +259,54 @@
+@@ -259,54 +259,54 @@ int Init (int /*long*/ aSource, int /*lo
return XPCOM.NS_OK;
}
@@ -2616,7 +2616,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
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 @@
+@@ -316,11 +316,11 @@ int SetObserver (int /*long*/ aObserver)
}
/* nsIProgressDialog */
@@ -2630,7 +2630,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -328,17 +328,17 @@
+@@ -328,17 +328,17 @@ int SetCancelDownloadOnClose (int aCance
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2651,7 +2651,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
if (helperAppLauncher != null) helperAppLauncher.Release ();
helperAppLauncher = null;
-@@ -348,7 +348,7 @@
+@@ -348,7 +348,7 @@ int OnStateChange (int /*long*/ aWebProg
return XPCOM.NS_OK;
}
@@ -2660,7 +2660,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
int currentKBytes = aCurTotalProgress / 1024;
int totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
-@@ -361,15 +361,15 @@
+@@ -361,15 +361,15 @@ int OnProgressChange (int /*long*/ aWebP
return XPCOM.NS_OK;
}
@@ -2679,10 +2679,10 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_OK;
}
}
-diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/swt/browser/ExternalFactory.java
---- x86/org/eclipse/swt/browser/ExternalFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/ExternalFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/ExternalFactory.java swt-gtk-3.6.2/org/eclipse/swt/browser/ExternalFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/ExternalFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/ExternalFactory.java 2011-03-21 11:34:23.165736206 +0000
+@@ -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}) {
@@ -2708,7 +2708,7 @@ diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/sw
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2741,7 +2741,7 @@ diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/sw
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
+@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
@@ -2754,10 +2754,10 @@ diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/sw
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/browser/External.java
---- x86/org/eclipse/swt/browser/External.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/External.java 2010-09-09 12:02:46.000000000 +0000
-@@ -39,40 +39,40 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/External.java swt-gtk-3.6.2/org/eclipse/swt/browser/External.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/External.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/External.java 2011-03-21 11:34:23.205735634 +0000
+@@ -39,40 +39,40 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2823,7 +2823,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
};
}
-@@ -88,37 +88,37 @@
+@@ -88,37 +88,37 @@ void disposeCOMInterfaces () {
}
}
@@ -2868,7 +2868,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -130,8 +130,8 @@
+@@ -130,8 +130,8 @@ int Release () {
/* nsIClassInfo */
@@ -2879,7 +2879,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -147,44 +147,44 @@
+@@ -147,44 +147,44 @@ int getClassDescription (int /*long*/ _r
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
@@ -2935,7 +2935,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -199,14 +199,14 @@
+@@ -199,14 +199,14 @@ int getInterfaces (int /*long*/ count, i
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
@@ -2956,7 +2956,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
memory.Release ();
C.memmove (count, new int[] {2}, 4); /* PRUint */
-@@ -215,8 +215,8 @@
+@@ -215,8 +215,8 @@ int getInterfaces (int /*long*/ count, i
/* nsISecurityCheckedComponent */
@@ -2967,7 +2967,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -232,16 +232,16 @@
+@@ -232,16 +232,16 @@ int canCreateWrapper (int /*long*/ iid,
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
@@ -2988,7 +2988,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -266,16 +266,16 @@
+@@ -266,16 +266,16 @@ int canCallMethod (int /*long*/ iid, int
} else {
bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
}
@@ -3009,7 +3009,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -291,16 +291,16 @@
+@@ -291,16 +291,16 @@ int canGetProperty (int /*long*/ iid, in
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
@@ -3030,7 +3030,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -316,9 +316,9 @@
+@@ -316,9 +316,9 @@ int canSetProperty (int /*long*/ iid, in
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
@@ -3042,7 +3042,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
memory.Release ();
return XPCOM.NS_OK;
-@@ -344,7 +344,7 @@
+@@ -344,7 +344,7 @@ Object convertToJava (nsIVariant variant
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
return new Double (intResult[0]);
case nsIDataType.VTYPE_DOUBLE:
@@ -3051,7 +3051,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsDouble (doubleReturn);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
double[] doubleResult = new double[1];
-@@ -353,7 +353,7 @@
+@@ -353,7 +353,7 @@ Object convertToJava (nsIVariant variant
return new Double (doubleResult[0]);
case nsIDataType.VTYPE_WSTRING_SIZE_IS:
int[] size = new int[1]; /* PRInt32 */
@@ -3060,7 +3060,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsWStringWithSize (size, wString);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
char[] chars = new char[size[0]];
-@@ -361,11 +361,11 @@
+@@ -361,11 +361,11 @@ Object convertToJava (nsIVariant variant
return new String (chars);
case nsIDataType.VTYPE_ARRAY:
Object[] arrayReturn = new Object[0];
@@ -3074,7 +3074,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsArray (currentType, iid, count, ptr);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-@@ -373,7 +373,7 @@
+@@ -373,7 +373,7 @@ Object convertToJava (nsIVariant variant
XPCOM.memmove (id, iid, nsID.sizeof);
C.free (iid);
@@ -3083,7 +3083,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ Object convertToJava (nsIVariant variant
if (id.Equals (nsIVariant.NS_IVARIANT_IID)) {
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
@@ -3092,7 +3092,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
nsISupports supports = new nsISupports (arrayPtr[0]);
rc = supports.QueryInterface (nsIVariant.NS_IVARIANT_IID, result);
-@@ -444,8 +444,8 @@
+@@ -444,8 +444,8 @@ Object convertToJava (nsIVariant variant
case nsIDataType.VTYPE_WCHAR_STR:
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
@@ -3103,7 +3103,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
char[] dest = new char[length];
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ Object convertToJava (nsIVariant variant
}
nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
@@ -3112,7 +3112,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
nsIWritableVariant variant = new nsIWritableVariant (result[0]);
-@@ -507,26 +507,26 @@
+@@ -507,26 +507,26 @@ nsIVariant convertToJS (Object value, ns
rc = variant.SetAsEmptyArray ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
} else {
@@ -3143,7 +3143,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);
rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
C.free (idPtr);
-@@ -541,7 +541,7 @@
+@@ -541,7 +541,7 @@ nsIVariant convertToJS (Object value, ns
return null;
}
@@ -3152,7 +3152,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
Object key = new Integer (functionId);
BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
Object returnValue = null;
-@@ -572,7 +572,7 @@
+@@ -572,7 +572,7 @@ int callJava (int functionId, int /*long
}
}
@@ -3161,7 +3161,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -586,7 +586,7 @@
+@@ -586,7 +586,7 @@ int callJava (int functionId, int /*long
variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
}
componentManager.Release ();
@@ -3170,10 +3170,10 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/browser/FilePicker_1_8.java
---- x86/org/eclipse/swt/browser/FilePicker_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/FilePicker_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,30 +17,30 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePicker_1_8.java swt-gtk-3.6.2/org/eclipse/swt/browser/FilePicker_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePicker_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/FilePicker_1_8.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -3225,7 +3225,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt
};
}
-@@ -49,10 +49,10 @@
+@@ -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.
*/
@@ -3238,10 +3238,10 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
return new String (chars);
-diff -urN x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java
---- x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -18,26 +18,26 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePickerFactory_1_8.java swt-gtk-3.6.2/org/eclipse/swt/browser/FilePickerFactory_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePickerFactory_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2011-03-21 11:34:23.165736206 +0000
+@@ -18,26 +18,26 @@ class FilePickerFactory_1_8 extends File
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -3278,10 +3278,10 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/ecli
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/swt/browser/FilePickerFactory.java
---- x86/org/eclipse/swt/browser/FilePickerFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePickerFactory.java swt-gtk-3.6.2/org/eclipse/swt/browser/FilePickerFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePickerFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/FilePickerFactory.java 2011-03-21 11:34:23.185735915 +0000
+@@ -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}) {
@@ -3307,7 +3307,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -3340,7 +3340,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
+@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
@@ -3353,10 +3353,10 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/browser/FilePicker.java
---- x86/org/eclipse/swt/browser/FilePicker.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/FilePicker.java 2010-09-09 12:02:46.000000000 +0000
-@@ -21,7 +21,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePicker.java swt-gtk-3.6.2/org/eclipse/swt/browser/FilePicker.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/FilePicker.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/FilePicker.java 2011-03-21 11:34:23.205735634 +0000
+@@ -21,7 +21,7 @@ class FilePicker {
int refCount = 0;
short mode;
@@ -3365,7 +3365,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
String[] files, masks;
String defaultFilename, directory, title;
-@@ -39,30 +39,30 @@
+@@ -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}) {
@@ -3417,7 +3417,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
};
}
-@@ -77,32 +77,32 @@
+@@ -77,32 +77,32 @@ void disposeCOMInterfaces () {
}
}
@@ -3456,7 +3456,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ int Release () {
return refCount;
}
@@ -3465,7 +3465,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
if (aDOMWindow == 0) return null;
nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
return Mozilla.findBrowser (window);
-@@ -123,20 +123,20 @@
+@@ -123,20 +123,20 @@ Browser getBrowser (int /*long*/ aDOMWin
* answers a java string based on the type of string that is appropriate for the Mozilla
* version being used.
*/
@@ -3489,7 +3489,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
if (mode == nsIFilePicker.modeGetFolder) {
/* picking a directory */
int result = showDirectoryPicker ();
-@@ -186,20 +186,20 @@
+@@ -186,20 +186,20 @@ int showDirectoryPicker () {
return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
}
@@ -3514,7 +3514,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -208,13 +208,13 @@
+@@ -208,13 +208,13 @@ int GetFile (int /*long*/ aFile) {
return XPCOM.NS_OK;
}
@@ -3531,7 +3531,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
XPCOM.nsEmbedCString_delete (pathname);
-@@ -223,10 +223,10 @@
+@@ -223,10 +223,10 @@ int SetDisplayDirectory (int /*long*/ aD
return XPCOM.NS_OK;
}
@@ -3544,7 +3544,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -239,31 +239,31 @@
+@@ -239,31 +239,31 @@ int SetFilterIndex (int aFilterIndex) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -3582,10 +3582,10 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,17 +38,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2011-03-21 11:34:23.175736057 +0000
+@@ -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}) {
@@ -3611,7 +3611,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
};
}
-@@ -63,27 +63,27 @@
+@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
@@ -3644,7 +3644,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -102,12 +102,12 @@
+@@ -102,12 +102,12 @@ int Release () {
/* nsIHelperAppLauncherDialog */
@@ -3659,7 +3659,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
char[] dest = new char[length];
XPCOM.memmove (dest, aDefaultFileName, length * 2);
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ int PromptForSaveToFile (int /*long*/ aL
return XPCOM.NS_ERROR_FAILURE;
}
nsEmbedString path = new nsEmbedString (name);
@@ -3668,10 +3668,10 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2011-03-21 11:34:23.175736057 +0000
+@@ -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}) {
@@ -3697,7 +3697,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -3730,7 +3730,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,15 +87,15 @@
+@@ -87,15 +87,15 @@ int Release () {
/* nsIFactory */
@@ -3749,10 +3749,10 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
}
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,17 +38,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialog.java swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/HelperAppLauncherDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -3778,7 +3778,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
};
}
-@@ -63,27 +63,27 @@
+@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
@@ -3811,7 +3811,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -102,14 +102,14 @@
+@@ -102,14 +102,14 @@ int Release () {
/* nsIHelperAppLauncherDialog */
@@ -3828,7 +3828,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
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 @@
+@@ -121,8 +121,8 @@ int Show (int /*long*/ aLauncher, int /*
return helperAppLauncher.SaveToDisk (0, 0);
}
@@ -3839,7 +3839,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
boolean hasLauncher = false;
/*
-@@ -140,7 +140,7 @@
+@@ -140,7 +140,7 @@ int PromptForSaveToFile (int /*long*/ ar
*/
boolean using_1_8 = false;
nsISupports support = new nsISupports (arg0);
@@ -3848,10 +3848,10 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc == XPCOM.NS_OK) {
using_1_8 = true;
-diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/browser/InputStream.java
---- x86/org/eclipse/swt/browser/InputStream.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/InputStream.java 2010-09-09 12:02:46.000000000 +0000
-@@ -34,14 +34,14 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/InputStream.java swt-gtk-3.6.2/org/eclipse/swt/browser/InputStream.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/InputStream.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/InputStream.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -3874,7 +3874,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
};
}
-@@ -52,26 +52,26 @@
+@@ -52,26 +52,26 @@ void disposeCOMInterfaces () {
}
}
@@ -3906,7 +3906,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -89,13 +89,13 @@
+@@ -89,13 +89,13 @@ int Close () {
return XPCOM.NS_OK;
}
@@ -3922,7 +3922,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);
if (max > 0) {
byte[] src = new byte[max];
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ int Read(int /*long*/ aBuf, int aCount,
return XPCOM.NS_OK;
}
@@ -3931,7 +3931,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
int max = buffer == null ? 0 : buffer.length - index;
if (aCount != -1) {
max = Math.min (max, aCount);
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ int ReadSegments (int /*long*/ aWriter,
int cnt = max;
while (cnt > 0) {
int[] aWriteCount = new int[1];
@@ -3940,7 +3940,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
if (rc != XPCOM.NS_OK) break;
index += aWriteCount[0];
cnt -= aWriteCount[0];
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ int ReadSegments (int /*long*/ aWriter,
return XPCOM.NS_OK;
}
@@ -3949,10 +3949,10 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
/* blocking */
XPCOM.memmove (_retval, new int[] {0}, 4);
return XPCOM.NS_OK;
-diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt/browser/MozillaDelegate.java
---- x86/org/eclipse/swt/browser/MozillaDelegate.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/MozillaDelegate.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,11 +19,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/MozillaDelegate.java swt-gtk-3.6.2/org/eclipse/swt/browser/MozillaDelegate.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/MozillaDelegate.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/MozillaDelegate.java 2011-03-21 11:34:23.165736206 +0000
+@@ -19,11 +19,11 @@ import org.eclipse.swt.widgets.*;
class MozillaDelegate {
Browser browser;
@@ -3966,7 +3966,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
static final int STOP_PROPOGATE = 1;
static boolean IsSparc;
-@@ -47,8 +47,8 @@
+@@ -47,8 +47,8 @@ MozillaDelegate (Browser browser) {
this.browser = browser;
}
@@ -3977,7 +3977,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
parent = OS.gtk_widget_get_parent (parent);
if (parent == 0) return 0;
Widget widget = Display.getCurrent ().findWidget (parent);
-@@ -58,12 +58,12 @@
+@@ -58,12 +58,12 @@ static int /*long*/ eventProc (int /*lon
return 0;
}
@@ -3992,7 +3992,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
Display display = Display.getCurrent ();
return (Browser)display.findWidget (parent);
}
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ int createBaseWindow (nsIBaseWindow base
return baseWindow.Create ();
}
@@ -4001,7 +4001,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
* handle causes problems with some Mozilla plug-ins. For some
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ String getSWTInitLibraryName () {
return "swt-xpcominit"; //$NON-NLS-1$
}
@@ -4010,7 +4010,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
if (event.type == OS.GDK_BUTTON_PRESS) {
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ void init () {
* forward the event to the parent embedder before Mozilla received and consumed
* them.
*/
@@ -4019,7 +4019,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
if (list != 0) {
mozillaHandle = OS.g_list_data (list);
OS.g_list_free (list);
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ boolean needsSpinup () {
return true;
}
@@ -4028,7 +4028,7 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
if (listener != null) {
browser.getDisplay ().removeFilter (SWT.FocusIn, listener);
browser.getShell ().removeListener (SWT.Deactivate, listener);
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ boolean sendTraverse () {
return true;
}
@@ -4037,10 +4037,10 @@ diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/sw
OS.gtk_widget_set_size_request (embedHandle, width, height);
}
-diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser/Mozilla.java
---- x86/org/eclipse/swt/browser/Mozilla.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/Mozilla.java 2010-09-09 12:02:46.000000000 +0000
-@@ -23,7 +23,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Mozilla.java swt-gtk-3.6.2/org/eclipse/swt/browser/Mozilla.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/Mozilla.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/Mozilla.java 2011-03-21 11:34:23.205735634 +0000
+@@ -23,7 +23,7 @@ import org.eclipse.swt.internal.mozilla.
import org.eclipse.swt.layout.*;
class Mozilla extends WebBrowser {
@@ -4049,7 +4049,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebBrowser webBrowser;
Object webBrowserObject;
MozillaDelegate delegate;
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ class Mozilla extends WebBrowser {
int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
int registerFunctionsOnState = 0;
int refCount, lastKeyCode, lastCharCode, authCount;
@@ -4058,7 +4058,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
Point location, size;
boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
boolean updateLastNavigateUrl;
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ class Mozilla extends WebBrowser {
public void handleEvent (Event event) {
if (BrowserCount > 0) return; /* another display is still active */
@@ -4067,7 +4067,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -182,18 +182,18 @@
+@@ -182,18 +182,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 */
@@ -4089,7 +4089,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
// result[0] = 0;
// C.free (functionLoad.function);
// C.free (functionLoad.functionName);
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ class Mozilla extends WebBrowser {
boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null;
if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return;
@@ -4098,7 +4098,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] buffer = new byte[1];
int rc = prefService.GetBranch (buffer, result); /* empty buffer denotes root preference level */
if (rc != XPCOM.NS_OK) error (rc);
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ class Mozilla extends WebBrowser {
MozillaClearSessions = new Runnable () {
public void run () {
if (!Initialized) return;
@@ -4107,7 +4107,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -350,9 +350,9 @@
+@@ -350,9 +350,9 @@ class Mozilla extends WebBrowser {
rc = cookie.GetExpires (expires);
if (expires[0] == 0) {
/* indicates a session cookie */
@@ -4120,7 +4120,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
cookie.GetHost (domain);
cookie.GetName (name);
cookie.GetPath (path);
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -4129,7 +4129,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -389,7 +389,7 @@
+@@ -389,7 +389,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -4138,7 +4138,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -403,7 +403,7 @@
+@@ -403,7 +403,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);
@@ -4147,7 +4147,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (rc == XPCOM.NS_OK && result[0] != 0) {
nsICookieService cookieService = new nsICookieService (result[0]);
result[0] = 0;
-@@ -478,7 +478,7 @@
+@@ -478,7 +478,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -4156,7 +4156,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -492,7 +492,7 @@
+@@ -492,7 +492,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -4165,7 +4165,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -532,7 +532,7 @@
+@@ -532,7 +532,7 @@ public boolean create (Composite parent,
delegate = new MozillaDelegate (browser);
final Display display = parent.getDisplay ();
@@ -4174,7 +4174,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (!Initialized) {
boolean initLoaded = false;
boolean isXULRunner = false;
-@@ -604,7 +604,7 @@
+@@ -604,7 +604,7 @@ public boolean create (Composite parent,
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 */
@@ -4183,7 +4183,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (ptr == 0) {
isXULRunner = false;
} else {
-@@ -937,7 +937,7 @@
+@@ -937,7 +937,7 @@ public boolean create (Composite parent,
public boolean back () {
htmlBytes = null;
@@ -4192,7 +4192,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -967,122 +967,122 @@
+@@ -967,122 +967,122 @@ public boolean close () {
void createCOMInterfaces () {
// Create each of the interfaces that this object implements
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -4395,7 +4395,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
};
}
-@@ -1161,7 +1161,7 @@
+@@ -1161,7 +1161,7 @@ public boolean execute (String script) {
* workaround is to invoke the javascript handler directly via C++, which is
* exposed as of mozilla 1.9.
*/
@@ -4404,7 +4404,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (!IsPre_1_9) {
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1212,12 +1212,12 @@
+@@ -1212,12 +1212,12 @@ public boolean execute (String script) {
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -4420,7 +4420,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
new nsISupports (scriptGlobalObject).Release ();
if (scriptContext != 0 && globalJSObject != 0) {
-@@ -1234,7 +1234,7 @@
+@@ -1234,7 +1234,7 @@ public boolean execute (String script) {
new nsISupports (result[0]).Release ();
result[0] = 0;
@@ -4429,7 +4429,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (nativeContext != 0) {
int length = script.length ();
char[] scriptChars = new char[length];
-@@ -1242,7 +1242,7 @@
+@@ -1242,7 +1242,7 @@ 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) {
@@ -4438,7 +4438,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
principal.Release ();
if (pathBytes_JSEvaluateUCScriptForPrincipals == null) {
-@@ -1297,12 +1297,12 @@
+@@ -1297,12 +1297,12 @@ public boolean execute (String script) {
return rc == XPCOM.NS_OK;
}
@@ -4453,7 +4453,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -1321,7 +1321,7 @@
+@@ -1321,7 +1321,7 @@ static Browser findBrowser (nsIDOMWindow
rc = aDOMWindow.GetTop (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -4462,7 +4462,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -1349,7 +1349,7 @@
+@@ -1349,7 +1349,7 @@ static Browser findBrowser (nsIDOMWindow
public boolean forward () {
htmlBytes = null;
@@ -4471,7 +4471,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -1369,7 +1369,7 @@
+@@ -1369,7 +1369,7 @@ static String getMozillaPath () {
if (LocationProvider != null) return LocationProvider.mozillaPath;
if (!Initialized) return "";
@@ -4480,7 +4480,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1399,11 +1399,11 @@
+@@ -1399,11 +1399,11 @@ static String getMozillaPath () {
nsIFile mozillaDir = new nsIFile (result[0]);
result[0] = 0;
@@ -4494,7 +4494,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
buffer = new byte[length];
XPCOM.memmove (buffer, ptr, length);
XPCOM.nsEmbedCString_delete (path);
-@@ -1417,7 +1417,7 @@
+@@ -1417,7 +1417,7 @@ int getNextFunctionIndex () {
}
public String getText () {
@@ -4503,7 +4503,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1429,7 +1429,7 @@
+@@ -1429,7 +1429,7 @@ public String getText () {
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
@@ -4512,7 +4512,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1446,12 +1446,12 @@
+@@ -1446,12 +1446,12 @@ public String getText () {
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
@@ -4527,7 +4527,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
-@@ -1476,13 +1476,13 @@
+@@ -1476,13 +1476,13 @@ public String getText () {
}
public String getUrl () {
@@ -4543,7 +4543,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
-@@ -1490,11 +1490,11 @@
+@@ -1490,11 +1490,11 @@ public String getUrl () {
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
@@ -4557,7 +4557,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -1546,20 +1546,20 @@
+@@ -1546,20 +1546,20 @@ public Object getWebBrowser () {
String initDiscoverXULRunner () {
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
@@ -4582,7 +4582,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);
/*
-@@ -1616,7 +1616,7 @@
+@@ -1616,7 +1616,7 @@ void initExternal (String profilePath) {
}
void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
@@ -4591,7 +4591,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
PromptService2Factory factory = new PromptService2Factory ();
factory.AddRef ();
-@@ -1728,7 +1728,7 @@
+@@ -1728,7 +1728,7 @@ void initJavaXPCOM (String mozillaPath)
String initMozilla (String mozillaPath) {
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -4600,7 +4600,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -1775,7 +1775,7 @@
+@@ -1775,7 +1775,7 @@ String initMozilla (String mozillaPath)
}
void initXPCOM (String mozillaPath, boolean isXULRunner) {
@@ -4609,7 +4609,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-@@ -1794,18 +1794,18 @@
+@@ -1794,18 +1794,18 @@ void initXPCOM (String mozillaPath, bool
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -4631,7 +4631,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -1830,7 +1830,7 @@
+@@ -1830,7 +1830,7 @@ void initXPCOM (String mozillaPath, bool
}
void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
@@ -4640,7 +4640,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* As a result of using a common profile the user cannot change their locale
-@@ -2197,7 +2197,7 @@
+@@ -2197,7 +2197,7 @@ void initPreferences (nsIServiceManager
}
void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
@@ -4649,7 +4649,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result);
-@@ -2232,18 +2232,18 @@
+@@ -2232,18 +2232,18 @@ void initProfile (nsIServiceManager serv
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -4671,7 +4671,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -2261,7 +2261,7 @@
+@@ -2261,7 +2261,7 @@ void initProfile (nsIServiceManager serv
void initSpinup (nsIComponentManager componentManager) {
if (delegate.needsSpinup ()) {
@@ -4680,7 +4680,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/* 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);
-@@ -2298,7 +2298,7 @@
+@@ -2298,7 +2298,7 @@ void initWebBrowserWindows () {
error (rc);
}
@@ -4689,7 +4689,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) {
browser.dispose ();
-@@ -2341,7 +2341,7 @@
+@@ -2341,7 +2341,7 @@ void initWindowCreator (nsIServiceManage
WindowCreator = new WindowCreator2 ();
WindowCreator.AddRef ();
@@ -4698,7 +4698,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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) {
-@@ -2385,7 +2385,7 @@
+@@ -2385,7 +2385,7 @@ String initXULRunner (String mozillaPath
return mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
}
public boolean isBackEnabled () {
@@ -4707,7 +4707,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2398,7 +2398,7 @@
+@@ -2398,7 +2398,7 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
@@ -4716,7 +4716,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2436,7 +2436,7 @@
+@@ -2436,7 +2436,7 @@ void onDispose (Display display) {
unhookDOMListeners ();
@@ -4725,7 +4725,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2481,7 +2481,7 @@
+@@ -2481,7 +2481,7 @@ void onDispose (Display display) {
}
void Activate () {
@@ -4734,7 +4734,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2493,7 +2493,7 @@
+@@ -2493,7 +2493,7 @@ void Activate () {
}
void Deactivate () {
@@ -4743,7 +4743,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2509,7 +2509,7 @@
+@@ -2509,7 +2509,7 @@ void onResize () {
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
@@ -4752,7 +4752,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2524,7 +2524,7 @@
+@@ -2524,7 +2524,7 @@ void onResize () {
public void refresh () {
htmlBytes = null;
@@ -4761,7 +4761,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2594,7 +2594,7 @@
+@@ -2594,7 +2594,7 @@ public boolean setText (String html, boo
*/
delegate.removeWindowSubclass ();
@@ -4770,7 +4770,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
/*
-@@ -2628,9 +2628,9 @@
+@@ -2628,9 +2628,9 @@ public boolean setText (String html, boo
webNavigation.Release ();
} else {
byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false); //$NON-NLS-1$
@@ -4782,7 +4782,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2650,7 +2650,7 @@
+@@ -2650,7 +2650,7 @@ public boolean setText (String html, boo
} else {
aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
}
@@ -4791,7 +4791,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2695,7 +2695,7 @@
+@@ -2695,7 +2695,7 @@ public boolean setText (String html, boo
public boolean setUrl (String url, String postData, String[] headers) {
htmlBytes = null;
@@ -4800,7 +4800,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2780,7 +2780,7 @@
+@@ -2780,7 +2780,7 @@ public boolean setUrl (String url, Strin
public void stop () {
htmlBytes = null;
@@ -4809,7 +4809,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
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);
-@@ -2839,7 +2839,7 @@
+@@ -2839,7 +2839,7 @@ void hookDOMListeners (nsIDOMEventTarget
}
void unhookDOMListeners () {
@@ -4818,7 +4818,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2930,73 +2930,73 @@
+@@ -2930,73 +2930,73 @@ void unhookDOMListeners (nsIDOMEventTarg
/* nsISupports */
@@ -4906,7 +4906,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -3013,18 +3013,18 @@
+@@ -3013,18 +3013,18 @@ int Release () {
/* nsIWeakReference */
@@ -4928,7 +4928,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3034,15 +3034,15 @@
+@@ -3034,15 +3034,15 @@ int GetInterface (int /*long*/ riid, int
return QueryInterface (riid, ppvObject);
}
@@ -4947,7 +4947,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
registerFunctionsOnState = 0;
Enumeration elements = functions.elements ();
-@@ -3071,11 +3071,11 @@
+@@ -3071,11 +3071,11 @@ int OnStateChange (int /*long*/ aWebProg
*/
if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
nsIRequest request = new nsIRequest (aRequest);
@@ -4961,7 +4961,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
-@@ -3086,7 +3086,7 @@
+@@ -3086,7 +3086,7 @@ int OnStateChange (int /*long*/ aWebProg
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
@@ -4970,7 +4970,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* When navigating to a site that is known to have a bad certificate, request notification
-@@ -3132,7 +3132,7 @@
+@@ -3132,7 +3132,7 @@ int OnStateChange (int /*long*/ aWebProg
* received for every window in a page, which is when these listeners
* are typically added.
*/
@@ -4979,7 +4979,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3174,11 +3174,11 @@
+@@ -3174,11 +3174,11 @@ int OnStateChange (int /*long*/ aWebProg
*/
if (htmlBytes != null) {
nsIRequest req = new nsIRequest (aRequest);
@@ -4993,7 +4993,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String url = new String (dest);
-@@ -3211,7 +3211,7 @@
+@@ -3211,7 +3211,7 @@ int OnStateChange (int /*long*/ aWebProg
} else {
aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
}
@@ -5002,7 +5002,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3229,7 +3229,7 @@
+@@ -3229,7 +3229,7 @@ int OnStateChange (int /*long*/ aWebProg
result[0] = 0;
byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
@@ -5011,7 +5011,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = stream.OpenStream (uri.getAddress (), aContentType);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3251,11 +3251,11 @@
+@@ -3251,11 +3251,11 @@ int OnStateChange (int /*long*/ aWebProg
*/
registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
@@ -5025,7 +5025,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
for (int i = 0; i < pageCount; i++) {
length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
if (length > 0) {
-@@ -3339,7 +3339,7 @@
+@@ -3339,7 +3339,7 @@ int OnStateChange (int /*long*/ aWebProg
} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
if (updateLastNavigateUrl) {
updateLastNavigateUrl = false;
@@ -5034,7 +5034,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIRequest request = new nsIRequest (aRequest);
int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
-@@ -3354,11 +3354,11 @@
+@@ -3354,11 +3354,11 @@ int OnStateChange (int /*long*/ aWebProg
nsIURI uri = new nsIURI (result[0]);
result[0] = 0;
@@ -5048,7 +5048,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
lastNavigateURL = new String (bytes);
-@@ -3370,7 +3370,7 @@
+@@ -3370,7 +3370,7 @@ int OnStateChange (int /*long*/ aWebProg
* Hook DOM listeners to the page's nsIDOMWindow here because this is
* the earliest opportunity to do so.
*/
@@ -5057,7 +5057,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3409,7 +3409,7 @@
+@@ -3409,7 +3409,7 @@ int OnStateChange (int /*long*/ aWebProg
return XPCOM.NS_OK;
}
@@ -5066,7 +5066,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
-@@ -3422,7 +3422,7 @@
+@@ -3422,7 +3422,7 @@ int OnProgressChange (int /*long*/ aWebP
return XPCOM.NS_OK;
}
@@ -5075,7 +5075,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* 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
-@@ -3437,13 +3437,13 @@
+@@ -3437,13 +3437,13 @@ int OnLocationChange (int /*long*/ aWebP
if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
@@ -5091,7 +5091,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domWindow.GetTop (aTop);
if (rc != XPCOM.NS_OK) error (rc);
if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3453,10 +3453,10 @@
+@@ -3453,10 +3453,10 @@ int OnLocationChange (int /*long*/ aWebP
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
@@ -5104,7 +5104,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -3493,7 +3493,7 @@
+@@ -3493,7 +3493,7 @@ int OnLocationChange (int /*long*/ aWebP
return XPCOM.NS_OK;
}
@@ -5113,7 +5113,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3508,13 +3508,13 @@
+@@ -3508,13 +3508,13 @@ int OnStatusChange (int /*long*/ aWebPro
return XPCOM.NS_OK;
}
@@ -5129,7 +5129,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3530,8 +3530,8 @@
+@@ -3530,8 +3530,8 @@ int SetStatus (int statusType, int /*lon
return XPCOM.NS_OK;
}
@@ -5140,7 +5140,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
-@@ -3540,13 +3540,13 @@
+@@ -3540,13 +3540,13 @@ int GetWebBrowser (int /*long*/ aWebBrow
return XPCOM.NS_OK;
}
@@ -5156,7 +5156,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-@@ -3586,7 +3586,7 @@
+@@ -3586,7 +3586,7 @@ int SizeBrowserTo (int aCX, int aCY) {
}
int ShowAsModal () {
@@ -5165,7 +5165,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3616,7 +3616,7 @@
+@@ -3616,7 +3616,7 @@ int ShowAsModal () {
return XPCOM.NS_OK;
}
@@ -5174,7 +5174,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0;
XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -3642,7 +3642,7 @@
+@@ -3642,7 +3642,7 @@ int SetDimensions (int flags, int x, int
return XPCOM.NS_OK;
}
@@ -5183,7 +5183,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
Point location = browser.getShell ().getLocation ();
if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
-@@ -3662,7 +3662,7 @@
+@@ -3662,7 +3662,7 @@ int GetDimensions (int flags, int /*long
}
int SetFocus () {
@@ -5192,7 +5192,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3680,7 +3680,7 @@
+@@ -3680,7 +3680,7 @@ int SetFocus () {
return XPCOM.NS_OK;
}
@@ -5201,7 +5201,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -3725,11 +3725,11 @@
+@@ -3723,11 +3723,11 @@ int SetVisibility (int aVisibility) {
return XPCOM.NS_OK;
}
@@ -5215,7 +5215,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
-@@ -3753,7 +3753,7 @@
+@@ -3751,7 +3751,7 @@ int SetTitle (int /*long*/ aTitle) {
return XPCOM.NS_OK;
}
@@ -5224,7 +5224,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* Note. The handle is expected to be an HWND on Windows and
* a GtkWidget* on GTK. This callback is invoked on Windows
-@@ -3761,7 +3761,7 @@
+@@ -3759,7 +3759,7 @@ int GetSiteWindow (int /*long*/ aSiteWin
* dialog comes up. If no handle is returned, the print dialog
* does not come up on this platform.
*/
@@ -5233,7 +5233,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_OK;
}
-@@ -3801,9 +3801,9 @@
+@@ -3799,9 +3799,9 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
@@ -5245,7 +5245,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3833,15 +3833,15 @@
+@@ -3831,15 +3831,15 @@ int OnShowContextMenu (int aContextFlags
/* nsIURIContentListener */
@@ -5264,7 +5264,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
-@@ -3897,7 +3897,7 @@
+@@ -3895,7 +3895,7 @@ int OnStartURIOpen (int /*long*/ aURI, i
if (jsEnabledChanged) {
jsEnabledChanged = false;
@@ -5273,7 +5273,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3916,11 +3916,11 @@
+@@ -3914,11 +3914,11 @@ int OnStartURIOpen (int /*long*/ aURI, i
return XPCOM.NS_OK;
}
@@ -5287,7 +5287,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
-@@ -3931,7 +3931,7 @@
+@@ -3929,7 +3929,7 @@ int IsPreferred (int /*long*/ aContentTy
/* 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 */
@@ -5296,7 +5296,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3943,7 +3943,7 @@
+@@ -3941,7 +3941,7 @@ int IsPreferred (int /*long*/ aContentTy
rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);
if (rc == XPCOM.NS_OK) {
byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, false);
@@ -5305,7 +5305,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
-@@ -3973,34 +3973,34 @@
+@@ -3971,34 +3971,34 @@ int IsPreferred (int /*long*/ aContentTy
XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */
if (preferred) {
@@ -5347,7 +5347,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
-@@ -4038,21 +4038,21 @@
+@@ -4036,21 +4036,21 @@ int OnHideTooltip () {
/* nsIDOMEventListener */
@@ -5373,7 +5373,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4069,7 +4069,7 @@
+@@ -4067,7 +4067,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
@@ -5382,7 +5382,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4177,7 +4177,7 @@
+@@ -4175,7 +4175,7 @@ int HandleEvent (int /*long*/ event) {
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
@@ -5391,7 +5391,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4233,7 +4233,7 @@
+@@ -4231,7 +4231,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
@@ -5400,7 +5400,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4290,7 +4290,7 @@
+@@ -4288,7 +4288,7 @@ int HandleEvent (int /*long*/ event) {
/* mouse event */
@@ -5409,7 +5409,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4407,10 +4407,10 @@
+@@ -4405,10 +4405,10 @@ int HandleEvent (int /*long*/ event) {
/* nsIBadCertListener2 */
@@ -5422,7 +5422,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
final String urlPort = new String (dest);
-@@ -4420,7 +4420,7 @@
+@@ -4418,7 +4418,7 @@ int NotifyCertProblem (int /*long*/ sock
/* create text descriptions of the certificate problem(s) */
@@ -5431,7 +5431,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsISupports supports = new nsISupports (status);
int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -4440,7 +4440,7 @@
+@@ -4438,7 +4438,7 @@ int NotifyCertProblem (int /*long*/ sock
rc = sslStatus.GetIsDomainMismatch (intResult);
if (intResult[0] != 0) {
@@ -5440,7 +5440,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = cert.GetCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4463,7 +4463,7 @@
+@@ -4461,7 +4461,7 @@ int NotifyCertProblem (int /*long*/ sock
nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
result[0] = 0;
@@ -5449,7 +5449,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = validity.GetNotBeforeGMT (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4492,7 +4492,7 @@
+@@ -4490,7 +4490,7 @@ int NotifyCertProblem (int /*long*/ sock
rc = sslStatus.GetIsUntrusted (intResult);
if (intResult[0] != 0) {
@@ -5458,7 +5458,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = cert.GetIssuerCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4522,7 +4522,7 @@
+@@ -4520,7 +4520,7 @@ int NotifyCertProblem (int /*long*/ sock
String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
@@ -5467,7 +5467,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4538,7 +4538,7 @@
+@@ -4536,7 +4536,7 @@ int NotifyCertProblem (int /*long*/ sock
nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
result[0] = 0;
byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
@@ -5476,10 +5476,10 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
browser.setUrl (url);
XPCOM.nsEmbedCString_delete (hostString);
-diff -urN x86/org/eclipse/swt/browser/PromptDialog.java x86_64/org/eclipse/swt/browser/PromptDialog.java
---- x86/org/eclipse/swt/browser/PromptDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/PromptDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -141,7 +141,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptDialog.java swt-gtk-3.6.2/org/eclipse/swt/browser/PromptDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/PromptDialog.java 2011-03-21 11:34:23.175736057 +0000
+@@ -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) {
@@ -5488,10 +5488,10 @@ diff -urN x86/org/eclipse/swt/browser/PromptDialog.java x86_64/org/eclipse/swt/b
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclipse/swt/browser/PromptService2Factory.java
---- x86/org/eclipse/swt/browser/PromptService2Factory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/PromptService2Factory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,17 +30,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptService2Factory.java swt-gtk-3.6.2/org/eclipse/swt/browser/PromptService2Factory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptService2Factory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/PromptService2Factory.java 2011-03-21 11:34:23.205735634 +0000
+@@ -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}) {
@@ -5517,7 +5517,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/ecli
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -5550,7 +5550,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/ecli
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
+@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
@@ -5563,10 +5563,10 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/ecli
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/browser/PromptService2.java
---- x86/org/eclipse/swt/browser/PromptService2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/PromptService2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,41 +44,41 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptService2.java swt-gtk-3.6.2/org/eclipse/swt/browser/PromptService2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/PromptService2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/PromptService2.java 2011-03-21 11:34:23.215735487 +0000
+@@ -44,41 +44,41 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -5637,7 +5637,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
};
}
-@@ -97,32 +97,32 @@
+@@ -97,32 +97,32 @@ void disposeCOMInterfaces () {
}
}
@@ -5676,7 +5676,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -132,13 +132,13 @@
+@@ -132,13 +132,13 @@ int Release () {
return refCount;
}
@@ -5692,7 +5692,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
String label = null;
int flag = (buttonFlag & (0xff * index)) / index;
switch (flag) {
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ String getLabel (int buttonFlag, int ind
/* nsIPromptService */
@@ -5701,7 +5701,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
final Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -199,7 +199,7 @@
+@@ -199,7 +199,7 @@ int Alert (int /*long*/ aParent, int /*l
return XPCOM.NS_OK;
}
@@ -5710,7 +5710,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -226,11 +226,11 @@
+@@ -226,11 +226,11 @@ int AlertCheck (int /*long*/ aParent, in
return XPCOM.NS_OK;
}
@@ -5724,7 +5724,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
-@@ -258,11 +258,11 @@
+@@ -258,11 +258,11 @@ int Confirm (int /*long*/ aParent, int /
return XPCOM.NS_OK;
}
@@ -5738,7 +5738,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ int ConfirmEx (int /*long*/ aParent, int
return XPCOM.NS_OK;
}
@@ -5747,7 +5747,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
String titleLabel = null, textLabel, checkLabel = null;
String[] valueLabel = new String[1];
-@@ -322,7 +322,7 @@
+@@ -322,7 +322,7 @@ int Prompt (int /*long*/ aParent, int /*
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
@@ -5756,7 +5756,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (valueAddr[0]);
-@@ -353,7 +353,7 @@
+@@ -353,7 +353,7 @@ int Prompt (int /*long*/ aParent, int /*
* value that we override must be freed using the nsIMemory service.
*/
if (valueLabel[0] != null) {
@@ -5765,7 +5765,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
int rc = XPCOM.NS_GetServiceManager (result2);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-@@ -373,9 +373,9 @@
+@@ -373,9 +373,9 @@ int Prompt (int /*long*/ aParent, int /*
char[] buffer = new char[cnt + 1];
valueLabel[0].getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
@@ -5777,7 +5777,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
if (valueAddr[0] != 0) {
memory.Free (valueAddr[0]);
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ int Prompt (int /*long*/ aParent, int /*
return XPCOM.NS_OK;
}
@@ -5786,7 +5786,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
nsIAuthInformation auth = new nsIAuthInformation (authInfo);
Browser browser = getBrowser (aParent);
-@@ -441,11 +441,11 @@
+@@ -441,11 +441,11 @@ int PromptAuth(int /*long*/ aParent, int
/* get initial username and password values */
@@ -5800,7 +5800,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
-@@ -474,13 +474,13 @@
+@@ -474,13 +474,13 @@ int PromptAuth(int /*long*/ aParent, int
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
@@ -5816,7 +5816,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedCString_Length (host);
-@@ -521,7 +521,7 @@
+@@ -521,7 +521,7 @@ int PromptAuth(int /*long*/ aParent, int
return XPCOM.NS_OK;
}
@@ -5825,7 +5825,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
String user = null, password = null;
-@@ -572,7 +572,7 @@
+@@ -572,7 +572,7 @@ int PromptUsernameAndPassword (int /*lon
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
@@ -5834,7 +5834,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
if (userAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (userAddr[0]);
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ int PromptUsernameAndPassword (int /*lon
userLabel[0] = new String (dest);
}
@@ -5843,7 +5843,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
if (passAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (passAddr[0]);
-@@ -619,12 +619,12 @@
+@@ -619,12 +619,12 @@ int PromptUsernameAndPassword (int /*lon
* User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
@@ -5859,7 +5859,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-@@ -649,9 +649,9 @@
+@@ -649,9 +649,9 @@ int PromptUsernameAndPassword (int /*lon
char[] buffer = new char[cnt + 1];
user.getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
@@ -5871,7 +5871,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
cnt = password.length ();
buffer = new char[cnt + 1];
-@@ -659,17 +659,17 @@
+@@ -659,17 +659,17 @@ int PromptUsernameAndPassword (int /*lon
size = buffer.length * 2;
ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
@@ -5892,10 +5892,10 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/swt/browser/SimpleEnumerator.java
---- x86/org/eclipse/swt/browser/SimpleEnumerator.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/SimpleEnumerator.java 2010-09-09 12:02:46.000000000 +0000
-@@ -36,17 +36,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/SimpleEnumerator.java swt-gtk-3.6.2/org/eclipse/swt/browser/SimpleEnumerator.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/SimpleEnumerator.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/SimpleEnumerator.java 2011-03-21 11:34:23.175736057 +0000
+@@ -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}) {
@@ -5921,7 +5921,7 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
};
}
-@@ -67,27 +67,27 @@
+@@ -67,27 +67,27 @@ void disposeCOMInterfaces () {
}
}
@@ -5954,7 +5954,7 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -97,17 +97,17 @@
+@@ -97,17 +97,17 @@ int Release () {
return refCount;
}
@@ -5975,10 +5975,10 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
return XPCOM.NS_OK;
}
}
-diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser/WebKit.java
---- x86/org/eclipse/swt/browser/WebKit.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/WebKit.java 2010-09-09 12:02:46.000000000 +0000
-@@ -24,7 +24,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/WebKit.java swt-gtk-3.6.2/org/eclipse/swt/browser/WebKit.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/WebKit.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/WebKit.java 2011-03-21 11:34:23.185735915 +0000
+@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
public class WebKit extends WebBrowser {
@@ -5987,7 +5987,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int failureCount, lastKeyCode, lastCharCode;
String postData;
String[] headers;
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ public class WebKit extends WebBrowser {
byte[] htmlBytes;
BrowserFunction eventFunction;
@@ -5996,14 +5996,15 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
static boolean LibraryLoaded;
static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$
-@@ -115,16 +115,16 @@
+@@ -115,16 +115,16 @@ public class WebKit extends WebBrowser {
NativeClearSessions = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+- 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);
@@ -6019,14 +6020,15 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (expires == 0) {
/* indicates a session cookie */
WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
-@@ -138,14 +138,14 @@
+@@ -138,14 +138,14 @@ public class WebKit extends WebBrowser {
NativeGetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+- 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);
@@ -6038,19 +6040,20 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.soup_uri_free (uri);
if (cookies == 0) return;
int length = OS.strlen (cookies);
-@@ -172,9 +172,9 @@
+@@ -172,9 +172,9 @@ public class WebKit extends WebBrowser {
NativeSetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+- 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);
-@@ -182,10 +182,10 @@
+@@ -182,10 +182,10 @@ public class WebKit extends WebBrowser {
}
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
@@ -6063,7 +6066,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (cookie != 0) {
WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
// the following line is intentionally commented
-@@ -202,19 +202,19 @@
+@@ -202,19 +202,19 @@ public class WebKit extends WebBrowser {
}
}
@@ -6088,7 +6091,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
C.memmove (handle, ptr, C.PTR_SIZEOF);
Browser browser = findBrowser (handle[0]);
if (browser == null) return 0;
-@@ -222,20 +222,20 @@
+@@ -222,20 +222,20 @@ static int /*long*/ JSObjectCallAsFuncti
return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception);
}
@@ -6113,7 +6116,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
-@@ -245,14 +245,14 @@
+@@ -245,14 +245,14 @@ static int /*long*/ JSObjectHasPropertyP
return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes);
}
@@ -6130,7 +6133,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (OS.GTK_IS_SCROLLED_WINDOW (handle)) {
/*
* Stop the propagation of events that are not consumed by WebKit, before
-@@ -261,7 +261,7 @@
+@@ -261,7 +261,7 @@ static int /*long*/ Proc (int /*long*/ h
return user_data;
}
@@ -6139,7 +6142,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (WebKitGTK.WEBKIT_IS_WEB_FRAME (handle)) {
webView = WebKitGTK.webkit_web_frame_get_web_view (handle);
} else {
-@@ -277,15 +277,15 @@
+@@ -277,15 +277,15 @@ static int /*long*/ Proc (int /*long*/ h
}
}
@@ -6158,7 +6161,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (WebKitGTK.SOUP_IS_SESSION (handle)) {
webView = user_data;
} else {
-@@ -301,14 +301,14 @@
+@@ -301,14 +301,14 @@ static int /*long*/ Proc (int /*long*/ h
}
}
@@ -6175,7 +6178,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
/* authentication challenges are currently the only notification received from the session */
if (retrying == 0) {
failureCount = 0;
-@@ -316,8 +316,8 @@
+@@ -316,8 +316,8 @@ int /*long*/ sessionProc (int /*long*/ s
if (++failureCount >= 3) return 0;
}
@@ -6186,7 +6189,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = C.strlen (uriString);
byte[] bytes = new byte[length];
OS.memmove (bytes, uriString, length);
-@@ -343,14 +343,14 @@
+@@ -343,14 +343,14 @@ int /*long*/ sessionProc (int /*long*/ s
return 0;
}
@@ -6203,7 +6206,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ int /*long*/ webViewProc (int /*long*/ h
}
}
@@ -6212,7 +6215,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -371,14 +371,14 @@
+@@ -371,14 +371,14 @@ int /*long*/ webViewProc (int /*long*/ h
}
}
@@ -6229,7 +6232,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ int /*long*/ webViewProc (int /*long*/ h
}
}
@@ -6238,7 +6241,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ public boolean create (Composite parent,
OS.memmove (jsClassDefinition.className, bytes, bytes.length);
jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress ();
jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress ();
@@ -6247,7 +6250,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr);
-@@ -432,7 +432,7 @@
+@@ -432,7 +432,7 @@ public boolean create (Composite parent,
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);
@@ -6256,7 +6259,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
OS.gtk_container_add (scrolledWindow, webView);
OS.gtk_container_add (browser.handle, scrolledWindow);
OS.gtk_widget_show (scrolledWindow);
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ public boolean create (Composite parent,
OS.g_signal_connect (scrolledWindow, OS.scroll_event, Proc3.getAddress (), STOP_PROPOGATE);
OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, Proc3.getAddress (), STOP_PROPOGATE);
@@ -6265,7 +6268,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -508,8 +508,8 @@
+@@ -508,8 +508,8 @@ public boolean create (Composite parent,
* queue by removing the default Authenticate listener, adding ours,
* and then re-adding the default listener.
*/
@@ -6276,7 +6279,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.soup_session_feature_detach (originalAuth, session);
OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
WebKitGTK.soup_session_feature_attach (originalAuth, session);
-@@ -535,7 +535,7 @@
+@@ -535,7 +535,7 @@ public boolean create (Composite parent,
}
proxyHost += ":" + port; //$NON-NLS-1$
byte[] bytes = Converter.wcsToMbcs (null, proxyHost, true);
@@ -6285,7 +6288,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (uri != 0) {
OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0);
WebKitGTK.soup_uri_free (uri);
-@@ -646,8 +646,8 @@
+@@ -646,8 +646,8 @@ boolean close (boolean showPrompters) {
}
public boolean execute (String script) {
@@ -6296,7 +6299,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
byte[] bytes = null;
try {
-@@ -655,16 +655,16 @@
+@@ -655,16 +655,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, script, true);
}
@@ -6316,7 +6319,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.JSStringRelease (urlString);
WebKitGTK.JSStringRelease (scriptString);
return result != 0;
-@@ -681,19 +681,19 @@
+@@ -681,19 +681,19 @@ public String getBrowserType () {
}
public String getText () {
@@ -6341,7 +6344,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
length = OS.GString_len (string);
bytes = new byte[length];
C.memmove (bytes, string, length);
-@@ -706,7 +706,7 @@
+@@ -706,7 +706,7 @@ public String getText () {
}
public String getUrl () {
@@ -6350,7 +6353,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
/* WebKit auto-navigates to about:blank at startup */
if (uri == 0) return ABOUT_BLANK;
-@@ -1005,7 +1005,7 @@
+@@ -1005,7 +1005,7 @@ boolean handleEvent (Object[] arguments)
return true;
}
@@ -6359,7 +6362,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1043,7 +1043,7 @@
+@@ -1043,7 +1043,7 @@ int /*long*/ handleLoadCommitted (int /*
return 0;
}
@@ -6368,7 +6371,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1095,8 +1095,8 @@
+@@ -1095,8 +1095,8 @@ int /*long*/ handleLoadFinished (int /*l
* the event here with the page's url as the title.
*/
if (top) {
@@ -6379,7 +6382,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (title == 0) {
TitleEvent newEvent = new TitleEvent (browser);
newEvent.display = browser.getDisplay ();
-@@ -1157,7 +1157,7 @@
+@@ -1157,7 +1157,7 @@ void onResize (Event e) {
OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
}
@@ -6388,7 +6391,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
final Shell shell = new Shell ();
String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
shell.setText (msg);
-@@ -1167,12 +1167,12 @@
+@@ -1167,12 +1167,12 @@ void openDownloadWindow (final int /*lon
gridLayout.verticalSpacing = 20;
shell.setLayout (gridLayout);
@@ -6403,7 +6406,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
length = OS.strlen (url);
bytes = new byte[length];
OS.memmove (bytes, url, length);
-@@ -1304,7 +1304,7 @@
+@@ -1304,7 +1304,7 @@ public boolean setUrl (String url, Strin
* set the value on the WebView when initiating the load request and then
* remove it afterwards.
*/
@@ -6412,7 +6415,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (headers != null) {
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
-@@ -1333,11 +1333,11 @@
+@@ -1333,11 +1333,11 @@ public void stop () {
WebKitGTK.webkit_web_view_stop_loading (webView);
}
@@ -6426,7 +6429,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
return handleLoadCommitted (uri, false);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
-@@ -1347,9 +1347,9 @@
+@@ -1347,9 +1347,9 @@ int /*long*/ webframe_notify_load_status
* response to navigating to a main document containing frames) then
* treat this as a completed load.
*/
@@ -6438,7 +6441,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
return handleLoadFinished (uri, false);
}
}
-@@ -1357,7 +1357,7 @@
+@@ -1357,7 +1357,7 @@ int /*long*/ webframe_notify_load_status
return 0;
}
@@ -6447,7 +6450,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1368,11 +1368,11 @@
+@@ -1368,11 +1368,11 @@ int /*long*/ webkit_close_web_view (int
return 0;
}
@@ -6461,7 +6464,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1392,8 +1392,8 @@
+@@ -1392,8 +1392,8 @@ int /*long*/ webkit_create_web_view (int
return 0;
}
@@ -6472,7 +6475,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
-@@ -1415,7 +1415,7 @@
+@@ -1415,7 +1415,7 @@ int /*long*/ webkit_download_requested (
return 1;
}
@@ -6481,7 +6484,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
-@@ -1432,7 +1432,7 @@
+@@ -1432,7 +1432,7 @@ int /*long*/ webkit_hovering_over_link (
return 0;
}
@@ -6490,7 +6493,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
-@@ -1441,7 +1441,7 @@
+@@ -1441,7 +1441,7 @@ int /*long*/ webkit_mime_type_policy_dec
return 0;
}
@@ -6499,7 +6502,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
-@@ -1452,7 +1452,7 @@
+@@ -1452,7 +1452,7 @@ int /*long*/ webkit_navigation_policy_de
return 0;
}
@@ -6508,7 +6511,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1484,12 +1484,12 @@
+@@ -1484,12 +1484,12 @@ int /*long*/ webkit_navigation_policy_de
if (newEvent.doit && !browser.isDisposed ()) {
if (jsEnabledChanged) {
jsEnabledChanged = false;
@@ -6523,7 +6526,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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) {
-@@ -1512,22 +1512,22 @@
+@@ -1512,22 +1512,22 @@ int /*long*/ webkit_navigation_policy_de
return 0;
}
@@ -6550,7 +6553,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
-@@ -1539,8 +1539,8 @@
+@@ -1539,8 +1539,8 @@ int /*long*/ webkit_notify_progress (int
return 0;
}
@@ -6561,7 +6564,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
-@@ -1560,7 +1560,7 @@
+@@ -1560,7 +1560,7 @@ int /*long*/ webkit_notify_title (int /*
return 0;
}
@@ -6570,7 +6573,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
-@@ -1568,10 +1568,10 @@
+@@ -1568,10 +1568,10 @@ int /*long*/ webkit_populate_popup (int
browser.notifyListeners (SWT.MenuDetect, event);
if (!event.doit) {
/* clear the menu */
@@ -6584,7 +6587,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1585,10 +1585,10 @@
+@@ -1585,10 +1585,10 @@ int /*long*/ webkit_populate_popup (int
}
menu.setVisible (true);
/* clear the menu */
@@ -6598,7 +6601,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1597,18 +1597,18 @@
+@@ -1597,18 +1597,18 @@ int /*long*/ webkit_populate_popup (int
return 0;
}
@@ -6621,7 +6624,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
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);
-@@ -1622,7 +1622,7 @@
+@@ -1622,7 +1622,7 @@ int /*long*/ webkit_resource_request_sta
}
/* headers */
@@ -6630,7 +6633,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
-@@ -1645,7 +1645,7 @@
+@@ -1645,7 +1645,7 @@ int /*long*/ webkit_resource_request_sta
return 0;
}
@@ -6639,7 +6642,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
-@@ -1659,12 +1659,12 @@
+@@ -1659,12 +1659,12 @@ int /*long*/ webkit_status_bar_text_chan
return 0;
}
@@ -6654,7 +6657,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
-@@ -1702,16 +1702,16 @@
+@@ -1702,16 +1702,16 @@ int /*long*/ webkit_web_view_ready (int
return 0;
}
@@ -6675,7 +6678,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
-@@ -1719,16 +1719,16 @@
+@@ -1719,16 +1719,16 @@ int /*long*/ webkit_window_object_cleare
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
@@ -6695,7 +6698,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
-@@ -1765,7 +1765,7 @@
+@@ -1765,7 +1765,7 @@ int /*long*/ callJava (int /*long*/ ctx,
return convertToJS (ctx, returnValue);
}
@@ -6704,7 +6707,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
-@@ -1776,8 +1776,8 @@
+@@ -1776,8 +1776,8 @@ int /*long*/ convertToJS (int /*long*/ c
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
@@ -6715,7 +6718,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
WebKitGTK.JSStringRelease (stringRef);
return result;
}
-@@ -1790,10 +1790,10 @@
+@@ -1790,10 +1790,10 @@ int /*long*/ convertToJS (int /*long*/ c
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
@@ -6728,7 +6731,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
arguments[i] = jsObject;
}
return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
-@@ -1802,7 +1802,7 @@
+@@ -1802,7 +1802,7 @@ int /*long*/ convertToJS (int /*long*/ c
return 0;
}
@@ -6737,7 +6740,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
-@@ -1814,9 +1814,9 @@
+@@ -1814,9 +1814,9 @@ Object convertToJava (int /*long*/ ctx,
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
@@ -6749,7 +6752,7 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
-@@ -1837,15 +1837,15 @@
+@@ -1837,15 +1837,15 @@ Object convertToJava (int /*long*/ ctx,
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
@@ -6768,10 +6771,10 @@ diff -urN x86/org/eclipse/swt/browser/WebKit.java x86_64/org/eclipse/swt/browser
if (current != 0) {
result[i] = convertToJava (ctx, current);
}
-diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/browser/WindowCreator2.java
---- x86/org/eclipse/swt/browser/WindowCreator2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/browser/WindowCreator2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -35,24 +35,24 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/browser/WindowCreator2.java swt-gtk-3.6.2/org/eclipse/swt/browser/WindowCreator2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/browser/WindowCreator2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/browser/WindowCreator2.java 2011-03-21 11:34:23.215735487 +0000
+@@ -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}) {
@@ -6808,7 +6811,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
};
}
-@@ -72,32 +72,32 @@
+@@ -72,32 +72,32 @@ void disposeCOMInterfaces () {
}
}
@@ -6847,7 +6850,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -109,26 +109,26 @@
+@@ -109,26 +109,26 @@ int Release () {
/* nsIWindowCreator */
@@ -6878,7 +6881,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ int CreateChromeWindow2 (int /*long*/ pa
nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
result[0] = 0;
@@ -6887,7 +6890,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
rc = baseWindow.GetParentNativeWindow (aParentNativeWindow);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -182,11 +182,11 @@
+@@ -182,11 +182,11 @@ int CreateChromeWindow2 (int /*long*/ pa
});
if (uri != 0) {
nsIURI location = new nsIURI (uri);
@@ -6901,7 +6904,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
browser.setUrl (new String (dest));
-@@ -215,11 +215,11 @@
+@@ -215,11 +215,11 @@ int CreateChromeWindow2 (int /*long*/ pa
if (doit) {
Mozilla mozilla = (Mozilla)browser.webBrowser;
mozilla.isChild = true;
@@ -6915,10 +6918,10 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
} else {
if (cancel != 0) {
C.memmove (cancel, new int[] {1}, 4); /* PRBool */
-diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java
---- x86/org/eclipse/swt/dnd/ByteArrayTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -155,7 +155,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ByteArrayTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/ByteArrayTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ByteArrayTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/ByteArrayTransfer.java 2011-03-21 11:34:23.545730830 +0000
+@@ -155,7 +155,7 @@ protected void javaToNative (Object obje
}
byte[] buffer = (byte[])object;
if (buffer.length == 0) return;
@@ -6927,10 +6930,10 @@ diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length;
-diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipboard.java
---- x86/org/eclipse/swt/dnd/Clipboard.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/Clipboard.java 2010-09-09 12:02:46.000000000 +0000
-@@ -32,14 +32,14 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/Clipboard.java swt-gtk-3.6.2/org/eclipse/swt/dnd/Clipboard.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/Clipboard.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/Clipboard.java 2011-03-21 11:34:23.555730678 +0000
+@@ -32,14 +32,14 @@ public class Clipboard {
private Display display;
@@ -6949,7 +6952,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);
buffer = Converter.wcsToMbcs(null, "TARGETS", true);
TARGET = OS.gdk_atom_intern(buffer, false);
-@@ -287,7 +287,7 @@
+@@ -287,7 +287,7 @@ public Object getContents(Transfer trans
public Object getContents(Transfer transfer, int clipboards) {
checkWidget();
if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
@@ -6958,7 +6961,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
int[] typeIds = transfer.getTypeIds();
for (int i = 0; i < typeIds.length; i++) {
if ((clipboards & DND.CLIPBOARD) != 0) {
-@@ -549,7 +549,7 @@
+@@ -549,7 +549,7 @@ public String[] getAvailableTypeNames()
String[] result = new String[types1.length + types2.length];
int count = 0;
for (int i = 0; i < types1.length; i++) {
@@ -6967,7 +6970,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (pName == 0) {
continue;
}
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ public String[] getAvailableTypeNames()
result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer));
}
for (int i = 0; i < types2.length; i++) {
@@ -6976,7 +6979,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (pName == 0) {
continue;
}
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ public String[] getAvailableTypeNames()
private int[] getAvailablePrimaryTypes() {
int[] types = new int[0];
@@ -6985,7 +6988,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -595,7 +595,7 @@
+@@ -595,7 +595,7 @@ private int[] getAvailablePrimaryTypes(
}
private int[] getAvailableClipboardTypes () {
int[] types = new int[0];
@@ -6994,7 +6997,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -611,11 +611,11 @@
+@@ -611,11 +611,11 @@ private int[] getAvailableClipboardTypes
return types;
}
@@ -7008,10 +7011,10 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
display.setData(key, null);
return selection_data;
}
-diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/ClipboardProxy.java
---- x86/org/eclipse/swt/dnd/ClipboardProxy.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/ClipboardProxy.java 2010-09-09 12:02:46.000000000 +0000
-@@ -30,7 +30,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ClipboardProxy.java swt-gtk-3.6.2/org/eclipse/swt/dnd/ClipboardProxy.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ClipboardProxy.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/ClipboardProxy.java 2011-03-21 11:34:23.565730531 +0000
+@@ -30,7 +30,7 @@ class ClipboardProxy {
Object[] primaryClipboardData;
Transfer[] primaryClipboardDataTypes;
@@ -7020,7 +7023,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
Display display;
Clipboard activeClipboard = null;
Clipboard activePrimaryClipboard = null;
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ void clear (Clipboard owner, int clipboa
}
}
@@ -7029,7 +7032,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (clipboard == Clipboard.GTKCLIPBOARD) {
activeClipboard = null;
clipboardData = null;
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,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.
*/
@@ -7038,7 +7041,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (selection_data == 0) return 0;
GtkSelectionData selectionData = new GtkSelectionData();
OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof);
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ int /*long*/ getFunc(int /*long*/ clipbo
boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) {
GtkTargetEntry[] entries = new GtkTargetEntry [0];
@@ -7047,7 +7050,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
try {
for (int i = 0; i < dataTypes.length; i++) {
Transfer transfer = dataTypes[i];
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ boolean setData(Clipboard owner, Object[
GtkTargetEntry entry = new GtkTargetEntry();
entry.info = typeIds[j];
byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true);
@@ -7056,7 +7059,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
OS.memmove(pName, buffer, buffer.length);
entry.target = pName;
GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1];
-@@ -163,8 +163,8 @@
+@@ -163,8 +163,8 @@ boolean setData(Clipboard owner, Object[
if ((clipboards & DND.CLIPBOARD) != 0) {
clipboardData = data;
clipboardDataTypes = dataTypes;
@@ -7067,7 +7070,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
/*
* Feature in GTK. When the contents are set again, clipboard_set_with_data()
* invokes clearFunc and then, getFunc is not sequentially called.
-@@ -183,8 +183,8 @@
+@@ -183,8 +183,8 @@ boolean setData(Clipboard owner, Object[
if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) {
primaryClipboardData = data;
primaryClipboardDataTypes = dataTypes;
@@ -7078,10 +7081,10 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
return false;
}
-diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/DragSource.java
---- x86/org/eclipse/swt/dnd/DragSource.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/DragSource.java 2010-09-09 12:02:46.000000000 +0000
-@@ -106,7 +106,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/DragSource.java swt-gtk-3.6.2/org/eclipse/swt/dnd/DragSource.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/DragSource.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/DragSource.java 2011-03-21 11:34:23.555730678 +0000
+@@ -106,7 +106,7 @@ public class DragSource extends Widget {
Transfer[] transferAgents = new Transfer[0];
DragSourceEffect dragEffect;
@@ -7090,7 +7093,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
//workaround - remember action performed for DragEnd
boolean moveData = false;
-@@ -207,28 +207,28 @@
+@@ -207,28 +207,28 @@ static int checkStyle (int style) {
return style;
}
@@ -7123,7 +7126,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -297,15 +297,15 @@
+@@ -297,15 +297,15 @@ void drag(Event dragEvent) {
int actions = opToOsOp(getStyle());
Image image = event.image;
@@ -7142,7 +7145,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
/*
* 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 @@
+@@ -341,7 +341,7 @@ void dragEnd(int /*long*/ widget, int /*
moveData = false;
}
@@ -7151,7 +7154,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
if (selection_data == 0) return;
GtkSelectionData gtkSelectionData = new GtkSelectionData();
OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof);
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ void dragGetData(int /*long*/ widget, in
return;
}
@@ -7160,7 +7163,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
moveData = true;
}
-@@ -564,7 +564,7 @@
+@@ -564,7 +564,7 @@ public void setTransfer(Transfer[] trans
}
}
@@ -7169,7 +7172,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -575,29 +575,29 @@
+@@ -575,29 +575,29 @@ public void setTransfer(Transfer[] trans
}
}
@@ -7207,7 +7210,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -616,10 +616,10 @@
+@@ -616,10 +616,10 @@ static int /*long*/ createPixbuf(Image i
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -7220,10 +7223,10 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/DropTarget.java
---- x86/org/eclipse/swt/dnd/DropTarget.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/DropTarget.java 2010-09-09 12:02:46.000000000 +0000
-@@ -245,33 +245,33 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/DropTarget.java swt-gtk-3.6.2/org/eclipse/swt/dnd/DropTarget.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/DropTarget.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/DropTarget.java 2011-03-21 11:34:23.555730678 +0000
+@@ -245,33 +245,33 @@ static int checkStyle (int style) {
return style;
}
@@ -7262,7 +7265,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -332,7 +332,7 @@
+@@ -332,7 +332,7 @@ protected void checkSubclass () {
}
}
@@ -7271,7 +7274,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
DNDEvent event = new DNDEvent();
if (data == 0 || !setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ void drag_data_received ( int /*long*/ w
return;
}
@@ -7280,7 +7283,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
DNDEvent event = new DNDEvent();
if (!setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -417,7 +417,7 @@
+@@ -417,7 +417,7 @@ boolean drag_drop(int /*long*/ widget, i
return true;
}
@@ -7289,7 +7292,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
updateDragOverHover(0, null);
if (keyOperation == -1) return;
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ void drag_leave ( int /*long*/ widget, i
notifyListeners(DND.DragLeave, event);
}
@@ -7298,7 +7301,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
int oldKeyOperation = keyOperation;
/*
-@@ -694,7 +694,7 @@
+@@ -694,7 +694,7 @@ public void setTransfer(Transfer[] trans
}
}
@@ -7307,7 +7310,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ public void setTransfer(Transfer[] trans
int actions = opToOsOp(getStyle());
if (control instanceof Combo) {
if ((control.getStyle() & SWT.READ_ONLY) == 0) {
@@ -7316,7 +7319,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
if (entryHandle != 0) {
OS.gtk_drag_dest_unset(entryHandle);
}
-@@ -728,7 +728,7 @@
+@@ -728,7 +728,7 @@ public void setDropTargetEffect(DropTarg
dropEffect = effect;
}
@@ -7325,7 +7328,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
if (context == 0) return false;
GdkDragContext dragContext = new GdkDragContext();
OS.memmove(dragContext, context, GdkDragContext.sizeof);
-@@ -754,7 +754,7 @@
+@@ -754,7 +754,7 @@ boolean setEventData(int /*long*/ contex
int length = OS.g_list_length(dragContext.targets);
TransferData[] dataTypes = new TransferData[0];
for (int i = 0; i < length; i++) {
@@ -7334,7 +7337,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
GtkTargetPair gtkTargetPair = new GtkTargetPair();
OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof);
TransferData data = new TransferData();
-@@ -772,7 +772,7 @@
+@@ -772,7 +772,7 @@ boolean setEventData(int /*long*/ contex
}
if (dataTypes.length == 0) return false;
@@ -7343,10 +7346,10 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
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 -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/FileTransfer.java
---- x86/org/eclipse/swt/dnd/FileTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/FileTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -85,13 +85,13 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/FileTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/FileTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/FileTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/FileTransfer.java 2011-03-21 11:34:23.575730390 +0000
+@@ -85,13 +85,13 @@ public void javaToNative(Object object,
if (length == 0) continue;
char[] chars = new char[length];
string.getChars(0, length, chars, 0);
@@ -7364,7 +7367,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.g_free(localePtr);
if (error[0] != 0 || uriPtr == 0) continue;
length = OS.strlen(uriPtr);
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ public void javaToNative(Object object,
buffer = newBuffer;
}
if (buffer.length == 0) return;
@@ -7373,7 +7376,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.memset(ptr, '\0', buffer.length+1);
OS.memmove(ptr, buffer, buffer.length);
transferData.pValue = ptr;
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ public Object nativeToJava(TransferData
OS.memmove(temp, transferData.pValue, length);
boolean gnomeList = transferData.type == GNOME_LIST_ID;
int sepLength = gnomeList ? 1 : 2;
@@ -7382,7 +7385,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
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 @@
+@@ -145,11 +145,11 @@ public Object nativeToJava(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;
@@ -7396,7 +7399,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
System.arraycopy(files, 0, newFiles, 0, files.length);
newFiles[files.length] = file;
files = newFiles;
-@@ -159,26 +159,26 @@
+@@ -159,26 +159,26 @@ public Object nativeToJava(TransferData
}
if (offset < temp.length - sepLength) {
int size = temp.length - offset;
@@ -7430,10 +7433,10 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.g_free(utf8Ptr);
length = (int)/*64*/items_written[0];
char[] buffer = new char[length];
-diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HTMLTransfer.java
---- x86/org/eclipse/swt/dnd/HTMLTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/HTMLTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -65,7 +65,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/HTMLTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/HTMLTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/HTMLTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/HTMLTransfer.java 2011-03-21 11:34:23.555730678 +0000
+@@ -65,7 +65,7 @@ public void javaToNative (Object object,
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
@@ -7442,10 +7445,10 @@ diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/H
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/ImageTransfer.java
---- x86/org/eclipse/swt/dnd/ImageTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/ImageTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -89,12 +89,12 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ImageTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/ImageTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/ImageTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/ImageTransfer.java 2011-03-21 11:34:23.565730531 +0000
+@@ -89,12 +89,12 @@ public void javaToNative(Object object,
ImageData imgData = (ImageData)object;
if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
Image image = new Image(Display.getCurrent(), imgData);
@@ -7461,7 +7464,7 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
String typeStr = "";
-@@ -110,8 +110,8 @@
+@@ -110,8 +110,8 @@ public void javaToNative(Object object,
if (transferData.type == XPM_ID) typeStr = "xpm";
if (transferData.type == XV_ID) typeStr = "xv";
byte[] type = Converter.wcsToMbcs(null, typeStr , true);
@@ -7472,7 +7475,7 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
if (type == null) return;
OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
OS.g_object_unref(pixbuf);
-@@ -136,14 +136,14 @@
+@@ -136,14 +136,14 @@ public Object nativeToJava(TransferData
ImageData imgData = null;
if (transferData.length > 0)
{
@@ -7491,10 +7494,10 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.g_object_unref(loader);
Image img = Image.gtk_new(Display.getCurrent(), SWT.BITMAP, handle, 0);
-diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTFTransfer.java
---- x86/org/eclipse/swt/dnd/RTFTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/RTFTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -65,7 +65,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/RTFTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/RTFTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/RTFTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/RTFTransfer.java 2011-03-21 11:34:23.565730531 +0000
+@@ -65,7 +65,7 @@ public void javaToNative (Object object,
}
String string = (String)object;
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -7503,10 +7506,10 @@ diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RT
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length - 1;
-diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TableDragSourceEffect.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java 2010-09-09 12:02:46.000000000 +0000
-@@ -88,26 +88,26 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TableDragSourceEffect.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TableDragSourceEffect.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TableDragSourceEffect.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TableDragSourceEffect.java 2011-03-21 11:34:23.565730531 +0000
+@@ -88,26 +88,26 @@ public class TableDragSourceEffect exten
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -7541,7 +7544,7 @@ diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
OS.gdk_drawable_get_size(pixmaps[i], w, h);
-@@ -116,10 +116,10 @@
+@@ -116,10 +116,10 @@ public class TableDragSourceEffect exten
yy[i] = rect.y;
hh[i] = h[0];
}
@@ -7556,10 +7559,10 @@ diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TableDropTargetEffect.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java 2010-09-09 12:02:46.000000000 +0000
-@@ -102,7 +102,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TableDropTargetEffect.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TableDropTargetEffect.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TableDropTargetEffect.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TableDropTargetEffect.java 2011-03-21 11:34:23.565730531 +0000
+@@ -102,7 +102,7 @@ public class TableDropTargetEffect exten
*/
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
@@ -7568,7 +7571,7 @@ diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
-@@ -128,15 +128,15 @@
+@@ -128,15 +128,15 @@ public class TableDropTargetEffect exten
*/
public void dragOver(DropTargetEvent event) {
Table table = (Table) control;
@@ -7587,10 +7590,10 @@ diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/TextTransfer.java
---- x86/org/eclipse/swt/dnd/TextTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TextTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -72,9 +72,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TextTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TextTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TextTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TextTransfer.java 2011-03-21 11:34:23.565730531 +0000
+@@ -72,9 +72,9 @@ public void javaToNative (Object object,
String string = (String)object;
byte[] utf8 = Converter.wcsToMbcs (null, string, true);
if (transferData.type == COMPOUND_TEXT_ID) {
@@ -7602,7 +7605,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
int[] length = new int[1];
boolean result = OS.gdk_utf8_to_compound_text(utf8, encoding, format, ctext, length);
if (!result) return;
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ public void javaToNative (Object object,
transferData.result = 1;
}
if (transferData.type == UTF8_STRING_ID) {
@@ -7611,7 +7614,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
if (pValue == 0) return;
OS.memmove(pValue, utf8, utf8.length);
transferData.type = UTF8_STRING_ID;
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ public void javaToNative (Object object,
transferData.result = 1;
}
if (transferData.type == STRING_ID) {
@@ -7620,7 +7623,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
if (string_target == 0) return;
transferData.type = STRING_ID;
transferData.format = 8;
-@@ -116,10 +116,10 @@
+@@ -116,10 +116,10 @@ public void javaToNative (Object object,
*/
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pValue == 0) return null;
@@ -7633,10 +7636,10 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
OS.memmove(ptr, list[0], OS.PTR_SIZEOF);
int length = OS.strlen(ptr[0]);
byte[] utf8 = new byte[length];
-diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/TransferData.java
---- x86/org/eclipse/swt/dnd/TransferData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TransferData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,7 +40,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TransferData.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TransferData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TransferData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TransferData.java 2011-03-21 11:34:23.555730678 +0000
+@@ -40,7 +40,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -7645,7 +7648,7 @@ diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/T
/**
* Specifies the number of units in pValue.
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -7654,10 +7657,10 @@ diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/T
/**
* The result field contains the result of converting a
-diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2010-09-09 12:02:46.000000000 +0000
-@@ -87,26 +87,26 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TreeDragSourceEffect.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TreeDragSourceEffect.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2011-03-21 11:34:23.555730678 +0000
+@@ -87,26 +87,26 @@ public class TreeDragSourceEffect extend
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -7692,7 +7695,7 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/s
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
OS.gdk_drawable_get_size(pixmaps[i], w, h);
-@@ -115,10 +115,10 @@
+@@ -115,10 +115,10 @@ public class TreeDragSourceEffect extend
yy[i] = rect.y;
hh[i] = h[0];
}
@@ -7707,10 +7710,10 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/s
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2010-09-09 12:02:46.000000000 +0000
-@@ -111,7 +111,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TreeDropTargetEffect.java swt-gtk-3.6.2/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/TreeDropTargetEffect.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2011-03-21 11:34:23.565730531 +0000
+@@ -111,7 +111,7 @@ public class TreeDropTargetEffect extend
*/
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
@@ -7719,7 +7722,7 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/s
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
-@@ -142,14 +142,14 @@
+@@ -142,14 +142,14 @@ public class TreeDropTargetEffect extend
Tree tree = (Tree) control;
int effect = checkEffect(event.feedback);
@@ -7737,10 +7740,10 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/s
if (indices != 0) {
int depth = OS.gtk_tree_path_get_depth(path[0]);
int[] temp = new int[depth];
-diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URLTransfer.java
---- x86/org/eclipse/swt/dnd/URLTransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/dnd/URLTransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -66,7 +66,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/URLTransfer.java swt-gtk-3.6.2/org/eclipse/swt/dnd/URLTransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/dnd/URLTransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/dnd/URLTransfer.java 2011-03-21 11:34:23.565730531 +0000
+@@ -66,7 +66,7 @@ public void javaToNative (Object object,
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
@@ -7749,10 +7752,10 @@ diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/UR
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics/Color.java
---- x86/org/eclipse/swt/graphics/Color.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Color.java 2010-09-09 12:02:46.000000000 +0000
-@@ -117,7 +117,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Color.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Color.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Color.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Color.java 2011-03-21 11:34:23.245735074 +0000
+@@ -117,7 +117,7 @@ void destroy() {
device.gdkColors[pixel] = null;
}
}
@@ -7761,7 +7764,7 @@ diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphic
OS.gdk_colormap_free_colors(colormap, handle, 1);
handle = null;
}
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ void init(int red, int green, int blue)
gdkColor.red = (short)((red & 0xFF) | ((red & 0xFF) << 8));
gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8));
gdkColor.blue = (short)((blue & 0xFF) | ((blue & 0xFF) << 8));
@@ -7770,10 +7773,10 @@ diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphic
if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) {
/* Allocate black. */
gdkColor = new GdkColor();
-diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphics/Cursor.java
---- x86/org/eclipse/swt/graphics/Cursor.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Cursor.java 2010-09-09 12:02:46.000000000 +0000
-@@ -54,7 +54,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Cursor.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Cursor.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Cursor.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Cursor.java 2011-03-21 11:34:23.235735219 +0000
+@@ -54,7 +54,7 @@ public final class Cursor extends Resour
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -7782,7 +7785,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
static final byte[] APPSTARTING_SRC = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-@@ -290,15 +290,15 @@
+@@ -290,15 +290,15 @@ public Cursor(Device device, ImageData s
hotspotY >= source.height || hotspotY < 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
@@ -7801,7 +7804,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
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 @@
+@@ -432,10 +432,10 @@ public Cursor(Device device, ImageData s
init();
}
@@ -7816,7 +7819,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
if (sourcePixmap != 0 && maskPixmap != 0) {
GdkColor foreground = new GdkColor();
if (!reverse) foreground.red = foreground.green = foreground.blue = (short)0xFFFF;
-@@ -485,7 +485,7 @@
+@@ -485,7 +485,7 @@ public boolean equals(Object object) {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -7825,10 +7828,10 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
Cursor cursor = new Cursor(device);
cursor.handle = handle;
return cursor;
-diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphics/Device.java
---- x86/org/eclipse/swt/graphics/Device.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Device.java 2010-09-09 12:02:46.000000000 +0000
-@@ -36,8 +36,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Device.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Device.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Device.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Device.java 2011-03-21 11:34:23.265734784 +0000
+@@ -36,8 +36,8 @@ public abstract class Device implements
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -7839,7 +7842,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/* Debugging */
public static boolean DEBUG;
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ public abstract class Device implements
boolean disposed;
/* Warning and Error Handlers */
@@ -7848,7 +7851,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
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 @@
+@@ -64,7 +64,7 @@ public abstract class Device implements
/* X Warning and Error Handlers */
static Callback XErrorCallback, XIOErrorCallback;
@@ -7857,7 +7860,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
static Device[] Devices = new Device[4];
/*
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ public abstract class Device implements
/* System Font */
Font systemFont;
@@ -7866,16 +7869,16 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
boolean useXRender;
-@@ -162,7 +162,7 @@
- try {
- /* Check if cairo is available on the system */
- byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
-- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
-+ long /*int*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
+@@ -171,7 +171,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 {
-@@ -261,7 +261,7 @@
+@@ -270,7 +270,7 @@ void dispose_Object (Object object) {
}
}
@@ -7884,7 +7887,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
for (int i=0; i<Devices.length; i++) {
Device device = Devices [i];
if (device != null && device.xDisplay == xDisplay) {
-@@ -416,13 +416,13 @@
+@@ -425,13 +425,13 @@ public Point getDPI () {
public FontData[] getFontList (String faceName, boolean scalable) {
checkDevice ();
if (!scalable) return new FontData[0];
@@ -7903,7 +7906,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
OS.pango_context_list_families(context, families, n_families);
int nFds = 0;
FontData[] fds = new FontData[faceName != null ? 4 : n_families[0]];
-@@ -430,7 +430,7 @@
+@@ -439,7 +439,7 @@ public FontData[] getFontList (String fa
OS.memmove(family, families[0] + i * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
boolean match = true;
if (faceName != null) {
@@ -7912,7 +7915,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
int length = OS.strlen(familyName);
byte[] buffer = new byte[length];
OS.memmove(buffer, familyName, length);
-@@ -441,7 +441,7 @@
+@@ -450,7 +450,7 @@ public FontData[] getFontList (String fa
OS.pango_font_family_list_faces(family[0], faces, n_faces);
for (int j=0; j<n_faces[0]; j++) {
OS.memmove(face, faces[0] + j * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
@@ -7921,7 +7924,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Font font = Font.gtk_new(this, fontDesc);
FontData data = font.getFontData()[0];
if (nFds == fds.length) {
-@@ -654,7 +654,7 @@
+@@ -665,7 +665,7 @@ protected void init () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -7930,7 +7933,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/**
* Invokes platform specific functionality to dispose a GC handle.
-@@ -671,7 +671,7 @@
+@@ -682,7 +682,7 @@ public abstract int /*long*/ internal_ne
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -7939,7 +7942,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/**
* Returns <code>true</code> if the device has been disposed,
-@@ -712,7 +712,7 @@
+@@ -723,7 +723,7 @@ public boolean loadFont (String path) {
return OS.FcConfigAppFontAddFile (0, buffer);
}
@@ -7948,7 +7951,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
if (warningLevel == 0) {
if (DEBUG || debug) {
new Error ().printStackTrace ();
-@@ -783,7 +783,7 @@
+@@ -794,7 +794,7 @@ protected void release () {
shellHandle = 0;
if (gdkColors != null) {
@@ -7957,7 +7960,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
for (int i = 0; i < gdkColors.length; i++) {
GdkColor color = gdkColors [i];
if (color != null) {
-@@ -876,7 +876,7 @@
+@@ -887,7 +887,7 @@ public void setWarnings (boolean warning
}
}
@@ -7966,7 +7969,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Device device = findDevice (xDisplay);
if (device != null) {
if (device.warningLevel == 0) {
-@@ -892,7 +892,7 @@
+@@ -905,7 +905,7 @@ static int /*long*/ XErrorProc (int /*lo
return 0;
}
@@ -7975,10 +7978,10 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Device device = findDevice (xDisplay);
if (device != null) {
if (DEBUG || device.debug) {
-diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graphics/Drawable.java
---- x86/org/eclipse/swt/graphics/Drawable.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Drawable.java 2010-09-09 12:02:46.000000000 +0000
-@@ -45,7 +45,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Drawable.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Drawable.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Drawable.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Drawable.java 2011-03-21 11:34:23.235735219 +0000
+@@ -45,7 +45,7 @@ public interface Drawable {
* @noreference This method is not intended to be referenced by clients.
*/
@@ -7987,7 +7990,7 @@ diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/grap
/**
* Invokes platform specific functionality to dispose a GC handle.
-@@ -62,6 +62,6 @@
+@@ -62,6 +62,6 @@ public int /*long*/ internal_new_GC (GCD
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -7995,10 +7998,10 @@ diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/grap
+public void internal_dispose_GC (long /*int*/ handle, GCData data);
}
-diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/Font.java
---- x86/org/eclipse/swt/graphics/Font.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Font.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,7 +44,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Font.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Font.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Font.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Font.java 2011-03-21 11:34:23.285734513 +0000
+@@ -44,7 +44,7 @@ public final class Font extends Resource
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -8007,7 +8010,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
Font(Device device) {
super(device);
-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ public boolean equals(Object object) {
public FontData[] getFontData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -8016,7 +8019,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
int length = OS.strlen(family);
byte[] buffer = new byte[length];
OS.memmove(buffer, family, length);
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,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;
@@ -8025,7 +8028,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
length = OS.strlen (fontString);
buffer = new byte [length + 1];
OS.memmove (buffer, fontString, length);
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ public FontData[] getFontData() {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -8034,10 +8037,10 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
Font font = new Font(device);
font.handle = handle;
return font;
-diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphics/GCData.java
---- x86/org/eclipse/swt/graphics/GCData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/GCData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -34,7 +34,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/GCData.java swt-gtk-3.6.2/org/eclipse/swt/graphics/GCData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/GCData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/GCData.java 2011-03-21 11:34:23.255734928 +0000
+@@ -34,7 +34,7 @@ public final class GCData {
public Font font;
public Pattern foregroundPattern;
public Pattern backgroundPattern;
@@ -8046,7 +8049,7 @@ diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphi
public float lineWidth;
public int lineStyle = SWT.LINE_SOLID;
public float[] lineDashes;
-@@ -46,12 +46,12 @@
+@@ -46,12 +46,12 @@ public final class GCData {
public int alpha = 0xFF;
public int interpolation = SWT.DEFAULT;
@@ -8064,10 +8067,10 @@ diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphi
public double cairoXoffset, cairoYoffset;
public boolean disposeCairo;
public double[] clippingTransform;
-diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC.java
---- x86/org/eclipse/swt/graphics/GC.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/GC.java 2010-09-09 12:02:46.000000000 +0000
-@@ -69,7 +69,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/GC.java swt-gtk-3.6.2/org/eclipse/swt/graphics/GC.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/GC.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/GC.java 2011-03-21 11:34:23.285734513 +0000
+@@ -69,7 +69,7 @@ public final class GC extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -8076,7 +8079,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Drawable drawable;
GCData data;
-@@ -156,7 +156,7 @@
+@@ -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);
@@ -8085,7 +8088,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-@@ -165,10 +165,10 @@
+@@ -165,10 +165,10 @@ public GC(Drawable drawable, int style)
init();
}
@@ -8098,7 +8101,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
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 @@
+@@ -194,7 +194,7 @@ static int checkStyle (int style) {
return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
}
@@ -8107,7 +8110,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GC gc = new GC();
gc.device = data.device;
gc.init(null, data, handle);
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ public static GC gtk_new(int /*long*/ ha
public static GC gtk_new(Drawable drawable, GCData data) {
GC gc = new GC();
@@ -8116,7 +8119,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
gc.device = data.device;
gc.init(drawable, data, gdkGC);
return gc;
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ void checkGC (int mask) {
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
@@ -8125,7 +8128,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if ((state & (BACKGROUND | FOREGROUND)) != 0) {
GdkColor color;
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ void checkGC (int mask) {
}
if (pattern != null) {
if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) {
@@ -8134,7 +8137,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
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 @@
+@@ -390,10 +390,10 @@ void checkGC (int mask) {
}
}
@@ -8148,7 +8151,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
int[] pointArray = new int[8];
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ int /*long*/ convertRgn(int /*long*/ rgn
Cairo.cairo_matrix_transform_point(matrix, x, y);
pointArray[6] = (int)x[0];
pointArray[7] = (int)Math.round(y[0]);
@@ -8157,7 +8160,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union(newRgn, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ public void copyArea(Image image, int x,
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
Rectangle rect = image.getBounds();
@@ -8166,7 +8169,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
-@@ -497,7 +497,7 @@
+@@ -497,7 +497,7 @@ public void copyArea(int srcX, int srcY,
if (width <= 0 || height <= 0) return;
int deltaX = destX - srcX, deltaY = destY - srcY;
if (deltaX == 0 && deltaY == 0) return;
@@ -8175,7 +8178,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.image == null && paint) OS.gdk_gc_set_exposures(handle, true);
OS.gdk_draw_drawable(drawable, handle, drawable, srcX, srcY, destX, destY, width, height);
if (data.image == null & paint) {
-@@ -537,10 +537,10 @@
+@@ -537,10 +537,10 @@ public void copyArea(int srcX, int srcY,
}
void createLayout() {
@@ -8188,7 +8191,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.layout = layout;
OS.pango_context_set_language(context, OS.gtk_get_default_language());
-@@ -560,13 +560,13 @@
+@@ -560,13 +560,13 @@ void disposeLayout() {
void destroy() {
if (data.disposeCairo) {
@@ -8204,7 +8207,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);
Image image = data.image;
if (image != null) {
-@@ -629,7 +629,7 @@
+@@ -629,7 +629,7 @@ public void drawArc(int x, int y, int wi
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -8213,7 +8216,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -680,8 +680,8 @@
+@@ -680,8 +680,8 @@ public void drawFocus(int x, int y, int
* are not valid in the default style. The fix is to use a style
* from a widget.
*/
@@ -8224,7 +8227,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
checkGC(FOREGROUND);
int[] lineWidth = new int[1];
-@@ -786,7 +786,7 @@
+@@ -786,7 +786,7 @@ void drawImage(Image srcImage, int srcX,
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
@@ -8233,7 +8236,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
-@@ -808,7 +808,7 @@
+@@ -808,7 +808,7 @@ void drawImage(Image srcImage, int srcX,
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
@@ -8242,7 +8245,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
-@@ -827,8 +827,8 @@
+@@ -827,8 +827,8 @@ void drawImage(Image srcImage, int srcX,
* the image that was created or the edges are still faded.
*/
if (Cairo.cairo_version () >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0)) {
@@ -8253,7 +8256,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
-@@ -851,7 +851,7 @@
+@@ -851,7 +851,7 @@ void drawImage(Image srcImage, int srcX,
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
@@ -8262,7 +8265,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
-@@ -891,7 +891,7 @@
+@@ -891,7 +891,7 @@ void drawImage(Image srcImage, int srcX,
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);
return;
}
@@ -8271,7 +8274,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (pixbuf != 0) {
OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(pixbuf);
-@@ -908,12 +908,12 @@
+@@ -908,12 +908,12 @@ void drawImageAlpha(Image srcImage, int
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);
return;
}
@@ -8287,7 +8290,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
byte[] line = new byte[stride];
byte alpha = (byte)srcImage.alpha;
byte[] alphaData = srcImage.alphaData;
-@@ -926,7 +926,7 @@
+@@ -926,7 +926,7 @@ void drawImageAlpha(Image srcImage, int
OS.memmove(pixels + (y * stride), line, stride);
}
if (srcWidth != destWidth || srcHeight != destHeight) {
@@ -8296,7 +8299,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.g_object_unref(pixbuf);
if (scaledPixbuf == 0) return;
pixbuf = scaledPixbuf;
-@@ -943,33 +943,33 @@
+@@ -943,33 +943,33 @@ void drawImageAlpha(Image srcImage, int
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) {
@@ -8340,7 +8343,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<srcWidth; x++) {
if (maskLine[x * 3] == 0) {
-@@ -979,10 +979,10 @@
+@@ -979,10 +979,10 @@ void drawImageMask(Image srcImage, int s
OS.memmove(offset, line, stride);
}
OS.g_object_unref(maskPixbuf);
@@ -8354,7 +8357,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_pixbuf_render_pixmap_and_mask(scaledPixbuf, colorBuffer, maskBuffer, 128);
colorPixmap = colorBuffer[0];
maskPixmap = maskBuffer[0];
-@@ -1003,9 +1003,9 @@
+@@ -1003,9 +1003,9 @@ void drawImageMask(Image srcImage, int s
int newHeight = srcY + srcHeight;
int bytesPerLine = (newWidth + 7) / 8;
byte[] maskData = new byte[bytesPerLine * newHeight];
@@ -8366,7 +8369,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_offset(data.clipRgn, -destX + srcX, -destY + srcY);
OS.gdk_gc_set_clip_region(gc, data.clipRgn);
OS.gdk_region_offset(data.clipRgn, destX - srcX, destY - srcY);
-@@ -1037,19 +1037,19 @@
+@@ -1037,19 +1037,19 @@ void drawImageMask(Image srcImage, int s
/* Destroy the image mask if the there is a GC created on the image */
if (srcImage.transparentPixel != -1 && srcImage.memGC != null) srcImage.destroyMask();
}
@@ -8391,7 +8394,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (maskPixmap != 0) {
int attribCount = 0;
XRenderPictureAttributes attrib = null;
-@@ -1061,10 +1061,10 @@
+@@ -1061,10 +1061,10 @@ void drawImageXRender(Image srcImage, in
maskPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(xDisplay, maskType), attribCount, attrib);
if (maskPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -8405,7 +8408,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (srcPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
int[] transform = new int[]{(int)(((float)srcWidth / destWidth) * 65536), 0, 0, 0, (int)(((float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536};
-@@ -1073,7 +1073,7 @@
+@@ -1073,7 +1073,7 @@ void drawImageXRender(Image srcImage, in
srcX *= destWidth / (float)srcWidth;
srcY *= destHeight / (float)srcHeight;
}
@@ -8414,7 +8417,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.damageRgn != 0) {
if (clipping == 0) {
clipping = data.damageRgn;
-@@ -1085,7 +1085,7 @@
+@@ -1085,7 +1085,7 @@ void drawImageXRender(Image srcImage, in
}
if (clipping != 0) {
int[] nRects = new int[1];
@@ -8423,7 +8426,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(clipping, rects, nRects);
GdkRectangle rect = new GdkRectangle();
short[] xRects = new short[nRects[0] * 4];
-@@ -1107,12 +1107,12 @@
+@@ -1107,12 +1107,12 @@ void drawImageXRender(Image srcImage, in
OS.XRenderFreePicture(xDisplay, srcPict);
if (maskPict != 0) OS.XRenderFreePicture(xDisplay, maskPict);
}
@@ -8440,7 +8443,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.g_object_unref(pixbuf);
return scaledPixbuf;
}
-@@ -1133,7 +1133,7 @@
+@@ -1133,7 +1133,7 @@ int /*long*/ scale(int /*long*/ src, int
public void drawLine(int x1, int y1, int x2, int y2) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -8449,7 +8452,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);
-@@ -1176,7 +1176,7 @@
+@@ -1176,7 +1176,7 @@ public void drawOval(int x, int y, int w
y = y + height;
height = -height;
}
@@ -8458,7 +8461,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -1223,11 +1223,11 @@
+@@ -1223,11 +1223,11 @@ public void drawPath(Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(DRAW);
@@ -8472,7 +8475,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1255,7 +1255,7 @@
+@@ -1255,7 +1255,7 @@ public void drawPath(Path path) {
public void drawPoint (int x, int y) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -8481,7 +8484,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, 1, 1);
Cairo.cairo_fill(cairo);
-@@ -1285,7 +1285,7 @@
+@@ -1285,7 +1285,7 @@ public void drawPolygon(int[] pointArray
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -8490,7 +8493,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_stroke(cairo);
-@@ -1315,7 +1315,7 @@
+@@ -1315,7 +1315,7 @@ public void drawPolyline(int[] pointArra
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -8499,7 +8502,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, false);
Cairo.cairo_stroke(cairo);
-@@ -1324,7 +1324,7 @@
+@@ -1324,7 +1324,7 @@ public void drawPolyline(int[] pointArra
OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);
}
@@ -8508,7 +8511,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
int count = pointArray.length / 2;
if (count == 0) return;
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
-@@ -1361,7 +1361,7 @@
+@@ -1361,7 +1361,7 @@ public void drawRectangle(int x, int y,
y = y + height;
height = -height;
}
@@ -8517,7 +8520,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
-@@ -1431,7 +1431,7 @@
+@@ -1431,7 +1431,7 @@ public void drawRoundRectangle(int x, in
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -8526,7 +8529,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (naw == 0 || nah == 0) {
-@@ -1457,7 +1457,7 @@
+@@ -1457,7 +1457,7 @@ public void drawRoundRectangle(int x, in
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -8535,7 +8538,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);
-@@ -1617,7 +1617,7 @@
+@@ -1617,7 +1617,7 @@ public void drawText (String string, int
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
@@ -8544,7 +8547,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-@@ -1666,13 +1666,13 @@
+@@ -1666,13 +1666,13 @@ public void drawText (String string, int
if (!data.xorMode) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
@@ -8561,7 +8564,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
-@@ -1745,7 +1745,7 @@
+@@ -1745,7 +1745,7 @@ public void fillArc(int x, int y, int wi
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -8570,7 +8573,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
-@@ -1822,9 +1822,9 @@
+@@ -1822,9 +1822,9 @@ public void fillGradientRectangle(int x,
fillRectangle(x, y, width, height);
return;
}
@@ -8582,7 +8585,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
-@@ -1874,7 +1874,7 @@
+@@ -1874,7 +1874,7 @@ public void fillOval(int x, int y, int w
y = y + height;
height = -height;
}
@@ -8591,7 +8594,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
-@@ -1920,8 +1920,8 @@
+@@ -1920,8 +1920,8 @@ public void fillPath (Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
@@ -8602,7 +8605,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1951,7 +1951,7 @@
+@@ -1951,7 +1951,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);
@@ -8611,7 +8614,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
-@@ -1986,7 +1986,7 @@
+@@ -1986,7 +1986,7 @@ public void fillRectangle(int x, int y,
y = y + height;
height = -height;
}
@@ -8620,7 +8623,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
-@@ -2052,7 +2052,7 @@
+@@ -2052,7 +2052,7 @@ public void fillRoundRectangle(int x, in
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -8629,7 +8632,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
-@@ -2077,7 +2077,7 @@
+@@ -2077,7 +2077,7 @@ public void fillRoundRectangle(int x, in
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -8638,7 +8641,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);
-@@ -2296,11 +2296,11 @@
+@@ -2296,11 +2296,11 @@ public Rectangle getClipping() {
height = h[0];
}
/* Intersect visible bounds with clipping in device space and then convert then to user space */
@@ -8654,7 +8657,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GdkRectangle rect = new GdkRectangle();
rect.width = width;
rect.height = height;
-@@ -2356,10 +2356,10 @@
+@@ -2356,10 +2356,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);
@@ -8668,7 +8671,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn == 0) {
GdkRectangle rect = new GdkRectangle();
if (data.width != -1 && data.height != -1) {
-@@ -2375,7 +2375,7 @@
+@@ -2375,7 +2375,7 @@ public void getClipping(Region region) {
} else {
/* Convert clipping to device space if needed */
if (data.clippingTransform != null) {
@@ -8677,7 +8680,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
} else {
-@@ -2390,7 +2390,7 @@
+@@ -2390,7 +2390,7 @@ public void getClipping(Region region) {
double[] matrix = new double[6];
Cairo.cairo_get_matrix(cairo, matrix);
Cairo.cairo_matrix_invert(matrix);
@@ -8686,7 +8689,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_subtract(clipping, clipping);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
-@@ -2411,7 +2411,7 @@
+@@ -2411,7 +2411,7 @@ public void getClipping(Region region) {
*/
public int getFillRule() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -8695,7 +8698,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo == 0) return SWT.FILL_EVEN_ODD;
return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
}
-@@ -2447,9 +2447,9 @@
+@@ -2447,9 +2447,9 @@ public FontMetrics getFontMetrics() {
if (data.context == 0) createLayout();
checkGC(FONT);
Font font = data.font;
@@ -8708,7 +8711,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
FontMetrics fm = new FontMetrics();
fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));
fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));
-@@ -2694,13 +2694,13 @@
+@@ -2694,13 +2694,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)) {
@@ -8724,7 +8727,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);
}
}
-@@ -2735,7 +2735,7 @@
+@@ -2735,7 +2735,7 @@ public void getTransform(Transform trans
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);
@@ -8733,7 +8736,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
double[] identity = identity();
-@@ -2795,7 +2795,7 @@
+@@ -2795,7 +2795,7 @@ double[] identity() {
return identity;
}
@@ -8742,7 +8745,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.foreground != null) data.state &= ~FOREGROUND;
if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
if (data.font != null) data.state &= ~FONT;
-@@ -2815,27 +2815,27 @@
+@@ -2815,27 +2815,27 @@ void init(Drawable drawable, GCData data
handle = gdkGC;
if ((data.style & SWT.MIRRORED) != 0) {
initCairo();
@@ -8777,7 +8780,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
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];
-@@ -2845,7 +2845,7 @@
+@@ -2845,7 +2845,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];
@@ -8786,7 +8789,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
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);
-@@ -2969,7 +2969,7 @@
+@@ -2969,7 +2969,7 @@ public void setAdvanced(boolean advanced
} catch (SWTException e) {}
} else {
if (!data.disposeCairo) return;
@@ -8795,7 +8798,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
-@@ -3049,7 +3049,7 @@
+@@ -3049,7 +3049,7 @@ public void setAntialias(int antialias)
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -8804,7 +8807,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_set_antialias(cairo, mode);
}
-@@ -3111,12 +3111,12 @@
+@@ -3111,12 +3111,12 @@ public void setBackgroundPattern(Pattern
data.state &= ~BACKGROUND;
}
@@ -8820,7 +8823,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
int length = OS.strlen(family);
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, family, length);
-@@ -3133,12 +3133,12 @@
+@@ -3133,12 +3133,12 @@ static void setCairoFont(int /*long*/ ca
Cairo.cairo_set_font_size(cairo, height);
}
@@ -8835,7 +8838,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i<nRects[0]; i++) {
-@@ -3149,7 +3149,7 @@
+@@ -3149,7 +3149,7 @@ static void setCairoRegion(int /*long*/
}
}
@@ -8844,7 +8847,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GdkColor color = c.handle;
double aa = (alpha & 0xFF) / (double)0xFF;
double red = ((color.red & 0xFFFF) / (double)0xFFFF);
-@@ -3158,8 +3158,8 @@
+@@ -3158,8 +3158,8 @@ static void setCairoPatternColor(int /*l
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
@@ -8855,7 +8858,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_reset_clip(cairo);
if (damageRgn != 0) {
double[] matrix = new double[6];
-@@ -3177,8 +3177,8 @@
+@@ -3177,8 +3177,8 @@ void setCairoClip(int /*long*/ damageRgn
}
}
@@ -8866,7 +8869,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.gdk_region_destroy(data.clipRgn);
-@@ -3188,7 +3188,7 @@
+@@ -3188,7 +3188,7 @@ void setClipping(int /*long*/ clipRgn) {
data.clippingTransform = null;
setCairoClip(data.damageRgn, 0);
} else {
@@ -8875,7 +8878,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_gc_set_clip_region(handle, clipping);
}
} else {
-@@ -3200,7 +3200,7 @@
+@@ -3200,7 +3200,7 @@ void setClipping(int /*long*/ clipRgn) {
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
setCairoClip(data.damageRgn, clipRgn);
} else {
@@ -8884,7 +8887,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.damageRgn != 0) {
clipping = OS.gdk_region_new();
OS.gdk_region_union(clipping, clipRgn);
-@@ -3241,7 +3241,7 @@
+@@ -3241,7 +3241,7 @@ public void setClipping(int x, int y, in
rect.y = y;
rect.width = width;
rect.height = height;
@@ -8893,7 +8896,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union_with_rect(clipRgn, rect);
setClipping(clipRgn);
OS.gdk_region_destroy(clipRgn);
-@@ -3279,8 +3279,8 @@
+@@ -3279,8 +3279,8 @@ public void setClipping(Path path) {
setClipping(0);
if (path != null) {
initCairo();
@@ -8904,7 +8907,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -3383,7 +3383,7 @@
+@@ -3383,7 +3383,7 @@ public void setFillRule(int rule) {
}
//TODO - need fill rule in X, GDK has no API
initCairo();
@@ -8913,7 +8916,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
-@@ -3774,7 +3774,7 @@
+@@ -3774,7 +3774,7 @@ void setString(String string, int flags)
}
byte[] buffer;
int mnemonic, length = string.length ();
@@ -8922,7 +8925,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
char[] text = new char[length];
string.getChars(0, length, text, 0);
if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {
-@@ -3787,8 +3787,8 @@
+@@ -3787,8 +3787,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);
@@ -8933,7 +8936,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
PangoAttribute attribute = new PangoAttribute();
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = buffer1.length;
-@@ -3850,7 +3850,7 @@
+@@ -3850,7 +3850,7 @@ public void setTextAntialias(int antiali
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -8942,7 +8945,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
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);
-@@ -3892,7 +3892,7 @@
+@@ -3892,7 +3892,7 @@ public void setTransform(Transform trans
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
@@ -8951,7 +8954,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
double[] identity = identity();
if (transform != null) {
Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
-@@ -4008,7 +4008,7 @@
+@@ -4008,7 +4008,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);
@@ -8960,10 +8963,10 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics/Image.java
---- x86/org/eclipse/swt/graphics/Image.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Image.java 2010-09-09 12:02:46.000000000 +0000
-@@ -96,7 +96,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Image.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Image.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Image.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Image.java 2011-03-21 11:34:23.235735219 +0000
+@@ -96,7 +96,7 @@ public final class Image extends Resourc
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -8972,7 +8975,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/**
* The handle to the OS mask resource.
-@@ -110,9 +110,9 @@
+@@ -110,9 +110,9 @@ public final class Image extends Resourc
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -8984,7 +8987,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/**
* specifies the transparent pixel
-@@ -245,9 +245,9 @@
+@@ -245,9 +245,9 @@ public Image(Device device, Image srcIma
if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) {
/* Generate the mask if necessary. */
if (srcImage.transparentPixel != -1) srcImage.createMask();
@@ -8996,7 +8999,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
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);
-@@ -266,9 +266,9 @@
+@@ -266,9 +266,9 @@ public Image(Device device, Image srcIma
createAlphaMask(width, height);
/* Create the new pixmap */
@@ -9008,7 +9011,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.pixmap = pixmap;
-@@ -278,12 +278,12 @@
+@@ -278,12 +278,12 @@ public Image(Device device, Image srcIma
} else {
/* Retrieve the source pixmap data */
@@ -9024,7 +9027,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/* Apply transformation */
switch (flag) {
-@@ -545,7 +545,7 @@
+@@ -545,7 +545,7 @@ void initNative(String filename) {
char [] chars = new char [length];
filename.getChars (0, length, chars, 0);
byte [] buffer = Converter.wcsToMbcs(null, chars, true);
@@ -9033,7 +9036,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (pixbuf != 0) {
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
if (hasAlpha) {
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ void initNative(String filename) {
int width = OS.gdk_pixbuf_get_width(pixbuf);
int height = OS.gdk_pixbuf_get_height(pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -9042,7 +9045,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
byte[] line = new byte[stride];
alphaData = new byte[width * height];
for (int y = 0; y < height; y++) {
-@@ -572,7 +572,7 @@
+@@ -572,7 +572,7 @@ void initNative(String filename) {
}
createAlphaMask(width, height);
}
@@ -9051,7 +9054,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);
this.type = SWT.BITMAP;
this.pixmap = pixmap_return[0];
-@@ -586,14 +586,14 @@
+@@ -586,14 +586,14 @@ void createAlphaMask (int width, int hei
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);
@@ -9068,7 +9071,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, imagePtr);
-@@ -622,7 +622,7 @@
+@@ -622,7 +622,7 @@ void createMask() {
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -9077,7 +9080,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
ImageData mask = image.getTransparencyMask();
byte[] data = mask.data;
byte[] maskData = copy ? new byte[data.length] : data;
-@@ -644,14 +644,14 @@
+@@ -644,14 +644,14 @@ void createSurface() {
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
if (mask != 0 || alpha != -1 || alphaData != null) {
@@ -9096,7 +9099,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.memmove(ptr, new int[]{1}, 4);
OS.memmove(line, ptr, 1);
OS.free(ptr);
-@@ -663,13 +663,13 @@
+@@ -663,13 +663,13 @@ void createSurface() {
oa = 3; or = 2; og = 1; ob = 0;
}
if (mask != 0 && OS.gdk_drawable_get_depth(mask) == 1) {
@@ -9113,7 +9116,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
OS.memmove(maskLine, maskOffset, maskStride);
-@@ -692,7 +692,7 @@
+@@ -692,7 +692,7 @@ void createSurface() {
}
OS.g_object_unref(maskPixbuf);
} else if (alpha != -1) {
@@ -9122,7 +9125,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -712,7 +712,7 @@
+@@ -712,7 +712,7 @@ void createSurface() {
offset += stride;
}
} else if (alphaData != null) {
@@ -9131,7 +9134,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -733,7 +733,7 @@
+@@ -733,7 +733,7 @@ void createSurface() {
offset += stride;
}
} else {
@@ -9140,7 +9143,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -754,9 +754,9 @@
+@@ -754,9 +754,9 @@ void createSurface() {
surface = Cairo.cairo_image_surface_create_for_data(surfaceData, Cairo.CAIRO_FORMAT_ARGB32, width, height, stride);
OS.g_object_unref(pixbuf);
} else {
@@ -9153,7 +9156,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
}
/* Destroy the image mask if the there is a GC created on the image */
-@@ -866,12 +866,12 @@
+@@ -866,12 +866,12 @@ public ImageData getImageData() {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
@@ -9169,7 +9172,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
byte[] srcData = new byte[stride * height];
OS.memmove(srcData, pixels, srcData.length);
OS.g_object_unref(pixbuf);
-@@ -882,7 +882,7 @@
+@@ -882,7 +882,7 @@ public ImageData getImageData() {
if (transparentPixel == -1 && type == SWT.ICON && mask != 0) {
/* Get the icon mask data */
@@ -9178,7 +9181,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, gdkImagePtr);
-@@ -934,7 +934,7 @@
+@@ -934,7 +934,7 @@ public ImageData getImageData() {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -9187,7 +9190,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
Image image = new Image(device);
image.type = type;
image.pixmap = pixmap;
-@@ -970,9 +970,9 @@
+@@ -970,9 +970,9 @@ void init(int width, int height) {
white.red = (short)0xFFFF;
white.green = (short)0xFFFF;
white.blue = (short)0xFFFF;
@@ -9199,7 +9202,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.gdk_gc_set_foreground(gdkGC, white);
OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);
OS.g_object_unref(gdkGC);
-@@ -987,10 +987,10 @@
+@@ -987,10 +987,10 @@ void init(ImageData image) {
if (!(((image.depth == 1 || image.depth == 2 || image.depth == 4 || image.depth == 8) && !palette.isDirect) ||
((image.depth == 8) || (image.depth == 16 || image.depth == 24 || image.depth == 32) && palette.isDirect)))
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
@@ -9212,7 +9215,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
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];
-@@ -1021,9 +1021,9 @@
+@@ -1021,9 +1021,9 @@ void init(ImageData image) {
}
}
OS.memmove(data, buffer, stride * height);
@@ -9224,7 +9227,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
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);
-@@ -1044,7 +1044,7 @@
+@@ -1044,7 +1044,7 @@ void init(ImageData image) {
transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue;
}
}
@@ -9233,7 +9236,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.mask = mask;
if (isIcon) {
-@@ -1080,12 +1080,12 @@
+@@ -1080,12 +1080,12 @@ void init(ImageData image) {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -9248,7 +9251,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
if ((data.style & mask) == 0) {
-@@ -1120,7 +1120,7 @@
+@@ -1120,7 +1120,7 @@ public int /*long*/ internal_new_GC (GCD
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -9257,10 +9260,10 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.g_object_unref(gdkGC);
}
-diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/Path.java
---- x86/org/eclipse/swt/graphics/Path.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Path.java 2010-09-09 12:02:46.000000000 +0000
-@@ -49,7 +49,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Path.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Path.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Path.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Path.java 2011-03-21 11:34:23.285734513 +0000
+@@ -49,7 +49,7 @@ public class Path extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -9269,7 +9272,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
boolean moved, closed = true;
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ public class Path extends Resource {
public Path (Device device) {
super(device);
this.device.checkCairo();
@@ -9278,7 +9281,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
handle = Cairo.cairo_create(surface);
Cairo.cairo_surface_destroy(surface);
-@@ -121,12 +121,12 @@
+@@ -121,12 +121,12 @@ public Path (Device device, Path path, f
super(device);
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -9293,7 +9296,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
flatness = Math.max(0, flatness);
if (flatness == 0) {
copy = Cairo.cairo_copy_path(path.handle);
-@@ -251,7 +251,7 @@
+@@ -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;
@@ -9302,7 +9305,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(handle, copy);
Cairo.cairo_path_destroy(copy);
-@@ -350,8 +350,8 @@
+@@ -350,8 +350,8 @@ public boolean contains(float x, float y
gc.initCairo();
gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH);
boolean result = false;
@@ -9313,7 +9316,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -409,7 +409,7 @@
+@@ -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);
@@ -9322,7 +9325,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
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 @@
+@@ -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) {
@@ -9331,7 +9334,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ public void getCurrentPoint(float[] poin
*/
public PathData getPathData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -9340,7 +9343,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
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 @@
+@@ -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) {
@@ -9349,10 +9352,10 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
-diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphics/Pattern.java
---- x86/org/eclipse/swt/graphics/Pattern.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Pattern.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,9 +46,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Pattern.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Pattern.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Pattern.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Pattern.java 2011-03-21 11:34:23.285734513 +0000
+@@ -46,9 +46,9 @@ public class Pattern extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -9364,10 +9367,10 @@ diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graph
/**
* Constructs a new Pattern given an image. Drawing with the resulting
-diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphics/Region.java
---- x86/org/eclipse/swt/graphics/Region.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/Region.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,7 +40,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Region.java swt-gtk-3.6.2/org/eclipse/swt/graphics/Region.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/Region.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/Region.java 2011-03-21 11:34:23.265734784 +0000
+@@ -40,7 +40,7 @@ public final class Region extends Resour
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -9376,7 +9379,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
/**
* Constructs a new empty region.
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ public Region(Device device) {
init();
}
@@ -9385,7 +9388,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
super(device);
this.handle = handle;
}
-@@ -109,7 +109,7 @@
+@@ -109,7 +109,7 @@ public void add (int[] pointArray) {
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
@@ -9394,7 +9397,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_union(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -265,7 +265,7 @@
+@@ -265,7 +265,7 @@ public Rectangle getBounds() {
return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);
}
@@ -9403,7 +9406,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
return new Region(device, handle);
}
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ public void intersect(int x, int y, int
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
@@ -9412,7 +9415,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_intersect(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
-@@ -462,7 +462,7 @@
+@@ -462,7 +462,7 @@ public void subtract (int[] pointArray)
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
@@ -9421,7 +9424,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_subtract(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -515,7 +515,7 @@
+@@ -515,7 +515,7 @@ public void subtract(int x, int y, int w
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
@@ -9430,10 +9433,10 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_subtract(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
-diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/graphics/TextLayout.java
---- x86/org/eclipse/swt/graphics/TextLayout.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/graphics/TextLayout.java 2010-09-09 12:02:46.000000000 +0000
-@@ -54,7 +54,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/TextLayout.java swt-gtk-3.6.2/org/eclipse/swt/graphics/TextLayout.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/graphics/TextLayout.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/graphics/TextLayout.java 2011-03-21 11:34:23.235735219 +0000
+@@ -54,7 +54,7 @@ public final class TextLayout extends Re
int[] tabs;
StyleItem[] styles;
int stylesCount;
@@ -9442,7 +9445,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int[] invalidOffsets;
static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF';
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,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;
@@ -9451,7 +9454,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
attrList = OS.pango_attr_list_new();
PangoAttribute attribute = new PangoAttribute();
char[] chars = null;
-@@ -125,12 +125,12 @@
+@@ -125,12 +125,12 @@ void computeRuns () {
int oldPos = 0, lineIndex = 0;
PangoLayoutLine line = new PangoLayoutLine();
while (lineIndex < lineCount) {
@@ -9466,7 +9469,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = bytePos + offset;
attribute.end_index = bytePos + offset + 3;
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ void computeRuns () {
byteEnd = Math.min(byteEnd, strlen);
Font font = style.font;
if (font != null && !font.isDisposed() && !defaultFont.equals(font)) {
@@ -9475,7 +9478,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ void computeRuns () {
break;
case SWT.UNDERLINE_LINK: {
if (style.foreground == null) {
@@ -9484,7 +9487,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ void computeRuns () {
}
}
if (underlineStyle != OS.PANGO_UNDERLINE_NONE && style.underlineColor == null) {
@@ -9493,7 +9496,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ void computeRuns () {
}
}
if (style.strikeout && style.strikeoutColor == null) {
@@ -9502,7 +9505,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -247,7 +247,7 @@
+@@ -247,7 +247,7 @@ void computeRuns () {
Color foreground = style.foreground;
if (foreground != null && !foreground.isDisposed()) {
GdkColor fg = foreground.handle;
@@ -9511,7 +9514,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -257,7 +257,7 @@
+@@ -257,7 +257,7 @@ void computeRuns () {
Color background = style.background;
if (background != null && !background.isDisposed()) {
GdkColor bg = background.handle;
@@ -9520,7 +9523,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -270,7 +270,7 @@
+@@ -270,7 +270,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;
@@ -9529,7 +9532,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ void computeRuns () {
}
int rise = style.rise;
if (rise != 0) {
@@ -9538,7 +9541,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -407,15 +407,15 @@
+@@ -407,15 +407,15 @@ public void draw(GC gc, int x, int y, in
x += Math.min (indent, wrapIndent);
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
GCData data = gc.data;
@@ -9558,7 +9561,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ public void draw(GC gc, int x, int y, in
boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;
if (fullSelection) {
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
@@ -9567,7 +9570,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
Cairo.cairo_scale(cairo, -1, 1);
-@@ -517,7 +517,7 @@
+@@ -517,7 +517,7 @@ public void draw(GC gc, int x, int y, in
drawBorder(gc, x, y, selectionForeground.handle);
}
} else {
@@ -9576,7 +9579,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int byteSelStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionStart) - ptr);
int byteSelEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionEnd + 1) - ptr);
int strlen = OS.strlen(ptr);
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ public void draw(GC gc, int x, int y, in
OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);
drawBorder(gc, x, y, null);
int[] ranges = new int[]{byteSelStart, byteSelEnd};
@@ -9585,7 +9588,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (rgn != 0) {
OS.gdk_gc_set_clip_region(gc.handle, rgn);
OS.gdk_region_destroy(rgn);
-@@ -555,7 +555,7 @@
+@@ -555,7 +555,7 @@ public void draw(GC gc, int x, int y, in
void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {
GCData data = gc.data;
@@ -9594,7 +9597,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
Cairo.cairo_save(cairo);
if (!fullSelection) {
Cairo.cairo_move_to(cairo, x, y);
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ void drawWithCairo(GC gc, int x, int y,
drawBorder(gc, x, y, null);
}
int[] ranges = new int[]{start, end};
@@ -9603,7 +9606,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (rgn != 0) {
OS.gdk_cairo_region(cairo, rgn);
Cairo.cairo_clip(cairo);
-@@ -580,9 +580,9 @@
+@@ -580,9 +580,9 @@ void drawWithCairo(GC gc, int x, int y,
void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
GCData data = gc.data;
@@ -9616,7 +9619,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
GdkGCValues gcValues = null;
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -602,10 +602,10 @@
+@@ -602,10 +602,10 @@ void drawBorder(GC gc, int x, int y, Gdk
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -9629,7 +9632,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -680,10 +680,10 @@
+@@ -680,10 +680,10 @@ void drawBorder(GC gc, int x, int y, Gdk
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -9642,7 +9645,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -706,8 +706,8 @@
+@@ -706,8 +706,8 @@ void drawBorder(GC gc, int x, int y, Gdk
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -9653,7 +9656,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
underlinePosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_position(metrics));
underlineThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -779,10 +779,10 @@
+@@ -779,10 +779,10 @@ void drawBorder(GC gc, int x, int y, Gdk
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -9666,7 +9669,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -805,8 +805,8 @@
+@@ -805,8 +805,8 @@ void drawBorder(GC gc, int x, int y, Gdk
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -9677,7 +9680,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
strikeoutPosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_position(metrics));
strikeoutThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -945,14 +945,14 @@
+@@ -945,14 +945,14 @@ public Rectangle getBounds(int start, in
end = Math.min(Math.max(0, end), length - 1);
start = translateOffset(start);
end = translateOffset(end);
@@ -9694,7 +9697,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle();
-@@ -962,9 +962,9 @@
+@@ -962,9 +962,9 @@ public Rectangle getBounds(int start, in
* is to subtract these areas from the clip region.
*/
PangoRectangle pangoRect = new PangoRectangle();
@@ -9706,7 +9709,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int lineEnd = 0;
do {
-@@ -1080,17 +1080,17 @@
+@@ -1080,17 +1080,17 @@ public int getLevel(int offset) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -9728,7 +9731,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (runPtr != 0) {
OS.memmove(run, runPtr, PangoLayoutRun.sizeof);
OS.memmove(item, run.item, PangoItem.sizeof);
-@@ -1122,7 +1122,7 @@
+@@ -1122,7 +1122,7 @@ public Rectangle getLineBounds(int lineI
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
@@ -9737,7 +9740,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
PangoRectangle rect = new PangoRectangle();
-@@ -1179,11 +1179,11 @@
+@@ -1179,11 +1179,11 @@ public int getLineIndex(int offset) {
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
offset = translateOffset(offset);
int line = 0;
@@ -9752,7 +9755,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
while (OS.pango_layout_iter_next_line(iter)) {
if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
-@@ -1215,9 +1215,9 @@
+@@ -1215,9 +1215,9 @@ public FontMetrics getLineMetrics (int l
PangoLayoutLine line = new PangoLayoutLine();
OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
if (line.runs == 0) {
@@ -9765,7 +9768,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
ascent = OS.pango_font_metrics_get_ascent(metrics);
descent = OS.pango_font_metrics_get_descent(metrics);
OS.pango_font_metrics_unref(metrics);
-@@ -1248,10 +1248,10 @@
+@@ -1248,10 +1248,10 @@ public int[] getLineOffsets() {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
int[] offsets = new int [lineCount + 1];
@@ -9778,7 +9781,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int pos = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + line.start_index);
offsets[i] = untranslateOffset(pos);
-@@ -1282,7 +1282,7 @@
+@@ -1282,7 +1282,7 @@ public Point getLocation(int offset, boo
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -9787,7 +9790,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int byteOffset = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, offset) - ptr);
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
-@@ -1333,7 +1333,7 @@
+@@ -1333,7 +1333,7 @@ int _getOffset (int offset, int movement
}
int step = forward ? 1 : -1;
if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
@@ -9796,7 +9799,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int[] nAttrs = new int[1];
OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);
if (attrs[0] == 0) return offset + step;
-@@ -1433,7 +1433,7 @@
+@@ -1433,7 +1433,7 @@ public int getOffset(int x, int y, int[]
* visual offset. The fix is to clamp the coordinates inside the
* line bounds.
*/
@@ -9805,7 +9808,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
PangoRectangle rect = new PangoRectangle();
do {
-@@ -1453,7 +1453,7 @@
+@@ -1453,7 +1453,7 @@ public int getOffset(int x, int y, int[]
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);
@@ -9814,7 +9817,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int offset = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]);
if (trailing != null) trailing[0] = piTrailing[0];
return untranslateOffset(offset);
-@@ -2147,7 +2147,7 @@
+@@ -2147,7 +2147,7 @@ public void setTabs(int[] tabs) {
if (tabs == null) {
OS.pango_layout_set_tabs(layout, device.emptyTab);
} else {
@@ -9823,10 +9826,10 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (tabArray != 0) {
for (int i = 0; i < tabs.length; i++) {
OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -18,17 +18,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -18,17 +18,17 @@ package org.eclipse.swt.internal.accessi
public class AtkActionIface {
// GTypeInterface parent;
/** @field cast=(gboolean (*)()) */
@@ -9850,10 +9853,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86
// AtkFunction pad1;
// AtkFunction pad2;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,9 +17,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java 2011-03-21 11:34:23.305734214 +0000
+@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessi
public class AtkAttribute {
/** @field cast=(char *) */
@@ -9865,10 +9868,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java x86_6
public static final int sizeof = ATK.AtkAttribute_sizeof ();
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,29 +17,29 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,29 +17,29 @@ package org.eclipse.swt.internal.accessi
public class AtkComponentIface {
/** @field cast=(guint (*)()) */
@@ -9911,10 +9914,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ get_mdi_zorder;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,9 +17,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2011-03-21 11:34:23.305734214 +0000
+@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessi
public class AtkHypertextIface {
/** @field cast=(AtkHyperlink *(*)()) */
@@ -9927,10 +9930,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
- public int /*long*/ get_link_index;
+ public long /*int*/ get_link_index;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2010-09-09 12:02:46.000000000 +0000
-@@ -198,26 +198,26 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/ATK.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/ATK.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2011-03-21 11:34:23.305734214 +0000
+@@ -198,26 +198,26 @@ public static final native int AtkTextRe
/** Natives */
/** @method flags=const */
@@ -9969,7 +9972,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_ACTION_GET_IFACE(obj);
-@@ -225,8 +225,8 @@
+@@ -225,8 +225,8 @@ public static final int /*long*/ ATK_ACT
lock.unlock();
}
}
@@ -9980,7 +9983,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_COMPONENT_GET_IFACE(atkHandle);
-@@ -234,9 +234,9 @@
+@@ -234,9 +234,9 @@ public static final int /*long*/ ATK_COM
lock.unlock();
}
}
@@ -9993,7 +9996,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_SELECTION_GET_IFACE(obj);
-@@ -244,8 +244,8 @@
+@@ -244,8 +244,8 @@ public static final int /*long*/ ATK_SEL
lock.unlock();
}
}
@@ -10004,7 +10007,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_HYPERTEXT_GET_IFACE(handle);
-@@ -253,8 +253,8 @@
+@@ -253,8 +253,8 @@ public static final int /*long*/ ATK_HYP
lock.unlock();
}
}
@@ -10015,7 +10018,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_TABLE_GET_IFACE(handle);
-@@ -262,8 +262,8 @@
+@@ -262,8 +262,8 @@ public static final int /*long*/ ATK_TAB
lock.unlock();
}
}
@@ -10026,7 +10029,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_TEXT_GET_IFACE(handle);
-@@ -271,8 +271,8 @@
+@@ -271,8 +271,8 @@ public static final int /*long*/ ATK_TEX
lock.unlock();
}
}
@@ -10037,7 +10040,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_VALUE_GET_IFACE(handle);
-@@ -280,8 +280,8 @@
+@@ -280,8 +280,8 @@ public static final int /*long*/ ATK_VAL
lock.unlock();
}
}
@@ -10048,7 +10051,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _GTK_ACCESSIBLE(handle);
-@@ -290,8 +290,8 @@
+@@ -290,8 +290,8 @@ public static final int /*long*/ GTK_ACC
}
}
/** @param object cast=(AtkObject *) */
@@ -10059,7 +10062,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_focus_tracker_notify(object);
-@@ -299,8 +299,8 @@
+@@ -299,8 +299,8 @@ public static final void atk_focus_track
lock.unlock();
}
}
@@ -10070,7 +10073,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_get_default_registry();
-@@ -312,8 +312,8 @@
+@@ -312,8 +312,8 @@ public static final int /*long*/ atk_get
* @param factory cast=(AtkObjectFactory *)
* @param obj cast=(GObject *)
*/
@@ -10081,7 +10084,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_factory_create_accessible(factory, obj);
-@@ -322,8 +322,8 @@
+@@ -322,8 +322,8 @@ public static final int /*long*/ atk_obj
}
}
/** @param factory cast=(AtkObjectFactory *) */
@@ -10092,7 +10095,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_factory_get_accessible_type(factory);
-@@ -335,8 +335,8 @@
+@@ -335,8 +335,8 @@ public static final int /*long*/ atk_obj
* @param accessible cast=(AtkObject *)
* @param data cast=(gpointer)
*/
@@ -10103,7 +10106,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_object_initialize(accessible, data);
-@@ -345,8 +345,8 @@
+@@ -345,8 +345,8 @@ public static final void atk_object_init
}
}
/** @param accessible cast=(AtkObject *) */
@@ -10114,7 +10117,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_object_notify_state_change(accessible, state, value);
-@@ -355,8 +355,8 @@
+@@ -355,8 +355,8 @@ public static final void atk_object_noti
}
}
/** @param accessible cast=(AtkObject *) */
@@ -10125,7 +10128,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_ref_relation_set(accessible);
-@@ -392,8 +392,8 @@
+@@ -392,8 +392,8 @@ public static final int atk_text_attribu
* @param registry cast=(AtkRegistry *)
* @param type cast=(GType)
*/
@@ -10136,7 +10139,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_registry_get_factory(registry, type);
-@@ -406,8 +406,8 @@
+@@ -406,8 +406,8 @@ public static final int /*long*/ atk_reg
* @param type cast=(GType)
* @param factory_type cast=(GType)
*/
@@ -10147,7 +10150,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_registry_set_factory_type(registry, type, factory_type);
-@@ -416,8 +416,8 @@
+@@ -416,8 +416,8 @@ public static final void atk_registry_se
}
}
/** @param set cast=(AtkRelationSet *) */
@@ -10158,7 +10161,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_relation_set_get_n_relations(set);
-@@ -426,8 +426,8 @@
+@@ -426,8 +426,8 @@ public static final int atk_relation_set
}
}
/** @param set cast=(AtkRelationSet *) */
@@ -10169,7 +10172,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_relation_set_get_relation (set, i);
-@@ -439,8 +439,8 @@
+@@ -439,8 +439,8 @@ public static final int /*long*/ atk_rel
* @param set cast=(AtkRelationSet *)
* @param relation cast=(AtkRelation *)
*/
@@ -10180,7 +10183,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_relation_set_remove (set, relation);
-@@ -452,8 +452,8 @@
+@@ -452,8 +452,8 @@ public static final void atk_relation_se
* @param set cast=(AtkStateSet *)
* @param type cast=(AtkStateType)
*/
@@ -10191,7 +10194,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_state_set_add_state(set, type);
-@@ -461,8 +461,8 @@
+@@ -461,8 +461,8 @@ public static final boolean atk_state_se
lock.unlock();
}
}
@@ -10202,7 +10205,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_state_set_new();
-@@ -470,8 +470,8 @@
+@@ -470,8 +470,8 @@ public static final int /*long*/ atk_sta
lock.unlock();
}
}
@@ -10213,7 +10216,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_text_attribute_get_name(attr);
-@@ -479,8 +479,8 @@
+@@ -479,8 +479,8 @@ public static final int /*long*/ atk_tex
lock.unlock();
}
}
@@ -10224,7 +10227,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_text_attribute_get_value(attr, index);
-@@ -488,8 +488,8 @@
+@@ -488,8 +488,8 @@ public static final int /*long*/ atk_tex
lock.unlock();
}
}
@@ -10235,7 +10238,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0);
-@@ -497,8 +497,8 @@
+@@ -497,8 +497,8 @@ public static final int /*long*/ call (i
lock.unlock();
}
}
@@ -10246,7 +10249,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1);
-@@ -506,8 +506,8 @@
+@@ -506,8 +506,8 @@ public static final int /*long*/ call (i
lock.unlock();
}
}
@@ -10257,7 +10260,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2);
-@@ -515,8 +515,8 @@
+@@ -515,8 +515,8 @@ public static final int /*long*/ call (i
lock.unlock();
}
}
@@ -10268,7 +10271,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3);
-@@ -524,8 +524,8 @@
+@@ -524,8 +524,8 @@ public static final int /*long*/ call (i
lock.unlock();
}
}
@@ -10279,7 +10282,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4);
-@@ -533,8 +533,8 @@
+@@ -533,8 +533,8 @@ public static final int /*long*/ call (i
lock.unlock();
}
}
@@ -10290,7 +10293,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -543,60 +543,60 @@
+@@ -543,60 +543,60 @@ public static final int /*long*/ call (i
}
}
/** @param str cast=(char *) */
@@ -10377,10 +10380,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
-public static final native void memmove (AtkAttribute dest, int /*long*/ src, int size);
+public static final native void memmove (AtkAttribute dest, long /*int*/ src, int size);
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,51 +17,51 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2011-03-21 11:34:23.305734214 +0000
+@@ -17,51 +17,51 @@ package org.eclipse.swt.internal.accessi
public class AtkObjectClass {
/** @field cast=(G_CONST_RETURN gchar *(*)()) */
@@ -10456,10 +10459,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86
- public int /*long*/ get_attributes;
+ public long /*int*/ get_attributes;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,9 +17,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessi
public class AtkObjectFactoryClass {
/** @field cast=(AtkObject *(*)()) */
@@ -10472,10 +10475,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.j
- public int /*long*/ get_accessible_type;
+ public long /*int*/ get_accessible_type;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,19 +17,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,19 +17,19 @@ package org.eclipse.swt.internal.accessi
public class AtkSelectionIface {
/** @field cast=(gboolean (*)()) */
@@ -10503,10 +10506,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
- public int /*long*/ selection_changed;
+ public long /*int*/ selection_changed;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,75 +17,75 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,75 +17,75 @@ package org.eclipse.swt.internal.accessi
public class AtkTableIface {
/** @field cast=(AtkObject* (*)()) */
@@ -10618,10 +10621,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java x86_
- public int /*long*/ model_changed;
+ public long /*int*/ model_changed;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,47 +17,47 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,47 +17,47 @@ package org.eclipse.swt.internal.accessi
public class AtkTextIface {
/** @field cast=(gchar *(*)()) */
@@ -10691,10 +10694,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_6
- public int /*long*/ get_bounded_ranges;
+ public long /*int*/ get_bounded_ranges;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2010-09-09 12:02:46.000000000 +0000
-@@ -20,7 +20,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java 2011-03-21 11:34:23.295734363 +0000
+@@ -20,7 +20,7 @@ public class AtkTextRange {
public int start_offset;
public int end_offset;
/** @field cast=(gchar *) */
@@ -10703,10 +10706,10 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java x86_6
public static final int sizeof = ATK.AtkTextRange_sizeof ();
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,11 +17,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java 2011-03-21 11:34:23.295734363 +0000
+@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.accessi
public class AtkValueIface {
/** @field cast=(void (*)()) */
@@ -10722,20 +10725,20 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java x86_
- public int /*long*/ set_current_value;
+ public long /*int*/ set_current_value;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,5 +17,5 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2011-03-21 11:34:23.305734214 +0000
+@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.accessi
public class GtkAccessible {
/** @field cast=(GtkWidget *) */
- public int /*long*/ widget;
+ public long /*int*/ widget;
}
-diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/internal/BidiUtil.java
---- x86/org/eclipse/swt/internal/BidiUtil.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/BidiUtil.java 2010-09-09 12:02:46.000000000 +0000
-@@ -42,7 +42,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/BidiUtil.java swt-gtk-3.6.2/org/eclipse/swt/internal/BidiUtil.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/BidiUtil.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/BidiUtil.java 2011-03-21 11:34:23.325733931 +0000
+@@ -42,7 +42,7 @@ public class BidiUtil {
/*
* Not implemented.
*/
@@ -10744,7 +10747,7 @@ diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/inte
}
public static void addLanguageListener (Control control, Runnable runnable) {
}
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ public static int getKeyboardLanguage()
/*
* Not implemented.
*/
@@ -10753,7 +10756,7 @@ diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/inte
}
public static void removeLanguageListener (Control control) {
}
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ public static void setKeyboardLanguage(i
/*
* Not implemented.
*/
@@ -10762,10 +10765,10 @@ diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/inte
return false;
}
public static boolean setOrientation (Control control, int orientation) {
-diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/internal/cairo/Cairo.java
---- x86/org/eclipse/swt/internal/cairo/Cairo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/cairo/Cairo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -109,8 +109,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cairo/Cairo.java swt-gtk-3.6.2/org/eclipse/swt/internal/cairo/Cairo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cairo/Cairo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/cairo/Cairo.java 2011-03-21 11:34:23.315734069 +0000
+@@ -109,8 +109,8 @@ public static final native int CAIRO_VER
* @param cr cast=(cairo_t *)
* @param path cast=(cairo_path_t *)
*/
@@ -10776,7 +10779,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_append_path(cr, path);
-@@ -119,8 +119,8 @@
+@@ -119,8 +119,8 @@ public static final void cairo_append_pa
}
}
/** @param cr cast=(cairo_t *) */
@@ -10787,7 +10790,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_arc(cr, xc, yc, radius, angle1, angle2);
-@@ -129,8 +129,8 @@
+@@ -129,8 +129,8 @@ public static final void cairo_arc(int /
}
}
/** @param cr cast=(cairo_t *) */
@@ -10798,7 +10801,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);
-@@ -139,8 +139,8 @@
+@@ -139,8 +139,8 @@ public static final void cairo_arc_negat
}
}
/** @param cr cast=(cairo_t *) */
@@ -10809,7 +10812,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_clip(cr);
-@@ -149,8 +149,8 @@
+@@ -149,8 +149,8 @@ public static final void cairo_clip(int
}
}
/** @param cr cast=(cairo_t *) */
@@ -10820,7 +10823,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_clip_preserve(cr);
-@@ -159,8 +159,8 @@
+@@ -159,8 +159,8 @@ public static final void cairo_clip_pres
}
}
/** @param cr cast=(cairo_t *) */
@@ -10831,7 +10834,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_close_path(cr);
-@@ -169,8 +169,8 @@
+@@ -169,8 +169,8 @@ public static final void cairo_close_pat
}
}
/** @param cr cast=(cairo_t *) */
@@ -10842,7 +10845,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_copy_page(cr);
-@@ -179,8 +179,8 @@
+@@ -179,8 +179,8 @@ public static final void cairo_copy_page
}
}
/** @param cr cast=(cairo_t *) */
@@ -10853,7 +10856,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_copy_path(cr);
-@@ -189,8 +189,8 @@
+@@ -189,8 +189,8 @@ public static final int /*long*/ cairo_c
}
}
/** @param cr cast=(cairo_t *) */
@@ -10864,7 +10867,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_copy_path_flat(cr);
-@@ -199,8 +199,8 @@
+@@ -199,8 +199,8 @@ public static final int /*long*/ cairo_c
}
}
/** @param target cast=(cairo_surface_t *) */
@@ -10875,7 +10878,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_create(target);
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ public static final int /*long*/ cairo_c
}
}
/** @param cr cast=(cairo_t *) */
@@ -10886,7 +10889,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
-@@ -219,8 +219,8 @@
+@@ -219,8 +219,8 @@ public static final void cairo_curve_to(
}
}
/** @param cr cast=(cairo_t *) */
@@ -10897,7 +10900,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_destroy(cr);
-@@ -229,8 +229,8 @@
+@@ -229,8 +229,8 @@ public static final void cairo_destroy(i
}
}
/** @param cr cast=(cairo_t *) */
@@ -10908,7 +10911,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_device_to_user(cr, x, y);
-@@ -239,8 +239,8 @@
+@@ -239,8 +239,8 @@ public static final void cairo_device_to
}
}
/** @param cr cast=(cairo_t *) */
@@ -10919,7 +10922,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_device_to_user_distance(cr, dx, dy);
-@@ -249,8 +249,8 @@
+@@ -249,8 +249,8 @@ public static final void cairo_device_to
}
}
/** @param cr cast=(cairo_t *) */
@@ -10930,7 +10933,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill(cr);
-@@ -259,8 +259,8 @@
+@@ -259,8 +259,8 @@ public static final void cairo_fill(int
}
}
/** @param cr cast=(cairo_t *) */
@@ -10941,7 +10944,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill_extents(cr, x1, y1, x2, y2);
-@@ -269,8 +269,8 @@
+@@ -269,8 +269,8 @@ public static final void cairo_fill_exte
}
}
/** @param cr cast=(cairo_t *) */
@@ -10952,7 +10955,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill_preserve(cr);
-@@ -279,8 +279,8 @@
+@@ -279,8 +279,8 @@ public static final void cairo_fill_pres
}
}
/** @param cr cast=(cairo_t *) */
@@ -10963,7 +10966,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_extents(cr, extents);
-@@ -288,8 +288,8 @@
+@@ -288,8 +288,8 @@ public static final void cairo_font_exte
lock.unlock();
}
}
@@ -10974,7 +10977,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_font_options_create();
-@@ -298,8 +298,8 @@
+@@ -298,8 +298,8 @@ public static final int /*long*/ cairo_f
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -10985,7 +10988,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_options_destroy(options);
-@@ -308,8 +308,8 @@
+@@ -308,8 +308,8 @@ public static final void cairo_font_opti
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -10996,7 +10999,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_font_options_get_antialias(options);
-@@ -318,8 +318,8 @@
+@@ -318,8 +318,8 @@ public static final int cairo_font_optio
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -11007,7 +11010,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_options_set_antialias(options, antialias);
-@@ -328,8 +328,8 @@
+@@ -328,8 +328,8 @@ public static final void cairo_font_opti
}
}
/** @param cr cast=(cairo_t *) */
@@ -11018,7 +11021,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_antialias(cr);
-@@ -338,8 +338,8 @@
+@@ -338,8 +338,8 @@ public static final int cairo_get_antial
}
}
/** @param cr cast=(cairo_t *) */
@@ -11029,7 +11032,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_current_point(cr, x, y);
-@@ -348,8 +348,8 @@
+@@ -348,8 +348,8 @@ public static final void cairo_get_curre
}
}
/** @param cr cast=(cairo_t *) */
@@ -11040,7 +11043,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_fill_rule(cr);
-@@ -358,8 +358,8 @@
+@@ -358,8 +358,8 @@ public static final int cairo_get_fill_r
}
}
/** @param cr cast=(cairo_t *) */
@@ -11051,7 +11054,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_font_face(cr);
-@@ -371,8 +371,8 @@
+@@ -371,8 +371,8 @@ public static final int /*long*/ cairo_g
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11062,7 +11065,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_font_matrix(cr, matrix);
-@@ -384,8 +384,8 @@
+@@ -384,8 +384,8 @@ public static final void cairo_get_font_
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
@@ -11073,7 +11076,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_font_options(cr, options);
-@@ -394,8 +394,8 @@
+@@ -394,8 +394,8 @@ public static final void cairo_get_font_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11084,7 +11087,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_cap(cr);
-@@ -404,8 +404,8 @@
+@@ -404,8 +404,8 @@ public static final int cairo_get_line_c
}
}
/** @param cr cast=(cairo_t *) */
@@ -11095,7 +11098,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_join(cr);
-@@ -414,8 +414,8 @@
+@@ -414,8 +414,8 @@ public static final int cairo_get_line_j
}
}
/** @param cr cast=(cairo_t *) */
@@ -11106,7 +11109,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_width(cr);
-@@ -427,8 +427,8 @@
+@@ -427,8 +427,8 @@ public static final double cairo_get_lin
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11117,7 +11120,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_matrix(cr, matrix);
-@@ -437,8 +437,8 @@
+@@ -437,8 +437,8 @@ public static final void cairo_get_matri
}
}
/** @param cr cast=(cairo_t *) */
@@ -11128,7 +11131,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_miter_limit(cr);
-@@ -447,8 +447,8 @@
+@@ -447,8 +447,8 @@ public static final double cairo_get_mit
}
}
/** @param cr cast=(cairo_t *) */
@@ -11139,7 +11142,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_operator(cr);
-@@ -457,8 +457,8 @@
+@@ -457,8 +457,8 @@ public static final int cairo_get_operat
}
}
/** @param cr cast=(cairo_t *) */
@@ -11150,7 +11153,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_source(cr);
-@@ -467,8 +467,8 @@
+@@ -467,8 +467,8 @@ public static final int /*long*/ cairo_g
}
}
/** @param cr cast=(cairo_t *) */
@@ -11161,7 +11164,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_target(cr);
-@@ -477,8 +477,8 @@
+@@ -477,8 +477,8 @@ public static final int /*long*/ cairo_g
}
}
/** @param cr cast=(cairo_t *) */
@@ -11172,7 +11175,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_tolerance(cr);
-@@ -491,8 +491,8 @@
+@@ -491,8 +491,8 @@ public static final double cairo_get_tol
* @param glyphs cast=(cairo_glyph_t *)
* @param extents cast=(cairo_text_extents_t *)
*/
@@ -11183,7 +11186,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_glyph_extents(cr, glyphs, num_glyphs, extents);
-@@ -504,8 +504,8 @@
+@@ -504,8 +504,8 @@ public static final void cairo_glyph_ext
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
@@ -11194,7 +11197,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_glyph_path(cr, glyphs, num_glyphs);
-@@ -514,8 +514,8 @@
+@@ -514,8 +514,8 @@ public static final void cairo_glyph_pat
}
}
/** @param cr cast=(cairo_t *) */
@@ -11205,7 +11208,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_identity_matrix(cr);
-@@ -523,8 +523,8 @@
+@@ -523,8 +523,8 @@ public static final void cairo_identity_
lock.unlock();
}
}
@@ -11216,7 +11219,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_create(format, width, height);
-@@ -533,8 +533,8 @@
+@@ -533,8 +533,8 @@ public static final int /*long*/ cairo_i
}
}
/** @param data cast=(unsigned char *) */
@@ -11227,7 +11230,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_create_for_data(data, format, width, height, stride);
-@@ -543,8 +543,8 @@
+@@ -543,8 +543,8 @@ public static final int /*long*/ cairo_i
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11238,7 +11241,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_get_height(surface);
-@@ -553,8 +553,8 @@
+@@ -553,8 +553,8 @@ public static final int cairo_image_surf
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11249,7 +11252,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_get_width(surface);
-@@ -563,8 +563,8 @@
+@@ -563,8 +563,8 @@ public static final int cairo_image_surf
}
}
/** @param cr cast=(cairo_t *) */
@@ -11260,7 +11263,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_in_fill(cr, x, y);
-@@ -573,8 +573,8 @@
+@@ -573,8 +573,8 @@ public static final int cairo_in_fill(in
}
}
/** @param cr cast=(cairo_t *) */
@@ -11271,7 +11274,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_in_stroke(cr, x, y);
-@@ -583,8 +583,8 @@
+@@ -583,8 +583,8 @@ public static final int cairo_in_stroke(
}
}
/** @param cr cast=(cairo_t *) */
@@ -11282,7 +11285,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_line_to(cr, x, y);
-@@ -596,8 +596,8 @@
+@@ -596,8 +596,8 @@ public static final void cairo_line_to(i
* @param cr cast=(cairo_t *)
* @param pattern cast=(cairo_pattern_t *)
*/
@@ -11293,7 +11296,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_mask(cr, pattern);
-@@ -609,8 +609,8 @@
+@@ -609,8 +609,8 @@ public static final void cairo_mask(int
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
@@ -11304,7 +11307,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_mask_surface(cr, surface, surface_x, surface_y);
-@@ -743,8 +743,8 @@
+@@ -743,8 +743,8 @@ public static final void cairo_matrix_tr
}
}
/** @param cr cast=(cairo_t *) */
@@ -11315,7 +11318,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_move_to(cr, x, y);
-@@ -753,8 +753,8 @@
+@@ -753,8 +753,8 @@ public static final void cairo_move_to(i
}
}
/** @param cr cast=(cairo_t *) */
@@ -11326,7 +11329,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_new_path(cr);
-@@ -763,8 +763,8 @@
+@@ -763,8 +763,8 @@ public static final void cairo_new_path(
}
}
/** @param cr cast=(cairo_t *) */
@@ -11337,7 +11340,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_paint(cr);
-@@ -773,8 +773,8 @@
+@@ -773,8 +773,8 @@ public static final void cairo_paint(int
}
}
/** @param cr cast=(cairo_t *) */
@@ -11348,7 +11351,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_paint_with_alpha(cr, alpha);
-@@ -783,8 +783,8 @@
+@@ -783,8 +783,8 @@ public static final void cairo_paint_wit
}
}
/** @param path cast=(cairo_path_t *) */
@@ -11359,7 +11362,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_path_destroy(path);
-@@ -793,8 +793,8 @@
+@@ -793,8 +793,8 @@ public static final void cairo_path_dest
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11370,7 +11373,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue);
-@@ -803,8 +803,8 @@
+@@ -803,8 +803,8 @@ public static final void cairo_pattern_a
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11381,7 +11384,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha);
-@@ -813,8 +813,8 @@
+@@ -813,8 +813,8 @@ public static final void cairo_pattern_a
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11392,7 +11395,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_for_surface(surface);
-@@ -822,8 +822,8 @@
+@@ -822,8 +822,8 @@ public static final int /*long*/ cairo_p
lock.unlock();
}
}
@@ -11403,7 +11406,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_linear(x0, y0, x1, y1);
-@@ -831,8 +831,8 @@
+@@ -831,8 +831,8 @@ public static final int /*long*/ cairo_p
lock.unlock();
}
}
@@ -11414,7 +11417,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1);
-@@ -841,8 +841,8 @@
+@@ -841,8 +841,8 @@ public static final int /*long*/ cairo_p
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11425,7 +11428,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_destroy(pattern);
-@@ -851,8 +851,8 @@
+@@ -851,8 +851,8 @@ public static final void cairo_pattern_d
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11436,7 +11439,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_get_extend(pattern);
-@@ -861,8 +861,8 @@
+@@ -861,8 +861,8 @@ public static final int cairo_pattern_ge
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11447,7 +11450,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_get_filter(pattern);
-@@ -874,8 +874,8 @@
+@@ -874,8 +874,8 @@ public static final int cairo_pattern_ge
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11458,7 +11461,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_get_matrix(pattern, matrix);
-@@ -884,8 +884,8 @@
+@@ -884,8 +884,8 @@ public static final void cairo_pattern_g
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11469,7 +11472,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_reference(pattern);
-@@ -894,8 +894,8 @@
+@@ -894,8 +894,8 @@ public static final void cairo_pattern_r
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11480,7 +11483,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_extend(pattern, extend);
-@@ -904,8 +904,8 @@
+@@ -904,8 +904,8 @@ public static final void cairo_pattern_s
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -11491,7 +11494,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_filter(pattern, filter);
-@@ -917,8 +917,8 @@
+@@ -917,8 +917,8 @@ public static final void cairo_pattern_s
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11502,7 +11505,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_matrix(pattern, matrix);
-@@ -930,8 +930,8 @@
+@@ -930,8 +930,8 @@ public static final void cairo_pattern_s
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -11513,7 +11516,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pdf_surface_set_size(surface, width_in_points, height_in_points);
-@@ -943,8 +943,8 @@
+@@ -943,8 +943,8 @@ public static final void cairo_pdf_surfa
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -11524,7 +11527,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_ps_surface_set_size(surface, width_in_points, height_in_points);
-@@ -953,8 +953,8 @@
+@@ -953,8 +953,8 @@ public static final void cairo_ps_surfac
}
}
/** @param cr cast=(cairo_t *) */
@@ -11535,7 +11538,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rectangle(cr, x, y, width, height);
-@@ -963,8 +963,8 @@
+@@ -963,8 +963,8 @@ public static final void cairo_rectangle
}
}
/** @param cr cast=(cairo_t *) */
@@ -11546,7 +11549,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_reference(cr);
-@@ -973,8 +973,8 @@
+@@ -973,8 +973,8 @@ public static final int /*long*/ cairo_r
}
}
/** @param cr cast=(cairo_t *) */
@@ -11557,7 +11560,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3);
-@@ -983,8 +983,8 @@
+@@ -983,8 +983,8 @@ public static final void cairo_rel_curve
}
}
/** @param cr cast=(cairo_t *) */
@@ -11568,7 +11571,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_line_to(cr, dx, dy);
-@@ -993,8 +993,8 @@
+@@ -993,8 +993,8 @@ public static final void cairo_rel_line_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11579,7 +11582,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_move_to(cr, dx, dy);
-@@ -1003,8 +1003,8 @@
+@@ -1003,8 +1003,8 @@ public static final void cairo_rel_move_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11590,7 +11593,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_reset_clip(cr);
-@@ -1013,8 +1013,8 @@
+@@ -1013,8 +1013,8 @@ public static final void cairo_reset_cli
}
}
/** @param cr cast=(cairo_t *) */
@@ -11601,7 +11604,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_restore(cr);
-@@ -1023,8 +1023,8 @@
+@@ -1023,8 +1023,8 @@ public static final void cairo_restore(i
}
}
/** @param cr cast=(cairo_t *) */
@@ -11612,7 +11615,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rotate(cr, angle);
-@@ -1033,8 +1033,8 @@
+@@ -1033,8 +1033,8 @@ public static final void cairo_rotate(in
}
}
/** @param cr cast=(cairo_t *) */
@@ -11623,7 +11626,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_save(cr);
-@@ -1043,8 +1043,8 @@
+@@ -1043,8 +1043,8 @@ public static final void cairo_save(int
}
}
/** @param cr cast=(cairo_t *) */
@@ -11634,7 +11637,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_scale(cr, sx, sy);
-@@ -1056,8 +1056,8 @@
+@@ -1056,8 +1056,8 @@ public static final void cairo_scale(int
* @param cr cast=(cairo_t *)
* @param family cast=(const char *)
*/
@@ -11645,7 +11648,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_select_font_face(cr, family, slant, weight);
-@@ -1066,8 +1066,8 @@
+@@ -1066,8 +1066,8 @@ public static final void cairo_select_fo
}
}
/** @param cr cast=(cairo_t *) */
@@ -11656,7 +11659,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_antialias(cr, antialias);
-@@ -1076,8 +1076,8 @@
+@@ -1076,8 +1076,8 @@ public static final void cairo_set_antia
}
}
/** @param cr cast=(cairo_t *) */
@@ -11667,7 +11670,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_dash(cr, dashes, ndash, offset);
-@@ -1086,8 +1086,8 @@
+@@ -1086,8 +1086,8 @@ public static final void cairo_set_dash(
}
}
/** @param cr cast=(cairo_t *) */
@@ -11678,7 +11681,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_fill_rule(cr, fill_rule);
-@@ -1099,8 +1099,8 @@
+@@ -1099,8 +1099,8 @@ public static final void cairo_set_fill_
* @param cr cast=(cairo_t *)
* @param font_face cast=(cairo_font_face_t *)
*/
@@ -11689,7 +11692,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_face(cr, font_face);
-@@ -1112,8 +1112,8 @@
+@@ -1112,8 +1112,8 @@ public static final void cairo_set_font_
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11700,7 +11703,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_matrix(cr, matrix);
-@@ -1125,8 +1125,8 @@
+@@ -1125,8 +1125,8 @@ public static final void cairo_set_font_
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
@@ -11711,7 +11714,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_options(cr, options);
-@@ -1135,8 +1135,8 @@
+@@ -1135,8 +1135,8 @@ public static final void cairo_set_font_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11722,7 +11725,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_size(cr, size);
-@@ -1145,8 +1145,8 @@
+@@ -1145,8 +1145,8 @@ public static final void cairo_set_font_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11733,7 +11736,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_cap(cr, line_cap);
-@@ -1155,8 +1155,8 @@
+@@ -1155,8 +1155,8 @@ public static final void cairo_set_line_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11744,7 +11747,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_join(cr, line_join);
-@@ -1165,8 +1165,8 @@
+@@ -1165,8 +1165,8 @@ public static final void cairo_set_line_
}
}
/** @param cr cast=(cairo_t *) */
@@ -11755,7 +11758,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_width(cr, width);
-@@ -1178,8 +1178,8 @@
+@@ -1178,8 +1178,8 @@ public static final void cairo_set_line_
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -11766,7 +11769,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_matrix(cr, matrix);
-@@ -1188,8 +1188,8 @@
+@@ -1188,8 +1188,8 @@ public static final void cairo_set_matri
}
}
/** @param cr cast=(cairo_t *) */
@@ -11777,7 +11780,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_miter_limit(cr, limit);
-@@ -1198,8 +1198,8 @@
+@@ -1198,8 +1198,8 @@ public static final void cairo_set_miter
}
}
/** @param cr cast=(cairo_t *) */
@@ -11788,7 +11791,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_operator(cr, op);
-@@ -1211,8 +1211,8 @@
+@@ -1211,8 +1211,8 @@ public static final void cairo_set_opera
* @param cr cast=(cairo_t *)
* @param source cast=(cairo_pattern_t *)
*/
@@ -11799,7 +11802,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source(cr, source);
-@@ -1221,8 +1221,8 @@
+@@ -1221,8 +1221,8 @@ public static final void cairo_set_sourc
}
}
/** @param cr cast=(cairo_t *) */
@@ -11810,7 +11813,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_rgb(cr, red, green, blue);
-@@ -1231,8 +1231,8 @@
+@@ -1231,8 +1231,8 @@ public static final void cairo_set_sourc
}
}
/** @param cr cast=(cairo_t *) */
@@ -11821,7 +11824,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_rgba(cr, red, green, blue, alpha);
-@@ -1244,8 +1244,8 @@
+@@ -1244,8 +1244,8 @@ public static final void cairo_set_sourc
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
@@ -11832,7 +11835,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_surface(cr, surface, x, y);
-@@ -1254,8 +1254,8 @@
+@@ -1254,8 +1254,8 @@ public static final void cairo_set_sourc
}
}
/** @param cr cast=(cairo_t *) */
@@ -11843,7 +11846,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_tolerance(cr, tolerance);
-@@ -1267,8 +1267,8 @@
+@@ -1267,8 +1267,8 @@ public static final void cairo_set_toler
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
@@ -11854,7 +11857,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_glyphs(cr, glyphs, num_glyphs);
-@@ -1277,8 +1277,8 @@
+@@ -1277,8 +1277,8 @@ public static final void cairo_show_glyp
}
}
/** @param cr cast=(cairo_t *) */
@@ -11865,7 +11868,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_page(cr);
-@@ -1290,8 +1290,8 @@
+@@ -1290,8 +1290,8 @@ public static final void cairo_show_page
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
@@ -11876,7 +11879,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_text(cr, utf8);
-@@ -1300,8 +1300,8 @@
+@@ -1300,8 +1300,8 @@ public static final void cairo_show_text
}
}
/** @param cr cast=(cairo_t *) */
@@ -11887,7 +11890,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_status(cr);
-@@ -1309,8 +1309,8 @@
+@@ -1309,8 +1309,8 @@ public static final int cairo_status(int
lock.unlock();
}
}
@@ -11898,7 +11901,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_status_to_string(status);
-@@ -1319,8 +1319,8 @@
+@@ -1319,8 +1319,8 @@ public static final int /*long*/ cairo_s
}
}
/** @param cr cast=(cairo_t *) */
@@ -11909,7 +11912,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke(cr);
-@@ -1329,8 +1329,8 @@
+@@ -1329,8 +1329,8 @@ public static final void cairo_stroke(in
}
}
/** @param cr cast=(cairo_t *) */
@@ -11920,7 +11923,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke_extents(cr, x1, y1, x2, y2);
-@@ -1339,8 +1339,8 @@
+@@ -1339,8 +1339,8 @@ public static final void cairo_stroke_ex
}
}
/** @param cr cast=(cairo_t *) */
@@ -11931,7 +11934,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke_preserve(cr);
-@@ -1349,8 +1349,8 @@
+@@ -1349,8 +1349,8 @@ public static final void cairo_stroke_pr
}
}
/** @param other cast=(cairo_surface_t *) */
@@ -11942,7 +11945,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_create_similar(other, format, width, height);
-@@ -1359,8 +1359,8 @@
+@@ -1359,8 +1359,8 @@ public static final int /*long*/ cairo_s
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11953,7 +11956,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_destroy(surface);
-@@ -1369,8 +1369,8 @@
+@@ -1369,8 +1369,8 @@ public static final void cairo_surface_d
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11964,7 +11967,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_finish(surface);
-@@ -1382,8 +1382,8 @@
+@@ -1382,8 +1382,8 @@ public static final void cairo_surface_f
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -11975,7 +11978,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_get_type(surface);
-@@ -1395,8 +1395,8 @@
+@@ -1395,8 +1395,8 @@ public static final int cairo_surface_ge
* @param surface cast=(cairo_surface_t *)
* @param key cast=(cairo_user_data_key_t *)
*/
@@ -11986,7 +11989,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_get_user_data(surface, key);
-@@ -1405,8 +1405,8 @@
+@@ -1405,8 +1405,8 @@ public static final int /*long*/ cairo_s
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -11997,7 +12000,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_reference(surface);
-@@ -1415,8 +1415,8 @@
+@@ -1415,8 +1415,8 @@ public static final void cairo_surface_r
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -12008,7 +12011,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_set_device_offset(surface, x_offset, y_offset);
-@@ -1425,8 +1425,8 @@
+@@ -1425,8 +1425,8 @@ public static final void cairo_surface_s
}
}
/** @method flags=dynamic */
@@ -12019,7 +12022,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
-@@ -1440,8 +1440,8 @@
+@@ -1440,8 +1440,8 @@ public static final void cairo_surface_s
* @param user_data cast=(void *)
* @param destroy cast=(cairo_destroy_func_t)
*/
@@ -12030,7 +12033,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_set_user_data(surface, key, user_data, destroy);
-@@ -1454,8 +1454,8 @@
+@@ -1454,8 +1454,8 @@ public static final int cairo_surface_se
* @param utf8 cast=(const char *)
* @param extents cast=(cairo_text_extents_t *)
*/
@@ -12041,7 +12044,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_text_extents(cr, utf8, extents);
-@@ -1467,8 +1467,8 @@
+@@ -1467,8 +1467,8 @@ public static final void cairo_text_exte
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
@@ -12052,7 +12055,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_text_path(cr, utf8);
-@@ -1480,8 +1480,8 @@
+@@ -1480,8 +1480,8 @@ public static final void cairo_text_path
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -12063,7 +12066,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_transform(cr, matrix);
-@@ -1490,8 +1490,8 @@
+@@ -1490,8 +1490,8 @@ public static final void cairo_transform
}
}
/** @param cr cast=(cairo_t *) */
@@ -12074,7 +12077,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_translate(cr, tx, ty);
-@@ -1500,8 +1500,8 @@
+@@ -1500,8 +1500,8 @@ public static final void cairo_translate
}
}
/** @param cr cast=(cairo_t *) */
@@ -12085,7 +12088,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_user_to_device(cr, x, y);
-@@ -1510,8 +1510,8 @@
+@@ -1510,8 +1510,8 @@ public static final void cairo_user_to_d
}
}
/** @param cr cast=(cairo_t *) */
@@ -12096,7 +12099,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_user_to_device_distance(cr, dx, dy);
-@@ -1525,8 +1525,8 @@
+@@ -1525,8 +1525,8 @@ public static final native int cairo_ver
* @param drawable cast=(Drawable)
* @param visual cast=(Visual *)
*/
@@ -12107,7 +12110,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_xlib_surface_create(dpy, drawable, visual, width, height);
-@@ -1539,8 +1539,8 @@
+@@ -1539,8 +1539,8 @@ public static final int /*long*/ cairo_x
* @param pixmap cast=(Pixmap)
* @param screen cast=(Screen *)
*/
@@ -12118,7 +12121,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height);
-@@ -1549,8 +1549,8 @@
+@@ -1549,8 +1549,8 @@ public static final int /*long*/ cairo_x
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -12129,7 +12132,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_xlib_surface_set_size(surface, width, height);
-@@ -1563,18 +1563,18 @@
+@@ -1563,18 +1563,18 @@ public static final void cairo_xlib_surf
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
@@ -12151,10 +12154,10 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
+public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size);
}
-diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java
---- x86/org/eclipse/swt/internal/cairo/cairo_path_t.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java 2010-09-09 12:02:46.000000000 +0000
-@@ -24,7 +24,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cairo/cairo_path_t.java swt-gtk-3.6.2/org/eclipse/swt/internal/cairo/cairo_path_t.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cairo/cairo_path_t.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/cairo/cairo_path_t.java 2011-03-21 11:34:23.315734069 +0000
+@@ -24,7 +24,7 @@ package org.eclipse.swt.internal.cairo;
public class cairo_path_t {
public int status;
/** @field cast=(cairo_path_data_t *) */
@@ -12163,10 +12166,10 @@ diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclips
public int num_data;
public static final int sizeof = Cairo.cairo_path_t_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/internal/Callback.java
---- x86/org/eclipse/swt/internal/Callback.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/Callback.java 2010-09-09 12:02:46.000000000 +0000
-@@ -28,7 +28,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Callback.java swt-gtk-3.6.2/org/eclipse/swt/internal/Callback.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Callback.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/Callback.java 2011-03-21 11:34:23.475731816 +0000
+@@ -28,7 +28,7 @@ public class Callback {
Object object;
String method, signature;
int argCount;
@@ -12175,7 +12178,7 @@ diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/inte
boolean isStatic, isArrayBased;
static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ public Callback (Object object, String m
* @param isArrayBased <code>true</code> if the arguments should be passed in an array and false otherwise
* @param errorResult the return value if the java code throws an exception
*/
@@ -12184,7 +12187,7 @@ diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/inte
/* Set the callback fields */
this.object = object;
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ public Callback (Object object, String m
* @param isArrayBased whether the callback's method is array based
* @param errorResult the callback's error result
*/
@@ -12193,7 +12196,7 @@ diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/inte
/**
* Releases the native level resources associated with the callback,
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ public void dispose () {
*
* @return the callback address
*/
@@ -12202,10 +12205,10 @@ diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/inte
return address;
}
-diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/internal/cde/CDE.java
---- x86/org/eclipse/swt/internal/cde/CDE.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/cde/CDE.java 2010-09-09 12:02:46.000000000 +0000
-@@ -33,8 +33,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cde/CDE.java swt-gtk-3.6.2/org/eclipse/swt/internal/cde/CDE.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cde/CDE.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/cde/CDE.java 2011-03-21 11:34:23.325733931 +0000
+@@ -33,8 +33,8 @@ public class CDE extends Platform {
* @param appName cast=(char *)
* @param appClass cast=(char *)
*/
@@ -12216,7 +12219,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtAppInitialize(appContext, display, topWiget, appName, appClass);
-@@ -51,8 +51,8 @@
+@@ -51,8 +51,8 @@ public static final void DtDbLoad() {
lock.unlock();
}
}
@@ -12227,7 +12230,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsDataTypeNames();
-@@ -61,8 +61,8 @@
+@@ -61,8 +61,8 @@ public static final int /*long*/ DtDtsDa
}
}
/** @param fileName cast=(char *) */
@@ -12238,7 +12241,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsFileToDataType(fileName);
-@@ -85,8 +85,8 @@
+@@ -85,8 +85,8 @@ public static final boolean DtDtsDataTyp
* @param attrName cast=(char *)
* @param optName cast=(char *)
*/
@@ -12249,7 +12252,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName);
-@@ -95,8 +95,8 @@
+@@ -95,8 +95,8 @@ public static final int /*long*/ DtDtsDa
}
}
/** @param dataType cast=(char *) */
@@ -12260,7 +12263,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeDataType(dataType);
-@@ -105,8 +105,8 @@
+@@ -105,8 +105,8 @@ public static final void DtDtsFreeDataTy
}
}
/** @param dataTypeList cast=(char **) */
@@ -12271,7 +12274,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeDataTypeNames(dataTypeList);
-@@ -115,8 +115,8 @@
+@@ -115,8 +115,8 @@ public static final void DtDtsFreeDataTy
}
}
/** @param attrValue cast=(char *) */
@@ -12282,7 +12285,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeAttributeValue(attrValue);
-@@ -133,8 +133,8 @@
+@@ -133,8 +133,8 @@ public static final void DtDtsFreeAttrib
* @param callback cast=(DtActionCallbackProc)
* @param clientData cast=(XtPointer)
*/
@@ -12293,7 +12296,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData);
-@@ -143,8 +143,8 @@
+@@ -143,8 +143,8 @@ public static final long DtActionInvoke(
}
}
/** @method flags=const */
@@ -12304,7 +12307,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _topLevelShellWidgetClass();
-@@ -159,8 +159,8 @@
+@@ -159,8 +159,8 @@ public static final int /*long*/ topLeve
* @param display cast=(Display *)
* @param argList cast=(ArgList)
*/
@@ -12315,7 +12318,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount);
-@@ -168,8 +168,8 @@
+@@ -168,8 +168,8 @@ public static final int /*long*/ XtAppCr
lock.unlock();
}
}
@@ -12326,7 +12329,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _XtCreateApplicationContext();
-@@ -187,8 +187,8 @@
+@@ -187,8 +187,8 @@ public static final int /*long*/ XtCreat
* @param argc cast=(int *)
* @param argv cast=(String *)
*/
@@ -12337,7 +12340,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv);
-@@ -197,8 +197,8 @@
+@@ -197,8 +197,8 @@ public static final void XtDisplayInitia
}
}
/** @param widget cast=(Widget) */
@@ -12348,7 +12351,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtRealizeWidget(widget);
-@@ -207,8 +207,8 @@
+@@ -207,8 +207,8 @@ public static final void XtRealizeWidget
}
}
/** @param widget cast=(Widget) */
@@ -12359,7 +12362,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtResizeWidget(widget, width, height, borderWidth);
-@@ -217,8 +217,8 @@
+@@ -217,8 +217,8 @@ public static final void XtResizeWidget(
}
}
/** @param widget cast=(Widget) */
@@ -12370,10 +12373,10 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtSetMappedWhenManaged(widget, flag);
-diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/swt/internal/cde/DtActionArg.java
---- x86/org/eclipse/swt/internal/cde/DtActionArg.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/cde/DtActionArg.java 2010-09-09 12:02:46.000000000 +0000
-@@ -14,6 +14,6 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cde/DtActionArg.java swt-gtk-3.6.2/org/eclipse/swt/internal/cde/DtActionArg.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/cde/DtActionArg.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/cde/DtActionArg.java 2011-03-21 11:34:23.325733931 +0000
+@@ -14,6 +14,6 @@ package org.eclipse.swt.internal.cde;
public class DtActionArg {
public int argClass;
/** @field accessor=u.file.name,cast=(char *) */
@@ -12381,10 +12384,10 @@ diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/s
+ public long /*int*/ name;
public static final int sizeof = CDE.DtActionArg_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.java
---- x86/org/eclipse/swt/internal/C.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/C.java 2010-09-09 12:02:46.000000000 +0000
-@@ -24,118 +24,118 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/C.java swt-gtk-3.6.2/org/eclipse/swt/internal/C.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/C.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/C.java 2011-03-21 11:34:23.295734363 +0000
+@@ -24,118 +24,118 @@ public class C extends Platform {
public static final int PTR_SIZEOF = PTR_sizeof ();
/** @param ptr cast=(void *) */
@@ -12525,10 +12528,10 @@ diff -urN x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.
-public static final native int strlen (int /*long*/ s);
+public static final native int strlen (long /*int*/ s);
}
-diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/internal/Converter.java
---- x86/org/eclipse/swt/internal/Converter.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/Converter.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,8 +37,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Converter.java swt-gtk-3.6.2/org/eclipse/swt/internal/Converter.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Converter.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/Converter.java 2011-03-21 11:34:23.335733804 +0000
+@@ -37,8 +37,8 @@ public static String defaultCodePage ()
}
public static char [] mbcsToWcs (String codePage, byte [] buffer) {
@@ -12539,7 +12542,7 @@ diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/int
if (ptr == 0) return EmptyCharArray;
int length = (int)/*64*/items_written [0];
char [] chars = new char [length];
-@@ -55,12 +55,12 @@
+@@ -55,12 +55,12 @@ public static byte [] wcsToMbcs (String
}
public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
@@ -12554,10 +12557,10 @@ diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/int
if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
int written = (int)/*64*/items_written [0];
byte [] bytes = new byte [written + (terminate ? 1 : 0)];
-diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/internal/gnome/GNOME.java
---- x86/org/eclipse/swt/internal/gnome/GNOME.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gnome/GNOME.java 2010-09-09 12:02:46.000000000 +0000
-@@ -39,8 +39,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gnome/GNOME.java swt-gtk-3.6.2/org/eclipse/swt/internal/gnome/GNOME.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gnome/GNOME.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gnome/GNOME.java 2011-03-21 11:34:23.485731671 +0000
+@@ -39,8 +39,8 @@ public static final native int GnomeVFSM
/** Natives */
/** @param mem cast=(gpointer) */
@@ -12568,7 +12571,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_free(mem);
-@@ -52,8 +52,8 @@
+@@ -52,8 +52,8 @@ public static final void g_free(int /*lo
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -12579,7 +12582,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _g_list_append(list, data);
-@@ -62,8 +62,8 @@
+@@ -62,8 +62,8 @@ public static final int /*long*/ g_list_
}
}
/** @param list cast=(GList *) */
@@ -12590,7 +12593,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_list_free(list);
-@@ -71,8 +71,8 @@
+@@ -71,8 +71,8 @@ public static final void g_list_free(int
lock.unlock();
}
}
@@ -12601,7 +12604,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _g_list_next(list);
-@@ -81,8 +81,8 @@
+@@ -81,8 +81,8 @@ public static final int /*long*/ g_list_
}
}
/** @param object cast=(gpointer) */
@@ -12612,7 +12615,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_object_unref(object);
-@@ -100,8 +100,8 @@
+@@ -100,8 +100,8 @@ public static final void g_object_unref(
* @param flags cast=(GnomeIconLookupFlags)
* @param result cast=(GnomeIconLookupResultFlags *)
*/
@@ -12623,7 +12626,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result);
-@@ -114,8 +114,8 @@
+@@ -114,8 +114,8 @@ public static final int /*long*/ gnome_i
* @param icon_name cast=(const char *)
* @param icon_data cast=(const GnomeIconData **)
*/
@@ -12634,7 +12637,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size);
-@@ -123,8 +123,8 @@
+@@ -123,8 +123,8 @@ public static final int /*long*/ gnome_i
lock.unlock();
}
}
@@ -12645,7 +12648,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_theme_new();
-@@ -132,8 +132,8 @@
+@@ -132,8 +132,8 @@ public static final int /*long*/ gnome_i
lock.unlock();
}
}
@@ -12656,7 +12659,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_get_registered_mime_types();
-@@ -142,8 +142,8 @@
+@@ -142,8 +142,8 @@ public static final int /*long*/ gnome_v
}
}
/** @param uri cast=(const char *) */
@@ -12667,7 +12670,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_get_mime_type(uri);
-@@ -162,8 +162,8 @@
+@@ -162,8 +162,8 @@ public static final boolean gnome_vfs_in
}
}
/** @param uri cast=(const char *) */
@@ -12678,7 +12681,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_make_uri_from_input(uri);
-@@ -175,8 +175,8 @@
+@@ -175,8 +175,8 @@ public static final int /*long*/ gnome_v
* @method flags=dynamic
* @param uri cast=(const char *)
*/
@@ -12689,7 +12692,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs);
-@@ -185,8 +185,8 @@
+@@ -185,8 +185,8 @@ public static final int /*long*/ gnome_v
}
}
/** @param application cast=(GnomeVFSMimeApplication *) */
@@ -12700,7 +12703,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_application_free(application);
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ public static final boolean gnome_vfs_is
* @param application cast=(GnomeVFSMimeApplication *)
* @param uris cast=(GList *)
*/
@@ -12711,7 +12714,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_application_launch(application, uris);
-@@ -219,8 +219,8 @@
+@@ -219,8 +219,8 @@ public static final int gnome_vfs_mime_a
}
}
/** @param list cast=(GList *) */
@@ -12722,7 +12725,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_extensions_list_free(list);
-@@ -229,8 +229,8 @@
+@@ -229,8 +229,8 @@ public static final void gnome_vfs_mime_
}
}
/** @param mimeType cast=(const char *) */
@@ -12733,7 +12736,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_get_default_application(mimeType);
-@@ -239,8 +239,8 @@
+@@ -239,8 +239,8 @@ public static final int /*long*/ gnome_v
}
}
/** @param mime_type cast=(const char *) */
@@ -12744,7 +12747,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_get_extensions_list(mime_type);
-@@ -249,8 +249,8 @@
+@@ -249,8 +249,8 @@ public static final int /*long*/ gnome_v
}
}
/** @param list cast=(GList *) */
@@ -12755,7 +12758,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_registered_mime_type_list_free(list);
-@@ -259,8 +259,8 @@
+@@ -259,8 +259,8 @@ public static final void gnome_vfs_mime_
}
}
/** @param file cast=(const char *) */
@@ -12766,7 +12769,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_type_from_name(file);
-@@ -272,8 +272,8 @@
+@@ -272,8 +272,8 @@ public static final int /*long*/ gnome_v
* @param mime_type cast=(const char *)
* @param base_mime_type cast=(const char *)
*/
@@ -12777,7 +12780,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_type_get_equivalence(mime_type, base_mime_type);
-@@ -285,8 +285,8 @@
+@@ -285,8 +285,8 @@ public static final int /*long*/ gnome_v
* @method flags=dynamic
* @param url cast=(const char *)
*/
@@ -12788,17 +12791,17 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_url_show(url);
-@@ -299,5 +299,5 @@
+@@ -299,5 +299,5 @@ public static final int gnome_vfs_url_sh
* @param src cast=(const void *)
* @param count cast=(size_t)
*/
-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);
+public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count);
}
-diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
---- x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,17 +17,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java swt-gtk-3.6.2/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2011-03-21 11:34:23.475731816 +0000
+@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gnome;
public class GnomeVFSMimeApplication {
/** @field cast=(char *) */
@@ -12820,10 +12823,10 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64
/** @field cast=(gboolean) */
public boolean requires_terminal;
public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java
---- x86/org/eclipse/swt/internal/gtk/GdkDragContext.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java 2010-09-09 12:02:46.000000000 +0000
-@@ -21,11 +21,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkDragContext.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkDragContext.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkDragContext.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkDragContext.java 2011-03-21 11:34:23.345733664 +0000
+@@ -21,11 +21,11 @@ public class GdkDragContext {
/** @field cast=(gboolean) */
public boolean is_source;
/** @field cast=(GdkWindow *) */
@@ -12838,10 +12841,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclips
/** @field cast=(GdkDragAction) */
public int actions;
/** @field cast=(GdkDragAction) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventAny.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventAny.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventAny.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventAny.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventAny.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventAny extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12850,10 +12853,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/s
/** @field cast=(gint8) */
public byte send_event;
public static final int sizeof = OS.GdkEventAny_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventButton.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventButton.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventButton.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventButton.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventButton.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventButton extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12862,7 +12865,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -27,13 +27,13 @@
+@@ -27,13 +27,13 @@ public class GdkEventButton extends GdkE
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
@@ -12878,10 +12881,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,11 +17,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventCrossing.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventCrossing extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12895,10 +12898,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/ecli
public int time;
public double x;
public double y;
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventExpose.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventExpose.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventExpose extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12907,7 +12910,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field accessor=area.x */
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ public class GdkEventExpose extends GdkE
/** @field accessor=area.height */
public int area_height;
/** @field cast=(GdkRegion *) */
@@ -12916,10 +12919,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclips
/** @field cast=(gint) */
public int count;
public static final int sizeof = OS.GdkEventExpose_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventFocus.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventFocus.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventFocus extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12928,10 +12931,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(gint16) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventKey.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventKey.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventKey.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventKey.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventKey.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventKey extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12940,7 +12943,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/s
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ public class GdkEventKey extends GdkEven
/** @field cast=(gint) */
public int length;
/** @field cast=(gchar *) */
@@ -12949,10 +12952,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/s
/** @field cast=(guint16) */
public short hardware_keycode;
/** @field cast=(guint8) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventMotion.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventMotion.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventMotion extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12961,7 +12964,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -27,13 +27,13 @@
+@@ -27,13 +27,13 @@ public class GdkEventMotion extends GdkE
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
@@ -12977,10 +12980,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventProperty.java x86_64/org/eclipse/swt/internal/gtk/GdkEventProperty.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventProperty.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventProperty.java 2010-09-09 12:02:46.000000000 +0000
-@@ -16,11 +16,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventProperty.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventProperty.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventProperty.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventProperty.java 2011-03-21 11:34:23.335733804 +0000
+@@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventProperty extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -12994,10 +12997,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventProperty.java x86_64/org/ecli
/** @field cast=(guint32) */
public int time;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventScroll.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventScroll.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventScroll extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -13006,7 +13009,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ public class GdkEventScroll extends GdkE
/** @field cast=(GdkScrollDirection) */
public int direction;
/** @field cast=(GdkDevice *) */
@@ -13015,10 +13018,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventVisibility.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventVisibility extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -13027,10 +13030,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/ec
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(GdkVisibilityState) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventWindowState.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventWindowState extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -13039,10 +13042,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/e
public byte send_event;
public int changed_mask;
public int new_window_state;
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java
---- x86/org/eclipse/swt/internal/gtk/GdkGCValues.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java 2010-09-09 12:02:46.000000000 +0000
-@@ -33,17 +33,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkGCValues.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkGCValues.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkGCValues.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkGCValues.java 2011-03-21 11:34:23.345733664 +0000
+@@ -33,17 +33,17 @@ public class GdkGCValues {
/** @field accessor=background.blue,cast=(guint16) */
public short background_blue;
/** @field cast=(GdkFont *) */
@@ -13065,10 +13068,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/s
/** @field cast=(GdkSubwindowMode) */
public int subwindow_mode;
/** @field cast=(gint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/internal/gtk/GdkImage.java
---- x86/org/eclipse/swt/internal/gtk/GdkImage.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkImage.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,7 +19,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkImage.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkImage.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkImage.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkImage.java 2011-03-21 11:34:23.345733664 +0000
+@@ -19,7 +19,7 @@ public class GdkImage {
/** @field cast=(GdkImageType) */
public int type;
/** @field cast=(GdkVisual *) */
@@ -13077,7 +13080,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/
/** @field cast=(GdkByteOrder) */
public int byte_order;
/** @field cast=(gint) */
-@@ -35,9 +35,9 @@
+@@ -35,9 +35,9 @@ public class GdkImage {
/** @field cast=(guint16) */
public short bits_per_pixel;
/** @field cast=(gpointer) */
@@ -13090,10 +13093,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/
- public int /*long*/ windowing_data;
+ public long /*int*/ windowing_data;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
---- x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,23 +17,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkWindowAttr.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,23 +17,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkWindowAttr {
/** @field cast=(gchar *) */
@@ -13123,10 +13126,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse
public boolean override_redirect;
public static final int sizeof = OS.GdkWindowAttr_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
---- x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,10 +17,10 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GInterfaceInfo.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,10 +17,10 @@ package org.eclipse.swt.internal.gtk;
public class GInterfaceInfo {
/** @field cast=(GInterfaceInitFunc) */
@@ -13140,10 +13143,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclips
+ public long /*int*/ interface_data;
public static final int sizeof = OS.GInterfaceInfo_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java
---- x86/org/eclipse/swt/internal/gtk/GObjectClass.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,17 +17,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GObjectClass.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GObjectClass.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GObjectClass.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GObjectClass.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gtk;
public class GObjectClass {
/** @field cast=(GObject *(*)()) */
@@ -13168,10 +13171,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/
- public int /*long*/ notify;
+ public long /*int*/ notify;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkCellRendererClass {
/** @field cast=(void(*)()) */
@@ -13181,10 +13184,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/
- public int /*long*/ get_size;
+ public long /*int*/ get_size;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
---- x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,11 +17,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GtkColorSelectionDialog {
/** @field cast=(GtkWidget *) */
@@ -13200,10 +13203,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/o
- public int /*long*/ help_button;
+ public long /*int*/ help_button;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java
---- x86/org/eclipse/swt/internal/gtk/GtkCombo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkCombo.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkCombo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkCombo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkCombo.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkCombo {
/** @field cast=(GtkWidget *) */
@@ -13213,10 +13216,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/
- public int /*long*/ list;
+ public long /*int*/ list;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java
---- x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,43 +17,43 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkFileSelection.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkFileSelection.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,43 +17,43 @@ package org.eclipse.swt.internal.gtk;
public class GtkFileSelection {
/** @field cast=(GtkWidget *) */
@@ -13280,20 +13283,20 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/ecli
- public int /*long*/ action_area;
+ public long /*int*/ action_area;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkFixed.java x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java
---- x86/org/eclipse/swt/internal/gtk/GtkFixed.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,5 +17,5 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkFixed.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkFixed.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkFixed.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkFixed.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.gtk;
public class GtkFixed {
/** @field cast=(GList *) */
- public int /*long*/ children;
+ public long /*int*/ children;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java
---- x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,15 +17,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkSelectionData.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkSelectionData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,15 +17,15 @@ package org.eclipse.swt.internal.gtk;
public class GtkSelectionData {
/** @field cast=(GdkAtom) */
@@ -13313,10 +13316,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/ecli
/** @field cast=(gint) */
public int length;
public static final int sizeof = OS.GtkSelectionData_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkTargetEntry.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetEntry {
/** @field cast=(gchar *) */
@@ -13325,10 +13328,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclips
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkTargetPair.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkTargetPair.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2011-03-21 11:34:23.345733664 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetPair {
/** @field cast=(GdkAtom) */
@@ -13337,10 +13340,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,127 +19,127 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkWidgetClass.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2011-03-21 11:34:23.335733804 +0000
+@@ -19,127 +19,127 @@ public class GtkWidgetClass extends GObj
public int activate_signal;
public int set_scroll_adjustments_signal;
/** @field cast=(void(*)()) */
@@ -13530,10 +13533,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclips
- public int /*long*/ screen_changed;
+ public long /*int*/ screen_changed;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java
---- x86/org/eclipse/swt/internal/gtk/GTypeInfo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,22 +19,22 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GTypeInfo.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GTypeInfo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GTypeInfo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GTypeInfo.java 2011-03-21 11:34:23.345733664 +0000
+@@ -19,22 +19,22 @@ public class GTypeInfo {
/** @field cast=(guint16) */
public short class_size;
/** @field cast=(GBaseInitFunc) */
@@ -13563,10 +13566,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt
+ public long /*int*/ value_table;
public static final int sizeof = OS.GTypeInfo_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java
---- x86/org/eclipse/swt/internal/gtk/GTypeQuery.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,7 +19,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GTypeQuery.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GTypeQuery.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/GTypeQuery.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/GTypeQuery.java 2011-03-21 11:34:23.335733804 +0000
+@@ -19,7 +19,7 @@ public class GTypeQuery {
/** @field cast=(GType) */
public int type;
/** @field cast=(const gchar *) */
@@ -13575,10 +13578,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/sw
/** @field cast=(guint) */
public int class_size;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/internal/gtk/OS.java
---- x86/org/eclipse/swt/internal/gtk/OS.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/OS.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,7 +38,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/OS.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/OS.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/OS.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/OS.java 2011-03-21 11:34:23.425732531 +0000
+@@ -38,7 +38,7 @@ public class OS extends C {
}
/** Constants */
@@ -13587,7 +13590,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
public static final int ATK_RELATION_LABELLED_BY = 4;
public static final int G_FILE_TEST_IS_DIR = 1 << 2;
public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3;
-@@ -614,89 +614,89 @@
+@@ -615,89 +615,89 @@ public static final native int XExposeEv
public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
@@ -13711,7 +13714,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
/** X11 Native methods and constants */
public static final int Above = 0;
-@@ -714,7 +714,7 @@
+@@ -715,7 +715,7 @@ public static final int FocusOut = 10;
public static final int GraphicsExpose = 13;
public static final int NoExpose = 14;
public static final int ExposureMask = 1 << 15;
@@ -13720,7 +13723,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
public static final int NotifyNormal = 0;
public static final int NotifyGrab = 1;
public static final int NotifyHint = 1;
-@@ -730,8 +730,8 @@
+@@ -731,8 +731,8 @@ public static final int VisibilityChange
public static final int VisibilityFullyObscured = 2;
public static final int VisibilityNotify = 15;
public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;
@@ -13731,7 +13734,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _Call(proc, arg1, arg2);
-@@ -739,8 +739,8 @@
+@@ -740,8 +740,8 @@ public static final int Call(int /*long*
lock.unlock();
}
}
@@ -13742,7 +13745,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -751,8 +751,8 @@
+@@ -752,8 +752,8 @@ public static final int /*long*/ call (i
/** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
/** @param pixmap cast=(GdkPixmap *) */
@@ -13753,7 +13756,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
-@@ -765,8 +765,8 @@
+@@ -766,8 +766,8 @@ public static final int /*long*/ GDK_PIX
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -13764,7 +13767,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckMaskEvent(display, event_mask, event_return);
-@@ -780,8 +780,8 @@
+@@ -781,8 +781,8 @@ public static final boolean XCheckMaskEv
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -13775,7 +13778,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckWindowEvent(display, window, event_mask, event_return);
-@@ -795,8 +795,8 @@
+@@ -796,8 +796,8 @@ public static final boolean XCheckWindow
* @param predicate cast=(Bool (*)())
* @param arg cast=(XPointer)
*/
@@ -13786,7 +13789,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
-@@ -805,8 +805,8 @@
+@@ -806,8 +806,8 @@ public static final boolean XCheckIfEven
}
}
/** @param display cast=(Display *) */
@@ -13797,7 +13800,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XDefaultScreen(display);
-@@ -815,8 +815,8 @@
+@@ -816,8 +816,8 @@ public static final int XDefaultScreen(i
}
}
/** @param display cast=(Display *) */
@@ -13808,7 +13811,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XDefaultRootWindow(display);
-@@ -825,8 +825,8 @@
+@@ -826,8 +826,8 @@ public static final int /*long*/ XDefaul
}
}
/** @param display cast=(Display *) */
@@ -13819,7 +13822,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XFlush(display);
-@@ -835,8 +835,8 @@
+@@ -836,8 +836,8 @@ public static final void XFlush(int /*lo
}
}
/** @param address cast=(void *) */
@@ -13830,7 +13833,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XFree(address);
-@@ -850,8 +850,8 @@
+@@ -851,8 +851,8 @@ public static final void XFree(int /*lon
* @param owner cast=(Window)
* @param time cast=(Time)
*/
@@ -13841,7 +13844,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetSelectionOwner(display, selection, window, time);
-@@ -863,8 +863,8 @@
+@@ -864,8 +864,8 @@ public static final int /*long*/ XSetSel
* @param display cast=(Display *)
* @param selection cast=(Atom)
*/
@@ -13852,7 +13855,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
-@@ -885,8 +885,8 @@
+@@ -886,8 +886,8 @@ public static final int /*long*/ XGetSel
* @param bytes_after_return cast=(unsigned long *)
* @param prop_return cast=(unsigned char **)
*/
@@ -13863,7 +13866,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return);
-@@ -901,8 +901,8 @@
+@@ -902,8 +902,8 @@ public static final int /*long*/ XGetWin
* @param name cast=(char *)
* @param ifExists cast=(Bool)
*/
@@ -13874,7 +13877,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
-@@ -921,8 +921,8 @@
+@@ -922,8 +922,8 @@ public static final int /*long*/ XIntern
* @param win_y_return cast=(int *)
* @param mask_return cast=(unsigned int *)
*/
@@ -13885,7 +13888,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);
-@@ -938,8 +938,8 @@
+@@ -939,8 +939,8 @@ public static final int XQueryPointer(in
* @param children_return cast=(Window **)
* @param nchildren_return cast=(unsigned int *)
*/
@@ -13896,7 +13899,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);
-@@ -951,8 +951,8 @@
+@@ -952,8 +952,8 @@ public static final int XQueryTree(int /
* @param display cast=(Display *)
* @param keysym cast=(KeySym)
*/
@@ -13907,7 +13910,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
-@@ -965,8 +965,8 @@
+@@ -966,8 +966,8 @@ public static final int XKeysymToKeycode
* @param window cast=(Window)
* @param num_prop_return cast=(int *)
*/
@@ -13918,7 +13921,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
-@@ -979,8 +979,8 @@
+@@ -980,8 +980,8 @@ public static final int /*long*/ XListPr
* @param window cast=(Window)
* @param values flags=no_out
*/
@@ -13929,7 +13932,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
-@@ -993,8 +993,8 @@
+@@ -994,8 +994,8 @@ public static final int XReconfigureWMWi
* @param w cast=(Window)
* @param event_send cast=(XEvent *)
*/
@@ -13940,7 +13943,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
-@@ -1003,8 +1003,8 @@
+@@ -1004,8 +1004,8 @@ public static final int XSendEvent(int /
}
}
/** @param handler cast=(XIOErrorHandler) */
@@ -13951,7 +13954,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetIOErrorHandler(handler);
-@@ -1013,8 +1013,8 @@
+@@ -1014,8 +1014,8 @@ public static final int /*long*/ XSetIOE
}
}
/** @param handler cast=(XErrorHandler) */
@@ -13962,7 +13965,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetErrorHandler(handler);
-@@ -1026,8 +1026,8 @@
+@@ -1027,8 +1027,8 @@ public static final int /*long*/ XSetErr
* @param display cast=(Display *)
* @param window cast=(Window)
*/
@@ -13973,7 +13976,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
-@@ -1040,8 +1040,8 @@
+@@ -1041,8 +1041,8 @@ public static final int XSetInputFocus(i
* @param w cast=(Window)
* @param prop_window cast=(Window)
*/
@@ -13984,7 +13987,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
-@@ -1050,8 +1050,8 @@
+@@ -1051,8 +1051,8 @@ public static final int XSetTransientFor
}
}
/** @param display cast=(Display *) */
@@ -13995,7 +13998,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSynchronize(display, onoff);
-@@ -1064,8 +1064,8 @@
+@@ -1065,8 +1065,8 @@ public static final int /*long*/ XSynchr
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -14006,7 +14009,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
-@@ -1078,8 +1078,8 @@
+@@ -1079,8 +1079,8 @@ public static final void XTestFakeButton
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -14017,7 +14020,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
-@@ -1091,8 +1091,8 @@
+@@ -1092,8 +1092,8 @@ public static final void XTestFakeKeyEve
* @param display cast=(Display *)
* @param delay cast=(unsigned long)
*/
@@ -14028,7 +14031,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
-@@ -1105,8 +1105,8 @@
+@@ -1106,8 +1106,8 @@ public static final void XTestFakeMotion
* @param sourceWindow cast=(Window)
* @param destWindow cast=(Window)
*/
@@ -14039,7 +14042,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
-@@ -1115,8 +1115,8 @@
+@@ -1116,8 +1116,8 @@ public static final int XWarpPointer(int
}
}
/** @param atom cast=(GdkAtom) */
@@ -14050,7 +14053,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
-@@ -1125,8 +1125,8 @@
+@@ -1126,8 +1126,8 @@ public static final int /*long*/ gdk_x11
}
}
/** @param colormap cast=(GdkColormap *) */
@@ -14061,7 +14064,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_colormap_get_xcolormap(colormap);
-@@ -1135,8 +1135,8 @@
+@@ -1136,8 +1136,8 @@ public static final int /*long*/ gdk_x11
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -14072,7 +14075,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
-@@ -1145,8 +1145,8 @@
+@@ -1146,8 +1146,8 @@ public static final int /*long*/ gdk_x11
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -14083,7 +14086,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
-@@ -1159,8 +1159,8 @@
+@@ -1160,8 +1160,8 @@ public static final int /*long*/ gdk_x11
* @param screen cast=(GdkScreen *)
* @param xvisualid cast=(VisualID)
*/
@@ -14094,7 +14097,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
-@@ -1172,8 +1172,8 @@
+@@ -1173,8 +1173,8 @@ public static final int /*long*/ gdk_x11
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -14105,7 +14108,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
-@@ -1182,8 +1182,8 @@
+@@ -1183,8 +1183,8 @@ public static final int /*long*/ gdk_x11
}
}
/** @param visual cast=(GdkVisual *) */
@@ -14116,7 +14119,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
-@@ -1191,8 +1191,8 @@
+@@ -1192,8 +1192,8 @@ public static final int /*long*/ gdk_x11
lock.unlock();
}
}
@@ -14127,7 +14130,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixmap_foreign_new(anid);
-@@ -1200,8 +1200,8 @@
+@@ -1201,8 +1201,8 @@ public static final int /*long*/ gdk_pix
lock.unlock();
}
}
@@ -14138,7 +14141,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_lookup(xid);
-@@ -1214,8 +1214,8 @@
+@@ -1215,8 +1215,8 @@ public static final int /*long*/ gdk_win
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -14149,7 +14152,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
-@@ -1228,8 +1228,8 @@
+@@ -1229,8 +1229,8 @@ public static final void gdk_window_add_
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -14160,7 +14163,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
-@@ -1242,49 +1242,49 @@
+@@ -1243,49 +1243,49 @@ public static final void gdk_window_remo
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -14216,9 +14219,9 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
-public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XVisibilityEvent dest, long /*int*/ src, long /*int*/ size);
- /** X render natives and constants */
- public static final int PictStandardARGB32 = 0;
-@@ -1297,8 +1297,8 @@
+ /** @method flags=const*/
+ public static final native int RTLD_GLOBAL();
+@@ -1305,8 +1305,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
@@ -14229,7 +14232,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
-@@ -1307,8 +1307,8 @@
+@@ -1315,8 +1315,8 @@ public static final boolean XRenderQuery
}
}
/** @method flags=dynamic */
@@ -14240,7 +14243,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
-@@ -1320,8 +1320,8 @@
+@@ -1328,8 +1328,8 @@ public static final int XRenderQueryVers
* @method flags=dynamic
* @param attributes flags=no_out
*/
@@ -14251,7 +14254,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
-@@ -1330,8 +1330,8 @@
+@@ -1338,8 +1338,8 @@ public static final int /*long*/ XRender
}
}
/** @method flags=dynamic */
@@ -14262,7 +14265,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
-@@ -1340,8 +1340,8 @@
+@@ -1348,8 +1348,8 @@ public static final void XRenderSetPictu
}
}
/** @method flags=dynamic */
@@ -14273,7 +14276,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
-@@ -1350,8 +1350,8 @@
+@@ -1358,8 +1358,8 @@ public static final void XRenderSetPictu
}
}
/** @method flags=dynamic */
@@ -14284,7 +14287,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderFreePicture(display, picture);
-@@ -1360,8 +1360,8 @@
+@@ -1368,8 +1368,8 @@ public static final void XRenderFreePict
}
}
/** @method flags=dynamic */
@@ -14295,7 +14298,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-@@ -1370,8 +1370,8 @@
+@@ -1378,8 +1378,8 @@ public static final void XRenderComposit
}
}
/** @method flags=dynamic */
@@ -14306,7 +14309,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
-@@ -1380,8 +1380,8 @@
+@@ -1388,8 +1388,8 @@ public static final int /*long*/ XRender
}
}
/** @method flags=dynamic */
@@ -14317,7 +14320,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
-@@ -1393,14 +1393,14 @@
+@@ -1401,14 +1401,14 @@ public static final int /*long*/ XRender
/** Custom callbacks */
/** @method flags=no_gen */
@@ -14337,7 +14340,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_DISPLAY();
-@@ -1408,8 +1408,8 @@
+@@ -1416,8 +1416,8 @@ public static final int /*long*/ GDK_DIS
lock.unlock();
}
}
@@ -14348,7 +14351,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_ROOT_PARENT();
-@@ -1418,8 +1418,8 @@
+@@ -1426,8 +1426,8 @@ public static final int /*long*/ GDK_ROO
}
}
/** @method flags=const */
@@ -14359,7 +14362,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_TYPE_COLOR();
-@@ -1428,8 +1428,8 @@
+@@ -1436,8 +1436,8 @@ public static final int /*long*/ GDK_TYP
}
}
/** @method flags=const */
@@ -14370,7 +14373,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
-@@ -1437,8 +1437,8 @@
+@@ -1445,8 +1445,8 @@ public static final int /*long*/ GDK_TYP
lock.unlock();
}
}
@@ -14381,7 +14384,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
-@@ -1446,8 +1446,8 @@
+@@ -1454,8 +1454,8 @@ public static final boolean GTK_IS_BUTTO
lock.unlock();
}
}
@@ -14392,7 +14395,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_SCROLLED_WINDOW(obj);
-@@ -1455,8 +1455,8 @@
+@@ -1463,8 +1463,8 @@ public static final boolean GTK_IS_SCROL
lock.unlock();
}
}
@@ -14403,7 +14406,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
-@@ -1464,8 +1464,8 @@
+@@ -1472,8 +1472,8 @@ public static final boolean GTK_IS_WINDO
lock.unlock();
}
}
@@ -14414,7 +14417,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-@@ -1473,8 +1473,8 @@
+@@ -1481,8 +1481,8 @@ public static final boolean GTK_IS_CELL_
lock.unlock();
}
}
@@ -14425,7 +14428,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
-@@ -1482,8 +1482,8 @@
+@@ -1490,8 +1490,8 @@ public static final boolean GTK_IS_CELL_
lock.unlock();
}
}
@@ -14436,7 +14439,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-@@ -1491,8 +1491,8 @@
+@@ -1499,8 +1499,8 @@ public static final boolean GTK_IS_CELL_
lock.unlock();
}
}
@@ -14447,7 +14450,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
-@@ -1500,8 +1500,8 @@
+@@ -1508,8 +1508,8 @@ public static final boolean GTK_IS_CONTA
lock.unlock();
}
}
@@ -14458,7 +14461,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
-@@ -1509,8 +1509,8 @@
+@@ -1517,8 +1517,8 @@ public static final boolean GTK_IS_IMAGE
lock.unlock();
}
}
@@ -14469,7 +14472,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
-@@ -1518,8 +1518,8 @@
+@@ -1526,8 +1526,8 @@ public static final boolean GTK_IS_MENU_
lock.unlock();
}
}
@@ -14480,7 +14483,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_PLUG(obj);
-@@ -1527,8 +1527,8 @@
+@@ -1535,8 +1535,8 @@ public static final boolean GTK_IS_PLUG(
lock.unlock();
}
}
@@ -14491,7 +14494,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_SOCKET(obj);
-@@ -1537,8 +1537,8 @@
+@@ -1545,8 +1545,8 @@ public static final boolean GTK_IS_SOCKE
}
}
/** @method flags=const */
@@ -14502,7 +14505,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_STOCK_CANCEL();
-@@ -1547,8 +1547,8 @@
+@@ -1555,8 +1555,8 @@ public static final int /*long*/ GTK_STO
}
}
/** @method flags=const */
@@ -14513,7 +14516,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_STOCK_OK();
-@@ -1557,8 +1557,8 @@
+@@ -1565,8 +1565,8 @@ public static final int /*long*/ GTK_STO
}
}
/** @method flags=const */
@@ -14524,7 +14527,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
-@@ -1567,8 +1567,8 @@
+@@ -1575,8 +1575,8 @@ public static final int /*long*/ GTK_TYP
}
}
/** @method flags=const */
@@ -14535,7 +14538,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-@@ -1577,8 +1577,8 @@
+@@ -1585,8 +1585,8 @@ public static final int /*long*/ GTK_TYP
}
}
/** @method flags=const */
@@ -14546,7 +14549,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-@@ -1587,8 +1587,8 @@
+@@ -1595,8 +1595,8 @@ public static final int /*long*/ GTK_TYP
}
}
/** @method flags=const */
@@ -14557,7 +14560,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_FIXED();
-@@ -1597,8 +1597,8 @@
+@@ -1605,8 +1605,8 @@ public static final int /*long*/ GTK_TYP
}
}
/** @method flags=const */
@@ -14568,7 +14571,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_MENU();
-@@ -1607,8 +1607,8 @@
+@@ -1615,8 +1615,8 @@ public static final int /*long*/ GTK_TYP
}
}
/** @method flags=const */
@@ -14579,7 +14582,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_WIDGET();
-@@ -1616,8 +1616,8 @@
+@@ -1624,8 +1624,8 @@ public static final int /*long*/ GTK_TYP
lock.unlock();
}
}
@@ -14590,7 +14593,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
-@@ -1625,8 +1625,8 @@
+@@ -1633,8 +1633,8 @@ public static final int GTK_WIDGET_FLAGS
lock.unlock();
}
}
@@ -14601,7 +14604,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_STATE(wid);
-@@ -1634,8 +1634,8 @@
+@@ -1642,8 +1642,8 @@ public static final int GTK_WIDGET_STATE
lock.unlock();
}
}
@@ -14612,7 +14615,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
-@@ -1643,8 +1643,8 @@
+@@ -1651,8 +1651,8 @@ public static final boolean GTK_WIDGET_H
lock.unlock();
}
}
@@ -14623,7 +14626,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
-@@ -1652,8 +1652,8 @@
+@@ -1660,8 +1660,8 @@ public static final boolean GTK_WIDGET_H
lock.unlock();
}
}
@@ -14634,7 +14637,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_IS_SENSITIVE(wid);
-@@ -1661,8 +1661,8 @@
+@@ -1669,8 +1669,8 @@ public static final boolean GTK_WIDGET_I
lock.unlock();
}
}
@@ -14645,7 +14648,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
-@@ -1670,8 +1670,8 @@
+@@ -1678,8 +1678,8 @@ public static final boolean GTK_WIDGET_M
lock.unlock();
}
}
@@ -14656,7 +14659,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
-@@ -1679,8 +1679,8 @@
+@@ -1687,8 +1687,8 @@ public static final boolean GTK_WIDGET_S
lock.unlock();
}
}
@@ -14667,7 +14670,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
-@@ -1688,8 +1688,8 @@
+@@ -1696,8 +1696,8 @@ public static final void GTK_WIDGET_SET_
lock.unlock();
}
}
@@ -14678,7 +14681,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-@@ -1697,8 +1697,8 @@
+@@ -1705,8 +1705,8 @@ public static final void GTK_WIDGET_UNSE
lock.unlock();
}
}
@@ -14689,7 +14692,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
-@@ -1706,8 +1706,8 @@
+@@ -1714,8 +1714,8 @@ public static final boolean GTK_WIDGET_V
lock.unlock();
}
}
@@ -14700,7 +14703,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
-@@ -1715,8 +1715,8 @@
+@@ -1723,8 +1723,8 @@ public static final int /*long*/ G_OBJEC
lock.unlock();
}
}
@@ -14711,7 +14714,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
-@@ -1724,8 +1724,8 @@
+@@ -1732,8 +1732,8 @@ public static final int /*long*/ G_OBJEC
lock.unlock();
}
}
@@ -14722,7 +14725,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
-@@ -1734,18 +1734,18 @@
+@@ -1742,18 +1742,18 @@ public static final int /*long*/ G_OBJEC
}
}
/** @method flags=const */
@@ -14749,7 +14752,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
-@@ -1754,8 +1754,8 @@
+@@ -1762,8 +1762,8 @@ public static final int /*long*/ G_OBJEC
}
}
/** @method flags=const */
@@ -14760,7 +14763,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_TYPE_STRING();
-@@ -1773,8 +1773,8 @@
+@@ -1781,8 +1781,8 @@ public static final int PANGO_PIXELS(int
}
}
/** @method flags=const */
@@ -14771,7 +14774,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
-@@ -1783,8 +1783,8 @@
+@@ -1791,8 +1791,8 @@ public static final int /*long*/ PANGO_T
}
}
/** @method flags=const */
@@ -14782,7 +14785,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _PANGO_TYPE_LAYOUT();
-@@ -1793,8 +1793,8 @@
+@@ -1801,8 +1801,8 @@ public static final int /*long*/ PANGO_T
}
}
/** @param handle cast=(void *) */
@@ -14793,7 +14796,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlclose(handle);
-@@ -1803,8 +1803,8 @@
+@@ -1811,8 +1811,8 @@ public static final int dlclose(int /*lo
}
}
/** @param filename cast=(const char *) */
@@ -14804,7 +14807,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlopen(filename, flag);
-@@ -1816,8 +1816,8 @@
+@@ -1824,8 +1824,8 @@ public static final int /*long*/ dlopen(
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
@@ -14815,7 +14818,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlsym(handle, symbol);
-@@ -1826,8 +1826,8 @@
+@@ -1834,8 +1834,8 @@ public static final int /*long*/ dlsym(i
}
}
/** @method flags=dynamic */
@@ -14826,7 +14829,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_create_from_commandline(commandline, applName, flags, error);
-@@ -1836,8 +1836,8 @@
+@@ -1844,8 +1844,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14837,7 +14840,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_all();
-@@ -1846,8 +1846,8 @@
+@@ -1854,8 +1854,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14848,7 +14851,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_executable(appInfo);
-@@ -1856,8 +1856,8 @@
+@@ -1864,8 +1864,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14859,7 +14862,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_icon(appInfo);
-@@ -1866,8 +1866,8 @@
+@@ -1874,8 +1874,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14870,7 +14873,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_id(appInfo);
-@@ -1876,8 +1876,8 @@
+@@ -1884,8 +1884,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14881,7 +14884,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_name(appInfo);
-@@ -1886,8 +1886,8 @@
+@@ -1894,8 +1894,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14892,7 +14895,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_launch(appInfo, list, launchContext, error);
-@@ -1896,8 +1896,8 @@
+@@ -1904,8 +1904,8 @@ public static final boolean g_app_info_l
}
}
/** @method flags=dynamic */
@@ -14903,7 +14906,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_get_default_for_type(mimeType, mustSupportURIs);
-@@ -1906,8 +1906,8 @@
+@@ -1914,8 +1914,8 @@ public static final int /*long*/ g_app_i
}
}
/** @method flags=dynamic */
@@ -14914,7 +14917,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_launch_default_for_uri(appInfo, launchContext, error);
-@@ -1916,8 +1916,8 @@
+@@ -1924,8 +1924,8 @@ public static final boolean g_app_info_l
}
}
/** @method flags=dynamic */
@@ -14925,7 +14928,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_should_show(appInfo);
-@@ -1926,8 +1926,8 @@
+@@ -1934,8 +1934,8 @@ public static final boolean g_app_info_s
}
}
/** @method flags=dynamic */
@@ -14936,7 +14939,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_app_info_supports_uris(appInfo);
-@@ -1936,8 +1936,8 @@
+@@ -1944,8 +1944,8 @@ public static final boolean g_app_info_s
}
}
/** @method flags=dynamic */
@@ -14947,7 +14950,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_data_input_stream_new(input_stream);
-@@ -1946,8 +1946,8 @@
+@@ -1954,8 +1954,8 @@ public static final int /*long*/ g_data_
}
}
/** @method flags=dynamic */
@@ -14958,7 +14961,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_data_input_stream_read_line(stream, count, cancellable, error);
-@@ -1956,8 +1956,8 @@
+@@ -1964,8 +1964,8 @@ public static final int /*long*/ g_data_
}
}
/** @method flags=dynamic */
@@ -14969,7 +14972,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_content_type_equals(type1, type2);
-@@ -1966,8 +1966,8 @@
+@@ -1974,8 +1974,8 @@ public static final boolean g_content_ty
}
}
/** @method flags=dynamic */
@@ -14980,7 +14983,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_content_type_is_a(type, supertype);
-@@ -1976,8 +1976,8 @@
+@@ -1984,8 +1984,8 @@ public static final boolean g_content_ty
}
}
/** @method flags=dynamic */
@@ -14991,7 +14994,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_content_type_get_mime_type(mime_type);
-@@ -1986,8 +1986,8 @@
+@@ -1994,8 +1994,8 @@ public static final int /*long*/ g_conte
}
}
/** @method flags=dynamic */
@@ -15002,7 +15005,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_content_types_get_registered();
-@@ -1996,8 +1996,8 @@
+@@ -2004,8 +2004,8 @@ public static final int /*long*/ g_conte
}
}
/** @method flags=dynamic */
@@ -15013,7 +15016,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_desktop_app_info_new_from_filename(fileName);
-@@ -2006,8 +2006,8 @@
+@@ -2014,8 +2014,8 @@ public static final int /*long*/ g_deskt
}
}
/** @method flags=dynamic */
@@ -15024,7 +15027,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_info_get_content_type (info);
-@@ -2016,8 +2016,8 @@
+@@ -2024,8 +2024,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15035,7 +15038,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_get_path(file);
-@@ -2026,8 +2026,8 @@
+@@ -2034,8 +2034,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15046,7 +15049,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_get_uri(file);
-@@ -2036,8 +2036,8 @@
+@@ -2044,8 +2044,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15057,7 +15060,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_file_info_get_modification_time(info, result);
-@@ -2046,8 +2046,8 @@
+@@ -2054,8 +2054,8 @@ public static final void g_file_info_get
}
}
/** @method flags=dynamic */
@@ -15068,7 +15071,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_icon_get_file(icon);
-@@ -2056,8 +2056,8 @@
+@@ -2064,8 +2064,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15079,7 +15082,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_new_for_path(fileName);
-@@ -2066,8 +2066,8 @@
+@@ -2074,8 +2074,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15090,7 +15093,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_new_for_uri(fileName);
-@@ -2076,8 +2076,8 @@
+@@ -2084,8 +2084,8 @@ public static final int /*long*/ g_file_
}
}
/** @method flags=dynamic */
@@ -15101,7 +15104,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_query_info (file, attributes, flags, cancellable, error);
-@@ -2087,8 +2087,8 @@
+@@ -2095,8 +2095,8 @@ public static final int /*long*/ g_file_
}
/** @method flags=dynamic */
@@ -15112,7 +15115,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_file_read(file, cancellable, error);
-@@ -2107,8 +2107,8 @@
+@@ -2115,8 +2115,8 @@ public static final boolean /*long*/ g_f
}
}
/** @method flags=dynamic */
@@ -15123,7 +15126,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_icon_to_string(icon);
-@@ -2117,8 +2117,8 @@
+@@ -2125,8 +2125,8 @@ public static final int /*long*/ g_icon_
}
}
/** @method flags=dynamic */
@@ -15134,7 +15137,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_icon_new_for_string(str, error);
-@@ -2133,8 +2133,8 @@
+@@ -2141,8 +2141,8 @@ public static final int /*long*/ g_icon_
* @param hook_data cast=(gpointer)
* @param data_destroy cast=(GDestroyNotify)
*/
@@ -15145,7 +15148,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
-@@ -2146,8 +2146,8 @@
+@@ -2154,8 +2154,8 @@ public static final int /*long*/ g_signa
* @param signal_id cast=(guint)
* @param hook_id cast=(gulong)
*/
@@ -15156,7 +15159,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
-@@ -2160,8 +2160,8 @@
+@@ -2168,8 +2168,8 @@ public static final void g_signal_remove
* @param user_data cast=(gpointer)
* @param destroy_data cast=(GClosureNotify)
*/
@@ -15167,7 +15170,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
-@@ -2170,8 +2170,8 @@
+@@ -2178,8 +2178,8 @@ public static final int /*long*/ g_cclos
}
}
/** @param closure cast=(GClosure *) */
@@ -15178,7 +15181,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_closure_ref(closure);
-@@ -2180,8 +2180,8 @@
+@@ -2188,8 +2188,8 @@ public static final int /*long*/ g_closu
}
}
/** @param closure cast=(GClosure *) */
@@ -15189,7 +15192,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_closure_unref(closure);
-@@ -2190,8 +2190,8 @@
+@@ -2198,8 +2198,8 @@ public static final void g_closure_unref
}
}
/** @param context cast=(GMainContext *) */
@@ -15200,7 +15203,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_acquire(context);
-@@ -2203,8 +2203,8 @@
+@@ -2211,8 +2211,8 @@ public static final boolean g_main_conte
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -15211,7 +15214,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
-@@ -2212,8 +2212,8 @@
+@@ -2220,8 +2220,8 @@ public static final int g_main_context_c
lock.unlock();
}
}
@@ -15222,7 +15225,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_default();
-@@ -2222,8 +2222,8 @@
+@@ -2230,8 +2230,8 @@ public static final int /*long*/ g_main_
}
}
/** @param context cast=(GMainContext *) */
@@ -15233,7 +15236,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
-@@ -2232,8 +2232,8 @@
+@@ -2240,8 +2240,8 @@ public static final boolean g_main_conte
}
}
/** @param context cast=(GMainContext *) */
@@ -15244,7 +15247,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_pending(context);
-@@ -2242,8 +2242,8 @@
+@@ -2250,8 +2250,8 @@ public static final boolean g_main_conte
}
}
/** @param context cast=(GMainContext *) */
@@ -15255,7 +15258,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_get_poll_func(context);
-@@ -2252,8 +2252,8 @@
+@@ -2260,8 +2260,8 @@ public static final int /*long*/ g_main_
}
}
/** @param context cast=(GMainContext *) */
@@ -15266,7 +15269,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_prepare(context, priority);
-@@ -2265,8 +2265,8 @@
+@@ -2273,8 +2273,8 @@ public static final boolean g_main_conte
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -15277,7 +15280,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
-@@ -2275,8 +2275,8 @@
+@@ -2283,8 +2283,8 @@ public static final int g_main_context_q
}
}
/** @param context cast=(GMainContext *) */
@@ -15288,7 +15291,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_main_context_release(context);
-@@ -2285,7 +2285,7 @@
+@@ -2293,7 +2293,7 @@ public static final void g_main_context_
}
}
/** @param context cast=(GMainContext *) */
@@ -15297,7 +15300,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
/**
* @param opsysstring cast=(const gchar *)
* @param len cast=(gssize)
-@@ -2293,8 +2293,8 @@
+@@ -2301,8 +2301,8 @@ public static final native void g_main_c
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -15308,7 +15311,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2307,8 +2307,8 @@
+@@ -2315,8 +2315,8 @@ public static final int /*long*/ g_filen
* @param hostname cast=(const char *)
* @param error cast=(GError **)
*/
@@ -15319,7 +15322,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
-@@ -2323,8 +2323,8 @@
+@@ -2331,8 +2331,8 @@ public static final int /*long*/ g_filen
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -15330,7 +15333,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2337,8 +2337,8 @@
+@@ -2345,8 +2345,8 @@ public static final int /*long*/ g_filen
* @param hostname cast=(char **)
* @param error cast=(GError **)
*/
@@ -15341,7 +15344,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
-@@ -2347,8 +2347,8 @@
+@@ -2355,8 +2355,8 @@ public static final int /*long*/ g_filen
}
}
/** @param mem cast=(gpointer) */
@@ -15352,7 +15355,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_free(mem);
-@@ -2360,8 +2360,8 @@
+@@ -2368,8 +2368,8 @@ public static final void g_free(int /*lo
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -15363,7 +15366,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_idle_add(function, data);
-@@ -2373,8 +2373,8 @@
+@@ -2381,8 +2381,8 @@ public static final int g_idle_add(int /
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -15374,7 +15377,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_append(list, data);
-@@ -2383,8 +2383,8 @@
+@@ -2391,8 +2391,8 @@ public static final int /*long*/ g_list_
}
}
/** @param list cast=(GList *) */
@@ -15385,7 +15388,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_data(list);
-@@ -2393,8 +2393,8 @@
+@@ -2401,8 +2401,8 @@ public static final int /*long*/ g_list_
}
}
/** @param list cast=(GList *) */
@@ -15396,7 +15399,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_free(list);
-@@ -2403,8 +2403,8 @@
+@@ -2411,8 +2411,8 @@ public static final void g_list_free(int
}
}
/** @param list cast=(GList *) */
@@ -15407,7 +15410,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_free_1(list);
-@@ -2413,8 +2413,8 @@
+@@ -2421,8 +2421,8 @@ public static final void g_list_free_1(i
}
}
/** @param list cast=(GList *) */
@@ -15418,7 +15421,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_length(list);
-@@ -2426,8 +2426,8 @@
+@@ -2434,8 +2434,8 @@ public static final int g_list_length(in
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -15429,7 +15432,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_set_next(list, llist);
-@@ -2435,8 +2435,8 @@
+@@ -2443,8 +2443,8 @@ public static final void g_list_set_next
lock.unlock();
}
}
@@ -15440,7 +15443,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_next(list);
-@@ -2448,8 +2448,8 @@
+@@ -2456,8 +2456,8 @@ public static final int /*long*/ g_list_
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -15451,7 +15454,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_nth(list, n);
-@@ -2461,8 +2461,8 @@
+@@ -2469,8 +2469,8 @@ public static final int /*long*/ g_list_
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -15462,7 +15465,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_nth_data(list, n);
-@@ -2474,8 +2474,8 @@
+@@ -2482,8 +2482,8 @@ public static final int /*long*/ g_list_
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -15473,7 +15476,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_prepend(list, data);
-@@ -2487,8 +2487,8 @@
+@@ -2495,8 +2495,8 @@ public static final int /*long*/ g_list_
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -15484,7 +15487,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_set_previous(list, llist);
-@@ -2496,8 +2496,8 @@
+@@ -2504,8 +2504,8 @@ public static final void g_list_set_prev
lock.unlock();
}
}
@@ -15495,7 +15498,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_previous(list);
-@@ -2509,8 +2509,8 @@
+@@ -2517,8 +2517,8 @@ public static final int /*long*/ g_list_
* @param list cast=(GList *)
* @param link cast=(GList *)
*/
@@ -15506,7 +15509,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_remove_link(list, link);
-@@ -2519,8 +2519,8 @@
+@@ -2527,8 +2527,8 @@ public static final int /*long*/ g_list_
}
}
/** @param list cast=(GList *) */
@@ -15517,7 +15520,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_reverse(list);
-@@ -2535,8 +2535,8 @@
+@@ -2543,8 +2543,8 @@ public static final int /*long*/ g_list_
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -15528,7 +15531,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);
-@@ -2551,8 +2551,8 @@
+@@ -2559,8 +2559,8 @@ public static final int /*long*/ g_local
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -15539,7 +15542,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2566,8 +2566,8 @@
+@@ -2574,8 +2574,8 @@ public static final int /*long*/ g_local
* @param message cast=(gchar *)
* @param unused_data cast=(gpointer)
*/
@@ -15550,7 +15553,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
-@@ -2594,8 +2594,8 @@
+@@ -2602,8 +2602,8 @@ public static final void g_log_remove_ha
* @param log_func cast=(GLogFunc)
* @param user_data cast=(gpointer)
*/
@@ -15561,7 +15564,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
-@@ -2604,8 +2604,8 @@
+@@ -2612,8 +2612,8 @@ public static final int g_log_set_handle
}
}
/** @param size cast=(gulong) */
@@ -15572,7 +15575,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_malloc(size);
-@@ -2618,8 +2618,8 @@
+@@ -2626,8 +2626,8 @@ public static final int /*long*/ g_mallo
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15583,7 +15586,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2631,8 +2631,8 @@
+@@ -2639,8 +2639,8 @@ public static final void g_object_get(in
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
@@ -15594,7 +15597,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -2644,8 +2644,8 @@
+@@ -2652,8 +2652,8 @@ public static final int /*long*/ g_objec
* @param type cast=(GType)
* @param first_property_name cast=(const gchar *)
*/
@@ -15605,7 +15608,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -2657,8 +2657,8 @@
+@@ -2665,8 +2665,8 @@ public static final int /*long*/ g_objec
* @param object cast=(GObject *)
* @param property_name cast=(const gchar *)
*/
@@ -15616,7 +15619,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_notify(object, property_name);
-@@ -2667,8 +2667,8 @@
+@@ -2675,8 +2675,8 @@ public static final void g_object_notify
}
}
/** @param object cast=(gpointer) */
@@ -15627,7 +15630,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_ref(object);
-@@ -2681,8 +2681,8 @@
+@@ -2689,8 +2689,8 @@ public static final int /*long*/ g_objec
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15638,7 +15641,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2695,8 +2695,8 @@
+@@ -2703,8 +2703,8 @@ public static final void g_object_set(in
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15649,7 +15652,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2709,8 +2709,8 @@
+@@ -2717,8 +2717,8 @@ public static final void g_object_set(in
* @param first_property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15660,7 +15663,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2723,8 +2723,8 @@
+@@ -2731,8 +2731,8 @@ public static final void g_object_set(in
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15671,7 +15674,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2737,8 +2737,8 @@
+@@ -2745,8 +2745,8 @@ public static final void g_object_set(in
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15682,7 +15685,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2751,8 +2751,8 @@
+@@ -2759,8 +2759,8 @@ public static final void g_object_set(in
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -15693,7 +15696,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2765,8 +2765,8 @@
+@@ -2773,8 +2773,8 @@ public static final void g_object_set(in
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
@@ -15704,7 +15707,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -2775,8 +2775,8 @@
+@@ -2783,8 +2783,8 @@ public static final void g_object_set_qd
}
}
/** @param object cast=(gpointer) */
@@ -15715,7 +15718,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_unref(object);
-@@ -2810,8 +2810,8 @@
+@@ -2818,8 +2818,8 @@ public static final void g_set_prgname(b
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -15726,7 +15729,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -2825,8 +2825,8 @@
+@@ -2833,8 +2833,8 @@ public static final int g_signal_connect
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -15737,7 +15740,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -2841,8 +2841,8 @@
+@@ -2849,8 +2849,8 @@ public static final int g_signal_connect
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -15748,7 +15751,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -2856,8 +2856,8 @@
+@@ -2864,8 +2864,8 @@ public static final int g_signal_connect
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -15759,7 +15762,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -2869,8 +2869,8 @@
+@@ -2877,8 +2877,8 @@ public static final int g_signal_connect
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15770,7 +15773,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -2882,8 +2882,8 @@
+@@ -2890,8 +2890,8 @@ public static final void g_signal_emit_b
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15781,7 +15784,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2895,8 +2895,8 @@
+@@ -2903,8 +2903,8 @@ public static final void g_signal_emit_b
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15792,7 +15795,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2908,8 +2908,8 @@
+@@ -2916,8 +2916,8 @@ public static final void g_signal_emit_b
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15803,7 +15806,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -2921,8 +2921,8 @@
+@@ -2929,8 +2929,8 @@ public static final void g_signal_emit_b
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15814,7 +15817,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2934,8 +2934,8 @@
+@@ -2942,8 +2942,8 @@ public static final void g_signal_emit_b
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
@@ -15825,7 +15828,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -2950,8 +2950,8 @@
+@@ -2958,8 +2958,8 @@ public static final void g_signal_handle
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -15836,7 +15839,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data);
-@@ -2968,8 +2968,8 @@
+@@ -2976,8 +2976,8 @@ public static final int g_signal_handler
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -15847,7 +15850,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2986,8 +2986,8 @@
+@@ -2994,8 +2994,8 @@ public static final int g_signal_handler
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -15858,7 +15861,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3004,8 +3004,8 @@
+@@ -3012,8 +3012,8 @@ public static final int g_signal_handler
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -15869,7 +15872,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3014,8 +3014,8 @@
+@@ -3022,8 +3022,8 @@ public static final int g_signal_handler
}
}
/** @param name cast=(const gchar *),flags=no_out */
@@ -15880,7 +15883,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -3027,8 +3027,8 @@
+@@ -3035,8 +3035,8 @@ public static final int g_signal_lookup
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -15891,7 +15894,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -3037,8 +3037,8 @@
+@@ -3045,8 +3045,8 @@ public static final void g_signal_stop_e
}
}
/** @param tag cast=(guint) */
@@ -15902,7 +15905,18 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_source_remove(tag);
-@@ -3047,8 +3047,8 @@
+@@ -3058,8 +3058,8 @@ public static final boolean /*long*/ g_s
+ * @param list cast=(GSList *)
+ * @param data cast=(gpointer)
+ */
+-public static final native int /*long*/ _g_slist_append(int /*long*/ list, int /*long*/ data);
+-public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/ data) {
++public static final native long /*int*/ _g_slist_append(long /*int*/ list, long /*int*/ data);
++public static final long /*int*/ g_slist_append(long /*int*/ list, long /*int*/ data) {
+ lock.lock();
+ try {
+ return _g_slist_append(list, data);
+@@ -3068,8 +3068,8 @@ public static final int /*long*/ g_slist
}
}
/** @param list cast=(GSList *) */
@@ -15913,7 +15927,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_data(list);
-@@ -3057,8 +3057,8 @@
+@@ -3078,8 +3078,8 @@ public static final int /*long*/ g_slist
}
}
/** @param list cast=(GSList *) */
@@ -15924,7 +15938,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_slist_free(list);
-@@ -3067,8 +3067,8 @@
+@@ -3088,8 +3088,8 @@ public static final void g_slist_free (i
}
}
/** @param list cast=(GSList *) */
@@ -15935,7 +15949,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_next(list);
-@@ -3077,8 +3077,8 @@
+@@ -3098,8 +3098,8 @@ public static final int /*long*/ g_slist
}
}
/** @param list cast=(GSList *) */
@@ -15946,7 +15960,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_length(list);
-@@ -3087,8 +3087,8 @@
+@@ -3108,8 +3108,8 @@ public static final int g_slist_length (
}
}
/** @param string_array cast=(gchar **) */
@@ -15957,7 +15971,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_strfreev(string_array);
-@@ -3100,8 +3100,8 @@
+@@ -3121,8 +3121,8 @@ public static final void g_strfreev(int
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -15968,7 +15982,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GString_len(string);
-@@ -3113,8 +3113,8 @@
+@@ -3134,8 +3134,8 @@ public static final int GString_len(int
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -15979,7 +15993,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GString_str(string);
-@@ -3126,8 +3126,8 @@
+@@ -3147,8 +3147,8 @@ public static final int /*long*/ GString
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
@@ -15990,7 +16004,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -3140,8 +3140,8 @@
+@@ -3161,8 +3161,8 @@ public static final double g_strtod(int
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
@@ -16001,7 +16015,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -3150,8 +3150,8 @@
+@@ -3171,8 +3171,8 @@ public static final void g_type_add_inte
}
}
/** @param g_class cast=(GType) */
@@ -16012,7 +16026,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -3160,8 +3160,8 @@
+@@ -3181,8 +3181,8 @@ public static final int /*long*/ g_type_
}
}
/** @param g_class cast=(gpointer) */
@@ -16023,7 +16037,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -3170,8 +3170,8 @@
+@@ -3191,8 +3191,8 @@ public static final int /*long*/ g_type_
}
}
/** @param g_class cast=(GType) */
@@ -16034,7 +16048,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_ref(g_class);
-@@ -3180,8 +3180,8 @@
+@@ -3201,8 +3201,8 @@ public static final int /*long*/ g_type_
}
}
/** @param g_class cast=(gpointer) */
@@ -16045,7 +16059,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_class_unref(g_class);
-@@ -3190,8 +3190,8 @@
+@@ -3211,8 +3211,8 @@ public static final void g_type_class_un
}
}
/** @param name cast=(const gchar *) */
@@ -16056,7 +16070,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_from_name(name);
-@@ -3200,8 +3200,8 @@
+@@ -3221,8 +3221,8 @@ public static final int /*long*/ g_type_
}
}
/** @param iface cast=(gpointer) */
@@ -16067,7 +16081,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -3213,8 +3213,8 @@
+@@ -3234,8 +3234,8 @@ public static final int /*long*/ g_type_
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
@@ -16078,7 +16092,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -3223,8 +3223,8 @@
+@@ -3244,8 +3244,8 @@ public static final boolean g_type_is_a
}
}
/** @param handle cast=(GType) */
@@ -16089,7 +16103,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_name(handle);
-@@ -3233,8 +3233,8 @@
+@@ -3254,8 +3254,8 @@ public static final int /*long*/ g_type_
}
}
/** @param type cast=(GType) */
@@ -16100,7 +16114,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_parent(type);
-@@ -3246,8 +3246,8 @@
+@@ -3267,8 +3267,8 @@ public static final int /*long*/ g_type_
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
@@ -16111,7 +16125,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_query(type, query);
-@@ -3261,8 +3261,8 @@
+@@ -3282,8 +3282,8 @@ public static final void g_type_query (i
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
@@ -16122,7 +16136,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -3271,8 +3271,8 @@
+@@ -3292,8 +3292,8 @@ public static final int /*long*/ g_type_
}
}
/** @param vtable cast=(GThreadFunctions *) */
@@ -16133,7 +16147,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_thread_init(vtable);
-@@ -3296,8 +3296,8 @@
+@@ -3317,8 +3317,8 @@ public static final boolean g_thread_sup
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -16144,7 +16158,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -3306,8 +3306,8 @@
+@@ -3327,8 +3327,8 @@ public static final int /*long*/ g_utf16
}
}
/** @param str cast=(const gchar *) */
@@ -16155,7 +16169,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -3319,8 +3319,8 @@
+@@ -3340,8 +3340,8 @@ public static final int /*long*/ g_utf8_
* @param str cast=(const gchar *)
* @param pos cast=(const gchar *)
*/
@@ -16166,7 +16180,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -3329,8 +3329,8 @@
+@@ -3350,8 +3350,8 @@ public static final int /*long*/ g_utf8_
}
}
/** @param str cast=(const gchar *) */
@@ -16177,7 +16191,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -3345,8 +3345,8 @@
+@@ -3366,8 +3366,8 @@ public static final int /*long*/ g_utf8_
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -16188,7 +16202,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3361,8 +3361,8 @@
+@@ -3382,8 +3382,8 @@ public static final int /*long*/ g_utf8_
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -16199,7 +16213,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3374,28 +3374,28 @@
+@@ -3395,28 +3395,28 @@ public static final int /*long*/ g_utf8_
* @param value cast=(GValue *)
* @param type cast=(GType)
*/
@@ -16240,7 +16254,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -3404,8 +3404,8 @@
+@@ -3425,8 +3425,8 @@ public static final int /*long*/ g_valu
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
@@ -16251,7 +16265,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -3414,8 +3414,8 @@
+@@ -3435,8 +3435,8 @@ public static final int /*long*/ gdk_ato
}
}
/** @param atom cast=(GdkAtom) */
@@ -16262,7 +16276,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -3438,8 +3438,8 @@
+@@ -3459,8 +3459,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -16273,7 +16287,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -3448,8 +3448,8 @@
+@@ -3469,8 +3469,8 @@ public static final int /*long*/ gdk_bit
}
}
/** @method flags=dynamic */
@@ -16284,7 +16298,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cairo_create(drawable);
-@@ -3458,8 +3458,8 @@
+@@ -3479,8 +3479,8 @@ public static final int /*long*/ gdk_cai
}
}
/** @method flags=dynamic */
@@ -16295,7 +16309,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -3468,8 +3468,8 @@
+@@ -3489,8 +3489,8 @@ public static final void gdk_cairo_regio
}
}
/** @method flags=dynamic */
@@ -16306,7 +16320,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -3481,8 +3481,8 @@
+@@ -3502,8 +3502,8 @@ public static final void gdk_cairo_set_s
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -16317,7 +16331,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -3496,8 +3496,8 @@
+@@ -3517,8 +3517,8 @@ public static final boolean gdk_color_wh
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
@@ -16328,7 +16342,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -3510,8 +3510,8 @@
+@@ -3531,8 +3531,8 @@ public static final boolean gdk_colormap
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
@@ -16339,7 +16353,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -3519,8 +3519,8 @@
+@@ -3540,8 +3540,8 @@ public static final void gdk_colormap_fr
lock.unlock();
}
}
@@ -16350,7 +16364,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -3533,8 +3533,8 @@
+@@ -3554,8 +3554,8 @@ public static final int /*long*/ gdk_col
* @param pixel cast=(gulong)
* @param result cast=(GdkColor *)
*/
@@ -16361,7 +16375,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -3543,8 +3543,8 @@
+@@ -3564,8 +3564,8 @@ public static final void gdk_colormap_qu
}
}
/** @param cursor cast=(GdkCursor *) */
@@ -16372,7 +16386,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cursor_destroy(cursor);
-@@ -3553,8 +3553,8 @@
+@@ -3574,8 +3574,8 @@ public static final void gdk_cursor_dest
}
}
/** @param cursor_type cast=(GdkCursorType) */
@@ -16383,7 +16397,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -3570,8 +3570,8 @@
+@@ -3591,8 +3591,8 @@ public static final int /*long*/ gdk_cur
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -16394,7 +16408,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -3580,8 +3580,8 @@
+@@ -3601,8 +3601,8 @@ public static final int /*long*/ gdk_cur
}
}
/** @method flags=dynamic */
@@ -16405,7 +16419,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -3590,8 +3590,8 @@
+@@ -3611,8 +3611,8 @@ public static final int /*long*/ gdk_cur
}
}
/** @method flags=dynamic */
@@ -16416,7 +16430,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_display_get_default();
-@@ -3600,8 +3600,8 @@
+@@ -3621,8 +3621,8 @@ public static final int /*long*/ gdk_dis
}
}
/** @method flags=dynamic */
@@ -16427,7 +16441,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -3614,8 +3614,8 @@
+@@ -3635,8 +3635,8 @@ public static final boolean gdk_display_
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
@@ -16438,7 +16452,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -3634,8 +3634,8 @@
+@@ -3655,8 +3655,8 @@ public static final void gdk_drag_status
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
@@ -16449,7 +16463,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -3654,8 +3654,8 @@
+@@ -3675,8 +3675,8 @@ public static final void gdk_draw_arc(in
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -16460,7 +16474,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3668,8 +3668,8 @@
+@@ -3689,8 +3689,8 @@ public static final void gdk_draw_drawab
* @param gc cast=(GdkGC *)
* @param image cast=(GdkImage *)
*/
@@ -16471,7 +16485,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3684,8 +3684,8 @@
+@@ -3705,8 +3705,8 @@ public static final void gdk_draw_image(
* @param y cast=(gint)
* @param layout cast=(PangoLayout *)
*/
@@ -16482,7 +16496,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -3702,8 +3702,8 @@
+@@ -3723,8 +3723,8 @@ public static final void gdk_draw_layout
* @param foreground flags=no_out
* @param background flags=no_out
*/
@@ -16493,7 +16507,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -3719,8 +3719,8 @@
+@@ -3740,8 +3740,8 @@ public static final void gdk_draw_layout
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
@@ -16504,7 +16518,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -3734,8 +3734,8 @@
+@@ -3755,8 +3755,8 @@ public static final void gdk_draw_line(i
* @param points cast=(GdkPoint *),flags=no_out critical
* @param npoints cast=(gint)
*/
@@ -16515,7 +16529,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -3758,8 +3758,8 @@
+@@ -3779,8 +3779,8 @@ public static final void gdk_draw_lines(
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
@@ -16526,7 +16540,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -3771,8 +3771,8 @@
+@@ -3792,8 +3792,8 @@ public static final void gdk_draw_pixbuf
* @param drawable cast=(GdkDrawable *)
* @param gc cast=(GdkGC *)
*/
@@ -16537,7 +16551,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -3787,8 +3787,8 @@
+@@ -3808,8 +3808,8 @@ public static final void gdk_draw_point(
* @param points cast=(GdkPoint *),flags=no_out critical
* @param npoints cast=(gint)
*/
@@ -16548,7 +16562,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -3805,8 +3805,8 @@
+@@ -3826,8 +3826,8 @@ public static final void gdk_draw_polygo
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -16559,7 +16573,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -3815,8 +3815,8 @@
+@@ -3836,8 +3836,8 @@ public static final void gdk_draw_rectan
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -16570,7 +16584,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -3832,8 +3832,8 @@
+@@ -3853,8 +3853,8 @@ public static final int gdk_drawable_get
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -16581,7 +16595,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -3846,8 +3846,8 @@
+@@ -3867,8 +3867,8 @@ public static final int /*long*/ gdk_dra
* @param width cast=(gint *),flags=no_in critical
* @param height cast=(gint *),flags=no_in critical
*/
@@ -16592,7 +16606,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -3856,8 +3856,8 @@
+@@ -3877,8 +3877,8 @@ public static final void gdk_drawable_ge
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -16603,7 +16617,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -3866,8 +3866,8 @@
+@@ -3887,8 +3887,8 @@ public static final int /*long*/ gdk_dra
}
}
/** @param event cast=(GdkEvent *) */
@@ -16614,7 +16628,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -3876,8 +3876,8 @@
+@@ -3897,8 +3897,8 @@ public static final int /*long*/ gdk_eve
}
}
/** @param event cast=(GdkEvent *) */
@@ -16625,7 +16639,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_free(event);
-@@ -3885,8 +3885,8 @@
+@@ -3906,8 +3906,8 @@ public static final void gdk_event_free(
lock.unlock();
}
}
@@ -16636,7 +16650,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get();
-@@ -3899,8 +3899,8 @@
+@@ -3920,8 +3920,8 @@ public static final int /*long*/ gdk_eve
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -16647,7 +16661,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -3913,8 +3913,8 @@
+@@ -3934,8 +3934,8 @@ public static final boolean gdk_event_ge
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -16658,7 +16672,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -3923,8 +3923,8 @@
+@@ -3944,8 +3944,8 @@ public static final boolean gdk_event_ge
}
}
/** @param window cast=(GdkWindow *) */
@@ -16669,7 +16683,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_graphics_expose(window);
-@@ -3936,8 +3936,8 @@
+@@ -3957,8 +3957,8 @@ public static final int /*long*/ gdk_eve
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
@@ -16680,7 +16694,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -3946,8 +3946,8 @@
+@@ -3967,8 +3967,8 @@ public static final boolean gdk_event_ge
}
}
/** @param event cast=(GdkEvent *) */
@@ -16691,7 +16705,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -3960,8 +3960,8 @@
+@@ -3981,8 +3981,8 @@ public static final int gdk_event_get_ti
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
@@ -16702,7 +16716,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -3969,8 +3969,8 @@
+@@ -3990,8 +3990,8 @@ public static final void gdk_event_handl
lock.unlock();
}
}
@@ -16713,7 +16727,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_new(type);
-@@ -3978,8 +3978,8 @@
+@@ -3999,8 +3999,8 @@ public static final int /*long*/ gdk_eve
lock.unlock();
}
}
@@ -16724,7 +16738,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_peek();
-@@ -3988,8 +3988,8 @@
+@@ -4009,8 +4009,8 @@ public static final int /*long*/ gdk_eve
}
}
/** @param event cast=(GdkEvent *) */
@@ -16735,7 +16749,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_put(event);
-@@ -4025,8 +4025,8 @@
+@@ -4046,8 +4046,8 @@ public static final void gdk_flush() {
}
}
/** @param list cast=(gchar **) */
@@ -16746,7 +16760,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_free_text_list(list);
-@@ -4038,8 +4038,8 @@
+@@ -4059,8 +4059,8 @@ public static final void gdk_free_text_l
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in
*/
@@ -16757,7 +16771,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -4048,8 +4048,8 @@
+@@ -4069,8 +4069,8 @@ public static final void gdk_gc_get_valu
}
}
/** @param window cast=(GdkDrawable *) */
@@ -16768,7 +16782,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -4061,8 +4061,8 @@
+@@ -4082,8 +4082,8 @@ public static final int /*long*/ gdk_gc_
* @param gc cast=(GdkGC *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -16779,7 +16793,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -4074,8 +4074,8 @@
+@@ -4095,8 +4095,8 @@ public static final void gdk_gc_set_back
* @param gc cast=(GdkGC *)
* @param mask cast=(GdkBitmap *)
*/
@@ -16790,7 +16804,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -4088,8 +4088,8 @@
+@@ -4109,8 +4109,8 @@ public static final void gdk_gc_set_clip
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -16801,7 +16815,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -4101,8 +4101,8 @@
+@@ -4122,8 +4122,8 @@ public static final void gdk_gc_set_clip
* @param gc cast=(GdkGC *)
* @param rectangle cast=(GdkRectangle *),flags=no_out
*/
@@ -16812,7 +16826,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_rectangle(gc, rectangle);
-@@ -4114,8 +4114,8 @@
+@@ -4135,8 +4135,8 @@ public static final void gdk_gc_set_clip
* @param gc cast=(GdkGC *)
* @param region cast=(GdkRegion *)
*/
@@ -16823,7 +16837,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -4129,8 +4129,8 @@
+@@ -4150,8 +4150,8 @@ public static final void gdk_gc_set_clip
* @param dash_list cast=(gint8 *),flags=no_out critical
* @param n cast=(gint)
*/
@@ -16834,7 +16848,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -4142,8 +4142,8 @@
+@@ -4163,8 +4163,8 @@ public static final void gdk_gc_set_dash
* @param gc cast=(GdkGC *)
* @param exposures cast=(gboolean)
*/
@@ -16845,7 +16859,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -4155,8 +4155,8 @@
+@@ -4176,8 +4176,8 @@ public static final void gdk_gc_set_expo
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
@@ -16856,7 +16870,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -4168,8 +4168,8 @@
+@@ -4189,8 +4189,8 @@ public static final void gdk_gc_set_fill
* @param gc cast=(GdkGC *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -16867,7 +16881,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -4181,8 +4181,8 @@
+@@ -4202,8 +4202,8 @@ public static final void gdk_gc_set_fore
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
@@ -16878,7 +16892,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -4197,8 +4197,8 @@
+@@ -4218,8 +4218,8 @@ public static final void gdk_gc_set_func
* @param cap_style cast=(GdkCapStyle)
* @param join_style cast=(GdkJoinStyle)
*/
@@ -16889,7 +16903,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -4210,8 +4210,8 @@
+@@ -4231,8 +4231,8 @@ public static final void gdk_gc_set_line
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
@@ -16900,7 +16914,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -4223,8 +4223,8 @@
+@@ -4244,8 +4244,8 @@ public static final void gdk_gc_set_stip
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
@@ -16911,7 +16925,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -4236,8 +4236,8 @@
+@@ -4257,8 +4257,8 @@ public static final void gdk_gc_set_subw
* @param gc cast=(GdkGC *)
* @param tile cast=(GdkPixmap *)
*/
@@ -16922,7 +16936,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -4246,8 +4246,8 @@
+@@ -4267,8 +4267,8 @@ public static final void gdk_gc_set_tile
}
}
/** @param gc cast=(GdkGC *) */
@@ -16933,7 +16947,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -4260,8 +4260,8 @@
+@@ -4281,8 +4281,8 @@ public static final void gdk_gc_set_ts_o
* @param values cast=(GdkGCValues *),flags=no_out
* @param values_mask cast=(GdkGCValuesMask)
*/
@@ -16944,7 +16958,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -4278,8 +4278,8 @@
+@@ -4299,8 +4299,8 @@ public static final void gdk_keyboard_un
lock.unlock();
}
}
@@ -16955,7 +16969,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -4295,8 +4295,8 @@
+@@ -4316,8 +4316,8 @@ public static final int /*long*/ gdk_key
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
@@ -16966,7 +16980,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -4322,8 +4322,8 @@
+@@ -4343,8 +4343,8 @@ public static final int gdk_keyval_to_un
lock.unlock();
}
}
@@ -16977,7 +16991,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pango_attr_embossed_new(embossed);
-@@ -4331,8 +4331,8 @@
+@@ -4352,8 +4352,8 @@ public static final int /*long*/ gdk_pan
lock.unlock();
}
}
@@ -16988,7 +17002,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -4344,8 +4344,8 @@
+@@ -4365,8 +4365,8 @@ public static final int /*long*/ gdk_pan
* @param context cast=(PangoContext *)
* @param colormap cast=(GdkColormap *)
*/
@@ -16999,7 +17013,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -4354,8 +4354,8 @@
+@@ -4375,8 +4375,8 @@ public static final void gdk_pango_conte
}
}
/** @param layout cast=(PangoLayout *) */
@@ -17010,7 +17024,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -4367,8 +4367,8 @@
+@@ -4388,8 +4388,8 @@ public static final int /*long*/ gdk_pan
* @param src_pixbuf cast=(GdkPixbuf *)
* @param dest_pixbuf cast=(GdkPixbuf *)
*/
@@ -17021,7 +17035,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -4381,8 +4381,8 @@
+@@ -4402,8 +4402,8 @@ public static final void gdk_pixbuf_copy
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
@@ -17032,7 +17046,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -4391,8 +4391,8 @@
+@@ -4412,8 +4412,8 @@ public static final int /*long*/ gdk_pix
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -17043,7 +17057,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -4401,8 +4401,8 @@
+@@ -4422,8 +4422,8 @@ public static final boolean gdk_pixbuf_g
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -17054,7 +17068,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -4411,8 +4411,8 @@
+@@ -4432,8 +4432,8 @@ public static final int gdk_pixbuf_get_h
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -17065,7 +17079,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -4421,8 +4421,8 @@
+@@ -4442,8 +4442,8 @@ public static final int /*long*/ gdk_pix
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -17076,7 +17090,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -4431,8 +4431,8 @@
+@@ -4452,8 +4452,8 @@ public static final int gdk_pixbuf_get_r
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -17087,7 +17101,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -4440,8 +4440,8 @@
+@@ -4461,8 +4461,8 @@ public static final int gdk_pixbuf_get_w
lock.unlock();
}
}
@@ -17098,7 +17112,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -4453,8 +4453,8 @@
+@@ -4474,8 +4474,8 @@ public static final int /*long*/ gdk_pix
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
@@ -17109,7 +17123,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -4463,8 +4463,8 @@
+@@ -4484,8 +4484,8 @@ public static final boolean gdk_pixbuf_l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
@@ -17120,7 +17134,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -4478,8 +4478,8 @@
+@@ -4499,8 +4499,8 @@ public static final int /*long*/ gdk_pix
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
@@ -17131,7 +17145,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -4491,8 +4491,8 @@
+@@ -4512,8 +4512,8 @@ public static final boolean gdk_pixbuf_l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
@@ -17142,7 +17156,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -4504,8 +4504,8 @@
+@@ -4525,8 +4525,8 @@ public static final int /*long*/ gdk_pix
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
@@ -17153,7 +17167,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -4519,8 +4519,8 @@
+@@ -4540,8 +4540,8 @@ public static final int /*long*/ gdk_pix
* @param gc cast=(GdkGC *)
* @param dither cast=(GdkRgbDither)
*/
@@ -17164,7 +17178,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_to_drawable(pixbuf, drawable, gc, src_x, src_y, dest_x, dest_y, width, height, dither, x_dither, y_dither);
-@@ -4534,8 +4534,8 @@
+@@ -4555,8 +4555,8 @@ public static final void gdk_pixbuf_rend
* @param alpha_mode cast=(GdkPixbufAlphaMode)
* @param dither cast=(GdkRgbDither)
*/
@@ -17175,7 +17189,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_to_drawable_alpha(pixbuf, drawable, src_x, src_y, dest_x, dest_y, width, height, alpha_mode, alpha_threshold, dither, x_dither, y_dither);
-@@ -4548,8 +4548,8 @@
+@@ -4569,8 +4569,8 @@ public static final void gdk_pixbuf_rend
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
@@ -17186,7 +17200,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -4567,8 +4567,8 @@
+@@ -4588,8 +4588,8 @@ public static final void gdk_pixbuf_rend
* @param option_values=(char **)
* @param error cast=(GError **)
*/
@@ -17197,7 +17211,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
-@@ -4584,8 +4584,8 @@
+@@ -4605,8 +4605,8 @@ public static final boolean gdk_pixbuf_s
* @param scale_x cast=(double)
* @param scale_y cast=(double)
*/
@@ -17208,7 +17222,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_scale(src, dest, dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, interp_type);
-@@ -4597,8 +4597,8 @@
+@@ -4618,8 +4618,8 @@ public static final void gdk_pixbuf_scal
* @param src cast=(const GdkPixbuf *)
* @param interp_type cast=(GdkInterpType)
*/
@@ -17219,7 +17233,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -4612,8 +4612,8 @@
+@@ -4633,8 +4633,8 @@ public static final int /*long*/ gdk_pix
* @param height cast=(gint)
* @param depth cast=(gint)
*/
@@ -17230,7 +17244,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -4629,8 +4629,8 @@
+@@ -4650,8 +4650,8 @@ public static final int /*long*/ gdk_pix
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
@@ -17241,7 +17255,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -4666,8 +4666,8 @@
+@@ -4687,8 +4687,8 @@ public static final void gdk_pointer_ung
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
@@ -17252,7 +17266,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -4676,8 +4676,8 @@
+@@ -4697,8 +4697,8 @@ public static final boolean gdk_property
}
}
/** @param region cast=(GdkRegion *) */
@@ -17263,7 +17277,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -4686,8 +4686,8 @@
+@@ -4707,8 +4707,8 @@ public static final void gdk_region_dest
}
}
/** @param region cast=(GdkRegion *) */
@@ -17274,7 +17288,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -4699,8 +4699,8 @@
+@@ -4720,8 +4720,8 @@ public static final boolean gdk_region_e
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
@@ -17285,7 +17299,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -4713,8 +4713,8 @@
+@@ -4734,8 +4734,8 @@ public static final void gdk_region_get_
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
@@ -17296,7 +17310,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -4726,8 +4726,8 @@
+@@ -4747,8 +4747,8 @@ public static final void gdk_region_get_
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -17307,7 +17321,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -4735,8 +4735,8 @@
+@@ -4756,8 +4756,8 @@ public static final void gdk_region_inte
lock.unlock();
}
}
@@ -17318,7 +17332,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_new();
-@@ -4749,8 +4749,8 @@
+@@ -4770,8 +4770,8 @@ public static final int /*long*/ gdk_reg
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
@@ -17329,7 +17343,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -4763,8 +4763,8 @@
+@@ -4784,8 +4784,8 @@ public static final void gdk_region_offs
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -17340,7 +17354,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -4776,8 +4776,8 @@
+@@ -4797,8 +4797,8 @@ public static final boolean gdk_region_p
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
@@ -17351,7 +17365,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -4786,8 +4786,8 @@
+@@ -4807,8 +4807,8 @@ public static final int /*long*/ gdk_reg
}
}
/** @param rectangle flags=no_out */
@@ -17362,7 +17376,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -4799,8 +4799,8 @@
+@@ -4820,8 +4820,8 @@ public static final int /*long*/ gdk_reg
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -17373,7 +17387,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -4812,8 +4812,8 @@
+@@ -4833,8 +4833,8 @@ public static final int /*long*/ gdk_reg
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -17384,7 +17398,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -4825,8 +4825,8 @@
+@@ -4846,8 +4846,8 @@ public static final void gdk_region_subt
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -17395,7 +17409,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -4838,8 +4838,8 @@
+@@ -4859,8 +4859,8 @@ public static final void gdk_region_unio
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -17406,7 +17420,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -4857,8 +4857,8 @@
+@@ -4878,8 +4878,8 @@ public static final void gdk_rgb_init()
}
}
/** @method flags=dynamic */
@@ -17417,7 +17431,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -4872,8 +4872,8 @@
+@@ -4893,8 +4893,8 @@ public static final int /*long*/ gdk_scr
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -17428,7 +17442,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -4886,8 +4886,8 @@
+@@ -4907,8 +4907,8 @@ public static final int gdk_screen_get_m
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
@@ -17439,7 +17453,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -4900,8 +4900,8 @@
+@@ -4921,8 +4921,8 @@ public static final int gdk_screen_get_m
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
@@ -17450,7 +17464,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -4913,8 +4913,8 @@
+@@ -4934,8 +4934,8 @@ public static final void gdk_screen_get_
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -17461,7 +17475,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -4926,8 +4926,8 @@
+@@ -4947,8 +4947,8 @@ public static final int gdk_screen_get_n
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -17472,7 +17486,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -4979,8 +4979,8 @@
+@@ -5000,8 +5000,8 @@ public static final void gdk_set_program
* @param ctext cast=(guchar **)
* @param length cast=(gint *)
*/
@@ -17483,7 +17497,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -4989,8 +4989,8 @@
+@@ -5010,8 +5010,8 @@ public static final boolean gdk_utf8_to_
}
}
/** @param str cast=(const gchar *) */
@@ -17494,7 +17508,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -5003,8 +5003,8 @@
+@@ -5024,8 +5024,8 @@ public static final int /*long*/ gdk_utf
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
@@ -17505,7 +17519,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_text_property_to_utf8_list(encoding, format, text, length, list);
-@@ -5016,8 +5016,8 @@
+@@ -5037,8 +5037,8 @@ public static final int gdk_text_propert
* @method flags=dynamic
* @param display cast=(GdkDisplay*)
*/
@@ -17516,7 +17530,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltip_trigger_tooltip_query (display);
-@@ -5035,8 +5035,8 @@
+@@ -5056,8 +5056,8 @@ public static final int gdk_unicode_to_
lock.unlock();
}
}
@@ -17527,7 +17541,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -5048,8 +5048,8 @@
+@@ -5069,8 +5069,8 @@ public static final int /*long*/ gdk_vis
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
@@ -17538,7 +17552,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -5061,8 +5061,8 @@
+@@ -5082,8 +5082,8 @@ public static final int /*long*/ gdk_win
* @param window cast=(GdkWindow *)
* @param rectangle cast=(GdkRectangle *),flags=no_out
*/
@@ -17549,7 +17563,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -5071,8 +5071,8 @@
+@@ -5092,8 +5092,8 @@ public static final void gdk_window_begi
}
}
/** @param window cast=(GdkWindow *) */
@@ -17560,7 +17574,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -5081,8 +5081,8 @@
+@@ -5102,8 +5102,8 @@ public static final void gdk_window_clea
}
}
/** @param window cast=(GdkWindow *) */
@@ -17571,7 +17585,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -5091,8 +5091,8 @@
+@@ -5112,8 +5112,8 @@ public static final void gdk_window_dest
}
}
/** @param window cast=(GdkWindow *) */
@@ -17582,7 +17596,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -5101,8 +5101,8 @@
+@@ -5122,8 +5122,8 @@ public static final void gdk_window_end_
}
}
/** @param window cast=(GdkWindow *) */
@@ -17593,7 +17607,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -5111,8 +5111,8 @@
+@@ -5132,8 +5132,8 @@ public static final int /*long*/ gdk_win
}
}
/** @param window cast=(GdkWindow *) */
@@ -17604,7 +17618,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -5121,8 +5121,8 @@
+@@ -5142,8 +5142,8 @@ public static final int gdk_window_get_e
}
}
/** @param window cast=(GdkWindow *) */
@@ -17615,7 +17629,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -5131,8 +5131,8 @@
+@@ -5152,8 +5152,8 @@ public static final void gdk_window_focu
}
}
/** @param window cast=(GdkWindow *) */
@@ -17626,7 +17640,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -5144,8 +5144,8 @@
+@@ -5165,8 +5165,8 @@ public static final void gdk_window_free
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -17637,7 +17651,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -5159,8 +5159,8 @@
+@@ -5180,8 +5180,8 @@ public static final void gdk_window_get_
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
@@ -17648,7 +17662,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -5173,8 +5173,8 @@
+@@ -5194,8 +5194,8 @@ public static final void gdk_window_get_
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -17659,7 +17673,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -5183,8 +5183,8 @@
+@@ -5204,8 +5204,8 @@ public static final int gdk_window_get_o
}
}
/** @param window cast=(GdkWindow *) */
@@ -17670,7 +17684,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -5198,8 +5198,8 @@
+@@ -5219,8 +5219,8 @@ public static final int /*long*/ gdk_win
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
@@ -17681,7 +17695,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -5212,8 +5212,8 @@
+@@ -5233,8 +5233,8 @@ public static final int /*long*/ gdk_win
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -17692,7 +17706,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -5225,8 +5225,8 @@
+@@ -5246,8 +5246,8 @@ public static final void gdk_window_get_
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
@@ -17703,7 +17717,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -5235,8 +5235,8 @@
+@@ -5256,8 +5256,8 @@ public static final void gdk_window_get_
}
}
/** @param window cast=(GdkWindow *) */
@@ -17714,7 +17728,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_hide(window);
-@@ -5249,8 +5249,8 @@
+@@ -5270,8 +5270,8 @@ public static final void gdk_window_hide
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
@@ -17725,7 +17739,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -5263,8 +5263,8 @@
+@@ -5284,8 +5284,8 @@ public static final void gdk_window_inva
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
@@ -17736,7 +17750,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -5273,8 +5273,8 @@
+@@ -5294,8 +5294,8 @@ public static final void gdk_window_inva
}
}
/** @param window cast=(GdkWindow *) */
@@ -17747,7 +17761,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -5283,8 +5283,8 @@
+@@ -5304,8 +5304,8 @@ public static final boolean gdk_window_i
}
}
/** @param window cast=(GdkWindow *) */
@@ -17758,7 +17772,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -5293,8 +5293,8 @@
+@@ -5314,8 +5314,8 @@ public static final void gdk_window_move
}
}
/** @param window cast=(GdkWindow *) */
@@ -17769,7 +17783,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_move_resize(window, x, y, width, height);
-@@ -5306,8 +5306,8 @@
+@@ -5327,8 +5327,8 @@ public static final void gdk_window_move
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
@@ -17780,7 +17794,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -5316,8 +5316,8 @@
+@@ -5337,8 +5337,8 @@ public static final int /*long*/ gdk_win
}
}
/** @param window cast=(GdkWindow *) */
@@ -17791,7 +17805,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_lower(window);
-@@ -5338,8 +5338,8 @@
+@@ -5359,8 +5359,8 @@ public static final void gdk_window_proc
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
@@ -17802,7 +17816,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -5348,8 +5348,8 @@
+@@ -5369,8 +5369,8 @@ public static final void gdk_window_proc
}
}
/** @param window cast=(GdkWindow *) */
@@ -17813,7 +17827,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_raise(window);
-@@ -5358,8 +5358,8 @@
+@@ -5379,8 +5379,8 @@ public static final void gdk_window_rais
}
}
/** @param window cast=(GdkWindow *) */
@@ -17824,7 +17838,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -5373,8 +5373,8 @@
+@@ -5394,8 +5394,8 @@ public static final void gdk_window_resi
* @param sibling cast=(GdkWindow *)
* @param above cast=(gboolean)
*/
@@ -17835,7 +17849,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_restack(window, sibling, above);
-@@ -5383,8 +5383,8 @@
+@@ -5404,8 +5404,8 @@ public static final void gdk_window_rest
}
}
/** @param window cast=(GdkWindow *) */
@@ -17846,7 +17860,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -5397,8 +5397,8 @@
+@@ -5418,8 +5418,8 @@ public static final void gdk_window_scro
* @param window cast=(GdkWindow *)
* @param accept_focus cast=(gboolean)
*/
@@ -17857,7 +17871,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -5411,8 +5411,8 @@
+@@ -5432,8 +5432,8 @@ public static final void gdk_window_set_
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
@@ -17868,7 +17882,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -5424,8 +5424,8 @@
+@@ -5445,8 +5445,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
@@ -17879,7 +17893,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -5447,8 +5447,8 @@
+@@ -5468,8 +5468,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
@@ -17890,7 +17904,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -5457,8 +5457,8 @@
+@@ -5478,8 +5478,8 @@ public static final void gdk_window_set_
}
}
/** @param window cast=(GdkWindow *) */
@@ -17901,7 +17915,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -5472,8 +5472,8 @@
+@@ -5493,8 +5493,8 @@ public static final void gdk_window_set_
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -17912,7 +17926,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -5485,8 +5485,8 @@
+@@ -5506,8 +5506,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param pixbufs cast=(GList *)
*/
@@ -17923,7 +17937,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -5499,8 +5499,8 @@
+@@ -5520,8 +5520,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param setting cast=(gboolean)
*/
@@ -17934,7 +17948,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -5512,8 +5512,8 @@
+@@ -5533,8 +5533,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
@@ -17945,7 +17959,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -5525,8 +5525,8 @@
+@@ -5546,8 +5546,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
@@ -17956,7 +17970,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -5538,8 +5538,8 @@
+@@ -5559,8 +5559,8 @@ public static final void gdk_window_set_
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
@@ -17967,7 +17981,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -5548,8 +5548,8 @@
+@@ -5569,8 +5569,8 @@ public static final void gdk_window_shap
}
}
/** @param window cast=(GdkWindow *) */
@@ -17978,7 +17992,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_show(window);
-@@ -5558,8 +5558,8 @@
+@@ -5579,8 +5579,8 @@ public static final void gdk_window_show
}
}
/** @param window cast=(GdkWindow *) */
@@ -17989,7 +18003,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -5568,8 +5568,8 @@
+@@ -5589,8 +5589,8 @@ public static final void gdk_window_show
}
}
/** @param window cast=(GdkWindow *) */
@@ -18000,7 +18014,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -5577,8 +5577,8 @@
+@@ -5598,8 +5598,8 @@ public static final void gdk_window_thaw
lock.unlock();
}
}
@@ -18011,7 +18025,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -5591,8 +5591,8 @@
+@@ -5612,8 +5612,8 @@ public static final int /*long*/ gtk_acc
* @param accelKey cast=(guint)
* @param accelMods cast=(GdkModifierType)
*/
@@ -18022,7 +18036,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -5604,8 +5604,8 @@
+@@ -5625,8 +5625,8 @@ public static final boolean gtk_accel_gr
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
@@ -18033,7 +18047,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -5614,8 +5614,8 @@
+@@ -5635,8 +5635,8 @@ public static final void gtk_accel_label
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -18044,7 +18058,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -5630,8 +5630,8 @@
+@@ -5651,8 +5651,8 @@ public static final void gtk_adjustment_
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
@@ -18055,7 +18069,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -5643,8 +5643,8 @@
+@@ -5664,8 +5664,8 @@ public static final int /*long*/ gtk_adj
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
@@ -18066,7 +18080,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -5653,8 +5653,8 @@
+@@ -5674,8 +5674,8 @@ public static final void gtk_adjustment_
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -18077,7 +18091,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -5666,8 +5666,8 @@
+@@ -5687,8 +5687,8 @@ public static final void gtk_adjustment_
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -18088,7 +18102,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -5680,8 +5680,8 @@
+@@ -5701,8 +5701,8 @@ public static final int /*long*/ gtk_arr
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -18099,7 +18113,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -5690,8 +5690,8 @@
+@@ -5711,8 +5711,8 @@ public static final void gtk_arrow_set(i
}
}
/** @param bin cast=(GtkBin *) */
@@ -18110,7 +18124,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -5700,8 +5700,8 @@
+@@ -5721,8 +5721,8 @@ public static final int /*long*/ gtk_bin
}
}
/** @param border cast=(GtkBorder *) */
@@ -18121,7 +18135,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_border_free(border);
-@@ -5710,8 +5710,8 @@
+@@ -5731,8 +5731,8 @@ public static final void gtk_border_free
}
}
/** @param box cast=(GtkBox *) */
@@ -18132,7 +18146,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -5723,8 +5723,8 @@
+@@ -5744,8 +5744,8 @@ public static final void gtk_box_set_spa
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
@@ -18143,7 +18157,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -5733,8 +5733,8 @@
+@@ -5754,8 +5754,8 @@ public static final void gtk_box_set_chi
}
}
/** @param button cast=(GtkButton *) */
@@ -18154,7 +18168,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -5743,8 +5743,8 @@
+@@ -5764,8 +5764,8 @@ public static final void gtk_button_clic
}
}
/** @param button cast=(GtkButton *) */
@@ -18165,7 +18179,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -5752,8 +5752,8 @@
+@@ -5773,8 +5773,8 @@ public static final int gtk_button_get_r
lock.unlock();
}
}
@@ -18176,7 +18190,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_button_new();
-@@ -5765,8 +5765,8 @@
+@@ -5786,8 +5786,8 @@ public static final int /*long*/ gtk_but
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
@@ -18187,7 +18201,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -5775,8 +5775,8 @@
+@@ -5796,8 +5796,8 @@ public static final void gtk_button_set_
}
}
/** @method flags=dynamic */
@@ -18198,7 +18212,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_calendar_new();
-@@ -5790,8 +5790,8 @@
+@@ -5811,8 +5811,8 @@ public static final int /*long*/ gtk_cal
* @param month cast=(guint)
* @param year cast=(guint)
*/
@@ -18209,7 +18223,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -5804,8 +5804,8 @@
+@@ -5825,8 +5825,8 @@ public static final boolean /*long*/ gtk
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -18220,7 +18234,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -5818,8 +5818,8 @@
+@@ -5839,8 +5839,8 @@ public static final void gtk_calendar_se
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -18231,7 +18245,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -5832,8 +5832,8 @@
+@@ -5853,8 +5853,8 @@ public static final void gtk_calendar_se
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -18242,7 +18256,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_display_options(calendar, flags);
-@@ -5848,8 +5848,8 @@
+@@ -5869,8 +5869,8 @@ public static final void gtk_calendar_di
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
@@ -18253,7 +18267,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -5858,8 +5858,8 @@
+@@ -5879,8 +5879,8 @@ public static final void gtk_calendar_ge
}
}
/** @method flags=dynamic */
@@ -18264,7 +18278,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -5868,8 +5868,8 @@
+@@ -5889,8 +5889,8 @@ public static final void gtk_cell_layout
}
}
/** @method flags=no_gen */
@@ -18275,7 +18289,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -5878,8 +5878,8 @@
+@@ -5899,8 +5899,8 @@ public static final void gtk_cell_layout
}
}
/** @method flags=dynamic */
@@ -18286,7 +18300,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -5896,8 +5896,8 @@
+@@ -5917,8 +5917,8 @@ public static final void gtk_cell_layout
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -18297,7 +18311,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -5905,8 +5905,8 @@
+@@ -5926,8 +5926,8 @@ public static final void gtk_cell_render
lock.unlock();
}
}
@@ -18308,7 +18322,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -5914,8 +5914,8 @@
+@@ -5935,8 +5935,8 @@ public static final int /*long*/ gtk_cel
lock.unlock();
}
}
@@ -18319,7 +18333,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -5923,8 +5923,8 @@
+@@ -5944,8 +5944,8 @@ public static final int /*long*/ gtk_cel
lock.unlock();
}
}
@@ -18330,7 +18344,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -5932,8 +5932,8 @@
+@@ -5953,8 +5953,8 @@ public static final int /*long*/ gtk_cel
lock.unlock();
}
}
@@ -18341,7 +18355,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_button_new();
-@@ -5942,8 +5942,8 @@
+@@ -5963,8 +5963,8 @@ public static final int /*long*/ gtk_che
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
@@ -18352,7 +18366,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -5952,8 +5952,8 @@
+@@ -5973,8 +5973,8 @@ public static final boolean gtk_check_me
}
}
/** @param label cast=(const gchar *) */
@@ -18363,7 +18377,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -5965,8 +5965,8 @@
+@@ -5986,8 +5986,8 @@ public static final int /*long*/ gtk_che
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
@@ -18374,7 +18388,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -5974,8 +5974,8 @@
+@@ -5995,8 +5995,8 @@ public static final void gtk_check_menu_
lock.unlock();
}
}
@@ -18385,7 +18399,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -5984,8 +5984,8 @@
+@@ -6005,8 +6005,8 @@ public static final int /*long*/ gtk_che
}
}
/** @param clipboard cast=(GtkClipboard *) */
@@ -18396,7 +18410,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -5994,8 +5994,8 @@
+@@ -6015,8 +6015,8 @@ public static final void gtk_clipboard_c
}
}
/** @param selection cast=(GdkAtom) */
@@ -18407,7 +18421,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -6011,8 +6011,8 @@
+@@ -6032,8 +6032,8 @@ public static final int /*long*/ gtk_cli
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -18418,7 +18432,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6028,8 +6028,8 @@
+@@ -6049,8 +6049,8 @@ public static final boolean gtk_clipboar
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -18429,7 +18443,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6041,8 +6041,8 @@
+@@ -6062,8 +6062,8 @@ public static final boolean gtk_clipboar
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
@@ -18440,7 +18454,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -6051,8 +6051,8 @@
+@@ -6072,8 +6072,8 @@ public static final int /*long*/ gtk_cli
}
}
/** @param title cast=(const gchar *) */
@@ -18451,7 +18465,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -6064,8 +6064,8 @@
+@@ -6085,8 +6085,8 @@ public static final int /*long*/ gtk_col
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -18462,7 +18476,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -6077,8 +6077,8 @@
+@@ -6098,8 +6098,8 @@ public static final void gtk_color_selec
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -18473,7 +18487,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -6087,8 +6087,8 @@
+@@ -6108,8 +6108,8 @@ public static final void gtk_color_selec
}
}
/** @param colorsel cast=(GtkColorSelection *) */
@@ -18484,7 +18498,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -6097,8 +6097,8 @@
+@@ -6118,8 +6118,8 @@ public static final void gtk_color_selec
}
}
/** @param combo cast=(GtkCombo *) */
@@ -18495,7 +18509,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_disable_activate(combo);
-@@ -6106,8 +6106,8 @@
+@@ -6127,8 +6127,8 @@ public static final void gtk_combo_disab
lock.unlock();
}
}
@@ -18506,7 +18520,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_new();
-@@ -6119,8 +6119,8 @@
+@@ -6140,8 +6140,8 @@ public static final int /*long*/ gtk_com
* @param combo cast=(GtkCombo *)
* @param val cast=(gboolean)
*/
@@ -18517,7 +18531,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_set_case_sensitive(combo, val);
-@@ -6129,8 +6129,8 @@
+@@ -6150,8 +6150,8 @@ public static final void gtk_combo_set_c
}
}
/** @method flags=dynamic */
@@ -18528,7 +18542,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -6142,8 +6142,8 @@
+@@ -6163,8 +6163,8 @@ public static final void gtk_combo_box_s
* @param combo cast=(GtkCombo *)
* @param strings cast=(GList *)
*/
@@ -18539,7 +18553,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_set_popdown_strings(combo, strings);
-@@ -6152,8 +6152,8 @@
+@@ -6173,8 +6173,8 @@ public static final void gtk_combo_set_p
}
}
/** @method flags=dynamic */
@@ -18550,7 +18564,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -6162,8 +6162,8 @@
+@@ -6183,8 +6183,8 @@ public static final int /*long*/ gtk_com
}
}
/** @method flags=dynamic */
@@ -18561,7 +18575,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -6172,8 +6172,8 @@
+@@ -6193,8 +6193,8 @@ public static final int /*long*/ gtk_com
}
}
/** @method flags=dynamic */
@@ -18572,7 +18586,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -6182,8 +6182,8 @@
+@@ -6203,8 +6203,8 @@ public static final void gtk_combo_box_i
}
}
/** @method flags=dynamic */
@@ -18583,7 +18597,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -6192,8 +6192,8 @@
+@@ -6213,8 +6213,8 @@ public static final void gtk_combo_box_r
}
}
/** @method flags=dynamic */
@@ -18594,7 +18608,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -6202,8 +6202,8 @@
+@@ -6223,8 +6223,8 @@ public static final int gtk_combo_box_ge
}
}
/** @method flags=dynamic */
@@ -18605,7 +18619,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -6212,8 +6212,8 @@
+@@ -6233,8 +6233,8 @@ public static final int /*long*/ gtk_com
}
}
/** @method flags=dynamic */
@@ -18616,7 +18630,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -6222,8 +6222,8 @@
+@@ -6243,8 +6243,8 @@ public static final void gtk_combo_box_s
}
}
/** @method flags=dynamic */
@@ -18627,7 +18641,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -6232,8 +6232,8 @@
+@@ -6253,8 +6253,8 @@ public static final void gtk_combo_box_p
}
}
/** @method flags=dynamic */
@@ -18638,7 +18652,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -6245,8 +6245,8 @@
+@@ -6266,8 +6266,8 @@ public static final void gtk_combo_box_p
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -18649,7 +18663,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -6259,8 +6259,8 @@
+@@ -6280,8 +6280,8 @@ public static final void gtk_container_a
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
@@ -18660,7 +18674,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -6269,8 +6269,8 @@
+@@ -6290,8 +6290,8 @@ public static final void gtk_container_f
}
}
/** @param container cast=(GtkContainer *) */
@@ -18671,7 +18685,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -6279,8 +6279,8 @@
+@@ -6300,8 +6300,8 @@ public static final int gtk_container_ge
}
}
/** @param container cast=(GtkContainer *) */
@@ -18682,7 +18696,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -6292,8 +6292,8 @@
+@@ -6313,8 +6313,8 @@ public static final int /*long*/ gtk_con
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -18693,7 +18707,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -6302,8 +6302,8 @@
+@@ -6323,8 +6323,8 @@ public static final void gtk_container_r
}
}
/** @param container cast=(GtkContainer *) */
@@ -18704,7 +18718,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -6315,8 +6315,8 @@
+@@ -6336,8 +6336,8 @@ public static final void gtk_container_r
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
@@ -18715,7 +18729,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -6329,8 +6329,8 @@
+@@ -6350,8 +6350,8 @@ public static final void gtk_container_s
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
@@ -18726,7 +18740,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -6339,8 +6339,8 @@
+@@ -6360,8 +6360,8 @@ public static final int /*long*/ gtk_dia
}
}
/** @param dialog cast=(GtkDialog *) */
@@ -18737,7 +18751,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -6355,8 +6355,8 @@
+@@ -6376,8 +6376,8 @@ public static final int gtk_dialog_run(i
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
@@ -18748,7 +18762,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -6371,8 +6371,8 @@
+@@ -6392,8 +6392,8 @@ public static final int /*long*/ gtk_dra
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
@@ -18759,7 +18773,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -6385,8 +6385,8 @@
+@@ -6406,8 +6406,8 @@ public static final boolean gtk_drag_che
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
@@ -18770,7 +18784,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -6401,8 +6401,8 @@
+@@ -6422,8 +6422,8 @@ public static final int /*long*/ gtk_dra
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
@@ -18781,7 +18795,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -6411,8 +6411,8 @@
+@@ -6432,8 +6432,8 @@ public static final void gtk_drag_dest_s
}
}
/** @param widget cast=(GtkWidget *) */
@@ -18792,7 +18806,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -6426,8 +6426,8 @@
+@@ -6447,8 +6447,8 @@ public static final void gtk_drag_dest_u
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
@@ -18803,7 +18817,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -6441,8 +6441,8 @@
+@@ -6462,8 +6462,8 @@ public static final void gtk_drag_finish
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
@@ -18814,7 +18828,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -6454,8 +6454,8 @@
+@@ -6475,8 +6475,8 @@ public static final void gtk_drag_get_da
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -18825,7 +18839,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -6463,8 +6463,8 @@
+@@ -6484,8 +6484,8 @@ public static final void gtk_drag_set_ic
lock.unlock();
}
}
@@ -18836,7 +18850,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -6473,8 +6473,8 @@
+@@ -6494,8 +6494,8 @@ public static final int /*long*/ gtk_dra
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18847,7 +18861,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -6483,8 +6483,8 @@
+@@ -6504,8 +6504,8 @@ public static final void gtk_editable_co
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18858,7 +18872,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -6493,8 +6493,8 @@
+@@ -6514,8 +6514,8 @@ public static final void gtk_editable_cu
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18869,7 +18883,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -6507,8 +6507,8 @@
+@@ -6528,8 +6528,8 @@ public static final void gtk_editable_de
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -18880,7 +18894,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -6521,8 +6521,8 @@
+@@ -6542,8 +6542,8 @@ public static final void gtk_editable_de
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -18891,7 +18905,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -6531,8 +6531,8 @@
+@@ -6552,8 +6552,8 @@ public static final int /*long*/ gtk_edi
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18902,7 +18916,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -6541,8 +6541,8 @@
+@@ -6562,8 +6562,8 @@ public static final boolean gtk_editable
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18913,7 +18927,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -6555,8 +6555,8 @@
+@@ -6576,8 +6576,8 @@ public static final int gtk_editable_get
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
@@ -18924,7 +18938,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -6570,8 +6570,8 @@
+@@ -6591,8 +6591,8 @@ public static final boolean gtk_editable
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
@@ -18935,7 +18949,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -6580,8 +6580,8 @@
+@@ -6601,8 +6601,8 @@ public static final void gtk_editable_in
}
}
/** @param editable cast=(GtkEditable *) */
@@ -18946,7 +18960,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -6594,8 +6594,8 @@
+@@ -6615,8 +6615,8 @@ public static final void gtk_editable_pa
* @param start cast=(gint)
* @param end cast=(gint)
*/
@@ -18957,7 +18971,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -6607,8 +6607,8 @@
+@@ -6628,8 +6628,8 @@ public static final void gtk_editable_se
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
@@ -18968,7 +18982,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -6620,8 +6620,8 @@
+@@ -6641,8 +6641,8 @@ public static final void gtk_editable_se
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
@@ -18979,7 +18993,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -6630,8 +6630,8 @@
+@@ -6651,8 +6651,8 @@ public static final void gtk_editable_se
}
}
/** @method flags=dynamic */
@@ -18990,7 +19004,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
-@@ -6640,8 +6640,8 @@
+@@ -6661,8 +6661,8 @@ public static final int /*long*/ gtk_ent
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19001,7 +19015,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -6650,8 +6650,8 @@
+@@ -6671,8 +6671,8 @@ public static final char gtk_entry_get_i
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19012,7 +19026,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -6660,8 +6660,8 @@
+@@ -6681,8 +6681,8 @@ public static final int /*long*/ gtk_ent
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19023,7 +19037,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
-@@ -6670,8 +6670,8 @@
+@@ -6691,8 +6691,8 @@ public static final void gtk_entry_get_l
}
}
/** @method flags=dynamic */
@@ -19034,7 +19048,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -6680,8 +6680,8 @@
+@@ -6701,8 +6701,8 @@ public static final int gtk_entry_text_i
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19045,7 +19059,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -6690,8 +6690,8 @@
+@@ -6711,8 +6711,8 @@ public static final int gtk_entry_get_ma
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19056,7 +19070,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -6700,8 +6700,8 @@
+@@ -6721,8 +6721,8 @@ public static final int /*long*/ gtk_ent
}
}
/** @method flags=dynamic */
@@ -19067,7 +19081,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -6710,8 +6710,8 @@
+@@ -6731,8 +6731,8 @@ public static final boolean FcConfigAppF
}
}
/** @param entry cast=(GtkEntry *) */
@@ -19078,7 +19092,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -6719,8 +6719,8 @@
+@@ -6740,8 +6740,8 @@ public static final boolean gtk_entry_ge
lock.unlock();
}
}
@@ -19089,7 +19103,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_new();
-@@ -6732,8 +6732,8 @@
+@@ -6753,8 +6753,8 @@ public static final int /*long*/ gtk_ent
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -19100,7 +19114,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -6746,8 +6746,8 @@
+@@ -6767,8 +6767,8 @@ public static final void gtk_entry_set_a
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
@@ -19111,7 +19125,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -6759,8 +6759,8 @@
+@@ -6780,8 +6780,8 @@ public static final void gtk_entry_set_a
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -19122,7 +19136,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -6769,8 +6769,8 @@
+@@ -6790,8 +6790,8 @@ public static final void gtk_entry_set_h
}
}
/** @method flags=dynamic */
@@ -19133,7 +19147,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_icon_from_stock(entry, icon, stock);
-@@ -6779,8 +6779,8 @@
+@@ -6800,8 +6800,8 @@ public static final void gtk_entry_set_i
}
}
/** @method flags=dynamic */
@@ -19144,7 +19158,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
-@@ -6792,8 +6792,8 @@
+@@ -6813,8 +6813,8 @@ public static final void gtk_entry_set_i
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
@@ -19155,7 +19169,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -6805,8 +6805,8 @@
+@@ -6826,8 +6826,8 @@ public static final void gtk_entry_set_i
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
@@ -19166,7 +19180,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -6818,8 +6818,8 @@
+@@ -6839,8 +6839,8 @@ public static final void gtk_entry_set_m
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
@@ -19177,7 +19191,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -6831,8 +6831,8 @@
+@@ -6852,8 +6852,8 @@ public static final void gtk_entry_set_t
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
@@ -19188,7 +19202,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -6850,8 +6850,8 @@
+@@ -6871,8 +6871,8 @@ public static final int gtk_events_pendi
}
}
/** @method flags=dynamic */
@@ -19199,7 +19213,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -6860,8 +6860,8 @@
+@@ -6881,8 +6881,8 @@ public static final boolean gtk_expander
}
}
/** @method flags=dynamic */
@@ -19210,7 +19224,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -6873,8 +6873,8 @@
+@@ -6894,8 +6894,8 @@ public static final int /*long*/ gtk_exp
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -19221,7 +19235,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -6883,8 +6883,8 @@
+@@ -6904,8 +6904,8 @@ public static final int /*long*/ gtk_exp
}
}
/** @method flags=dynamic */
@@ -19232,7 +19246,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -6896,8 +6896,8 @@
+@@ -6917,8 +6917,8 @@ public static final void gtk_expander_se
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -19243,7 +19257,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -6906,8 +6906,8 @@
+@@ -6927,8 +6927,8 @@ public static final void gtk_expander_se
}
}
/** @method flags=dynamic */
@@ -19254,7 +19268,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -6916,8 +6916,8 @@
+@@ -6937,8 +6937,8 @@ public static final void gtk_expander_s
}
}
/** @method flags=dynamic */
@@ -19265,7 +19279,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -6926,8 +6926,8 @@
+@@ -6947,8 +6947,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=no_gen */
@@ -19276,7 +19290,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
-@@ -6936,8 +6936,8 @@
+@@ -6957,8 +6957,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19287,7 +19301,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -6946,8 +6946,8 @@
+@@ -6967,8 +6967,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19298,7 +19312,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -6956,8 +6956,8 @@
+@@ -6977,8 +6977,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19309,7 +19323,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -6966,8 +6966,8 @@
+@@ -6987,8 +6987,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19320,7 +19334,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
-@@ -6976,8 +6976,8 @@
+@@ -6997,8 +6997,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19331,7 +19345,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
-@@ -6986,8 +6986,8 @@
+@@ -7007,8 +7007,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19342,7 +19356,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -6996,8 +6996,8 @@
+@@ -7017,8 +7017,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19353,7 +19367,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -7006,8 +7006,8 @@
+@@ -7027,8 +7027,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19364,7 +19378,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-@@ -7016,8 +7016,8 @@
+@@ -7037,8 +7037,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19375,7 +19389,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -7026,8 +7026,8 @@
+@@ -7047,8 +7047,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19386,7 +19400,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
-@@ -7036,8 +7036,8 @@
+@@ -7057,8 +7057,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19397,7 +19411,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -7046,8 +7046,8 @@
+@@ -7067,8 +7067,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19408,7 +19422,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -7056,8 +7056,8 @@
+@@ -7077,8 +7077,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19419,7 +19433,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -7066,8 +7066,8 @@
+@@ -7087,8 +7087,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19430,7 +19444,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -7076,8 +7076,8 @@
+@@ -7097,8 +7097,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19441,7 +19455,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
-@@ -7086,8 +7086,8 @@
+@@ -7107,8 +7107,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19452,7 +19466,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -7096,8 +7096,8 @@
+@@ -7117,8 +7117,8 @@ public static final void gtk_file_choose
}
}
/** @method flags=dynamic */
@@ -19463,7 +19477,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -7106,8 +7106,8 @@
+@@ -7127,8 +7127,8 @@ public static final void gtk_file_filter
}
}
/** @method flags=dynamic */
@@ -19474,7 +19488,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -7116,8 +7116,8 @@
+@@ -7137,8 +7137,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19485,7 +19499,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -7126,8 +7126,8 @@
+@@ -7147,8 +7147,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @method flags=dynamic */
@@ -19496,7 +19510,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -7136,8 +7136,8 @@
+@@ -7157,8 +7157,8 @@ public static final void gtk_file_filter
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -19507,7 +19521,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_get_filename(filesel);
-@@ -7146,8 +7146,8 @@
+@@ -7167,8 +7167,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -19518,7 +19532,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_get_selections(filesel);
-@@ -7156,8 +7156,8 @@
+@@ -7177,8 +7177,8 @@ public static final int /*long*/ gtk_fil
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -19529,7 +19543,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_hide_fileop_buttons(filesel);
-@@ -7166,8 +7166,8 @@
+@@ -7187,8 +7187,8 @@ public static final void gtk_file_select
}
}
/** @param title cast=(const gchar *) */
@@ -19540,7 +19554,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_new(title);
-@@ -7179,8 +7179,8 @@
+@@ -7200,8 +7200,8 @@ public static final int /*long*/ gtk_fil
* @param filesel cast=(GtkFileSelection *)
* @param filename cast=(const gchar *)
*/
@@ -19551,7 +19565,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_set_filename(filesel, filename);
-@@ -7192,8 +7192,8 @@
+@@ -7213,8 +7213,8 @@ public static final void gtk_file_select
* @param filesel cast=(GtkFileSelection *)
* @param select_multiple cast=(gboolean)
*/
@@ -19562,7 +19576,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_set_select_multiple(filesel, select_multiple);
-@@ -7207,8 +7207,8 @@
+@@ -7228,8 +7228,8 @@ public static final void gtk_file_select
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19573,7 +19587,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -7216,8 +7216,8 @@
+@@ -7237,8 +7237,8 @@ public static final void gtk_fixed_move(
lock.unlock();
}
}
@@ -19584,7 +19598,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_fixed_new();
-@@ -7229,8 +7229,8 @@
+@@ -7250,8 +7250,8 @@ public static final int /*long*/ gtk_fix
* @param fixed cast=(GtkFixed *)
* @param has_window cast=(gboolean)
*/
@@ -19595,7 +19609,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -7239,8 +7239,8 @@
+@@ -7260,8 +7260,8 @@ public static final void gtk_fixed_set_h
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
@@ -19606,7 +19620,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -7249,8 +7249,8 @@
+@@ -7270,8 +7270,8 @@ public static final int /*long*/ gtk_fon
}
}
/** @param title cast=(const gchar *) */
@@ -19617,7 +19631,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -7262,8 +7262,8 @@
+@@ -7283,8 +7283,8 @@ public static final int /*long*/ gtk_fon
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
@@ -19628,7 +19642,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -7272,8 +7272,8 @@
+@@ -7293,8 +7293,8 @@ public static final boolean gtk_font_sel
}
}
/** @param label cast=(const gchar *) */
@@ -19639,7 +19653,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -7282,8 +7282,8 @@
+@@ -7303,8 +7303,8 @@ public static final int /*long*/ gtk_fra
}
}
/** @param frame cast=(GtkFrame *) */
@@ -19650,7 +19664,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -7295,8 +7295,8 @@
+@@ -7316,8 +7316,8 @@ public static final int /*long*/ gtk_fra
* @param frame cast=(GtkFrame *)
* @param label cast=(const gchar *)
*/
@@ -19661,7 +19675,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -7308,8 +7308,8 @@
+@@ -7329,8 +7329,8 @@ public static final void gtk_frame_set_l
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
@@ -19672,7 +19686,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -7321,8 +7321,8 @@
+@@ -7342,8 +7342,8 @@ public static final void gtk_frame_set_l
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
@@ -19683,7 +19697,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -7330,8 +7330,8 @@
+@@ -7351,8 +7351,8 @@ public static final void gtk_frame_set_s
lock.unlock();
}
}
@@ -19694,7 +19708,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_current_event();
-@@ -7358,8 +7358,8 @@
+@@ -7379,8 +7379,8 @@ public static final int gtk_get_current_
lock.unlock();
}
}
@@ -19705,7 +19719,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_default_language();
-@@ -7368,8 +7368,8 @@
+@@ -7389,8 +7389,8 @@ public static final int /*long*/ gtk_get
}
}
/** @param event cast=(GdkEvent *) */
@@ -19716,7 +19730,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -7378,8 +7378,8 @@
+@@ -7399,8 +7399,8 @@ public static final int /*long*/ gtk_get
}
}
/** @param widget cast=(GtkWidget *) */
@@ -19727,7 +19741,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -7387,8 +7387,8 @@
+@@ -7408,8 +7408,8 @@ public static final void gtk_grab_add(in
lock.unlock();
}
}
@@ -19738,7 +19752,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -7397,8 +7397,8 @@
+@@ -7418,8 +7418,8 @@ public static final int /*long*/ gtk_gra
}
}
/** @param widget cast=(GtkWidget *) */
@@ -19749,7 +19763,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -7410,8 +7410,8 @@
+@@ -7431,8 +7431,8 @@ public static final void gtk_grab_remove
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -19760,7 +19774,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -7420,8 +7420,8 @@
+@@ -7441,8 +7441,8 @@ public static final int /*long*/ gtk_hbo
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -19771,7 +19785,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -7430,8 +7430,8 @@
+@@ -7451,8 +7451,8 @@ public static final int /*long*/ gtk_hsc
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -19782,7 +19796,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -7439,8 +7439,8 @@
+@@ -7460,8 +7460,8 @@ public static final int /*long*/ gtk_hsc
lock.unlock();
}
}
@@ -19793,7 +19807,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -7451,8 +7451,8 @@
+@@ -7472,8 +7472,8 @@ public static final int /*long*/ gtk_hse
/**
* @method flags=dynamic
*/
@@ -19804,7 +19818,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_icon_info_free(icon_info);
-@@ -7461,8 +7461,8 @@
+@@ -7482,8 +7482,8 @@ public static final void gtk_icon_info_f
}
}
/** @param stock_id cast=(const gchar *) */
@@ -19815,7 +19829,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -7471,8 +7471,8 @@
+@@ -7492,8 +7492,8 @@ public static final int /*long*/ gtk_ico
}
}
/** @param source cast=(GtkIconSource *) */
@@ -19826,7 +19840,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -7480,8 +7480,8 @@
+@@ -7501,8 +7501,8 @@ public static final void gtk_icon_source
lock.unlock();
}
}
@@ -19837,7 +19851,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -7493,8 +7493,8 @@
+@@ -7514,8 +7514,8 @@ public static final int /*long*/ gtk_ico
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -19848,7 +19862,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -7511,8 +7511,8 @@
+@@ -7532,8 +7532,8 @@ public static final void gtk_icon_source
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
@@ -19859,7 +19873,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -7523,8 +7523,8 @@
+@@ -7544,8 +7544,8 @@ public static final int /*long*/ gtk_ico
/**
* @method flags=dynamic
*/
@@ -19870,7 +19884,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_theme_get_default ();
-@@ -7535,8 +7535,8 @@
+@@ -7556,8 +7556,8 @@ public static final int /*long*/ gtk_ico
/**
* @method flags=dynamic
*/
@@ -19881,7 +19895,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
-@@ -7547,8 +7547,8 @@
+@@ -7568,8 +7568,8 @@ public static final int /*long*/ gtk_ico
/**
* @method flags=dynamic
*/
@@ -19892,7 +19906,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_info_load_icon(icon_info, error);
-@@ -7560,8 +7560,8 @@
+@@ -7581,8 +7581,8 @@ public static final int /*long*/ gtk_ico
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
@@ -19903,7 +19917,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -7570,8 +7570,8 @@
+@@ -7591,8 +7591,8 @@ public static final boolean gtk_im_conte
}
}
/** @param context cast=(GtkIMContext *) */
@@ -19914,7 +19928,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -7580,8 +7580,8 @@
+@@ -7601,8 +7601,8 @@ public static final void gtk_im_context_
}
}
/** @param context cast=(GtkIMContext *) */
@@ -19925,7 +19939,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -7595,8 +7595,8 @@
+@@ -7616,8 +7616,8 @@ public static final void gtk_im_context_
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
@@ -19936,7 +19950,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -7604,8 +7604,8 @@
+@@ -7625,8 +7625,8 @@ public static final void gtk_im_context_
lock.unlock();
}
}
@@ -19947,7 +19961,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -7614,8 +7614,8 @@
+@@ -7635,8 +7635,8 @@ public static final int /*long*/ gtk_im_
}
}
/** @param context cast=(GtkIMContext *) */
@@ -19958,7 +19972,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -7627,8 +7627,8 @@
+@@ -7648,8 +7648,8 @@ public static final void gtk_im_context_
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
@@ -19969,7 +19983,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -7640,8 +7640,8 @@
+@@ -7661,8 +7661,8 @@ public static final void gtk_im_context_
* @param context cast=(GtkIMContext *)
* @param area cast=(GdkRectangle *),flags=no_out
*/
@@ -19980,7 +19994,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -7653,8 +7653,8 @@
+@@ -7674,8 +7674,8 @@ public static final void gtk_im_context_
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
@@ -19991,7 +20005,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -7662,8 +7662,8 @@
+@@ -7683,8 +7683,8 @@ public static final void gtk_im_multicon
lock.unlock();
}
}
@@ -20002,7 +20016,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -7672,8 +7672,8 @@
+@@ -7693,8 +7693,8 @@ public static final int /*long*/ gtk_im_
}
}
/** @param label cast=(const gchar *) */
@@ -20013,7 +20027,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -7685,8 +7685,8 @@
+@@ -7706,8 +7706,8 @@ public static final int /*long*/ gtk_ima
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
@@ -20024,7 +20038,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -7694,8 +7694,8 @@
+@@ -7715,8 +7715,8 @@ public static final void gtk_image_menu_
lock.unlock();
}
}
@@ -20035,7 +20049,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new();
-@@ -7704,8 +7704,8 @@
+@@ -7725,8 +7725,8 @@ public static final int /*long*/ gtk_ima
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
@@ -20046,7 +20060,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -7717,8 +7717,8 @@
+@@ -7738,8 +7738,8 @@ public static final int /*long*/ gtk_ima
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -20057,7 +20071,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -7730,8 +7730,8 @@
+@@ -7751,8 +7751,8 @@ public static final int /*long*/ gtk_ima
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -20068,7 +20082,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -7744,8 +7744,8 @@
+@@ -7765,8 +7765,8 @@ public static final void gtk_image_set_f
* @param pixmap cast=(GdkBitmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -20079,7 +20093,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -7757,8 +7757,8 @@
+@@ -7778,8 +7778,8 @@ public static final void gtk_image_set_f
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
@@ -20090,7 +20104,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -7767,8 +7767,8 @@
+@@ -7788,8 +7788,8 @@ public static final boolean gtk_init_che
}
}
/** @param label cast=(GtkLabel *) */
@@ -20101,7 +20115,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -7777,8 +7777,8 @@
+@@ -7798,8 +7798,8 @@ public static final int /*long*/ gtk_lab
}
}
/** @param label cast=(GtkLabel *) */
@@ -20112,7 +20126,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -7787,8 +7787,8 @@
+@@ -7808,8 +7808,8 @@ public static final int gtk_label_get_mn
}
}
/** @param label cast=(const gchar *) */
@@ -20123,7 +20137,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_new(label);
-@@ -7797,8 +7797,8 @@
+@@ -7818,8 +7818,8 @@ public static final int /*long*/ gtk_lab
}
}
/** @param str cast=(const gchar *) */
@@ -20134,7 +20148,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -7810,8 +7810,8 @@
+@@ -7831,8 +7831,8 @@ public static final int /*long*/ gtk_lab
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -20145,7 +20159,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -7823,8 +7823,8 @@
+@@ -7844,8 +7844,8 @@ public static final void gtk_label_set_a
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
@@ -20156,7 +20170,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -7836,8 +7836,8 @@
+@@ -7857,8 +7857,8 @@ public static final void gtk_label_set_j
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
@@ -20167,7 +20181,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -7846,8 +7846,8 @@
+@@ -7867,8 +7867,8 @@ public static final void gtk_label_set_l
}
}
/** @method flags=dynamic */
@@ -20178,7 +20192,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -7859,8 +7859,8 @@
+@@ -7880,8 +7880,8 @@ public static final void gtk_label_set_l
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -20189,7 +20203,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -7872,8 +7872,8 @@
+@@ -7893,8 +7893,8 @@ public static final void gtk_label_set_t
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -20200,7 +20214,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -7885,8 +7885,8 @@
+@@ -7906,8 +7906,8 @@ public static final void gtk_label_set_t
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -20211,7 +20225,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -7898,8 +7898,8 @@
+@@ -7919,8 +7919,8 @@ public static final void gtk_label_set_t
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -20222,7 +20236,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_append_items(list, items);
-@@ -7908,8 +7908,8 @@
+@@ -7929,8 +7929,8 @@ public static final void gtk_list_append
}
}
/** @param list cast=(GtkList *) */
@@ -20233,7 +20247,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_clear_items(list, start, end);
-@@ -7921,8 +7921,8 @@
+@@ -7942,8 +7942,8 @@ public static final void gtk_list_clear_
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -20244,7 +20258,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_insert_items(list, items, position);
-@@ -7931,8 +7931,8 @@
+@@ -7952,8 +7952,8 @@ public static final void gtk_list_insert
}
}
/** @param label cast=(const gchar *) */
@@ -20255,7 +20269,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_list_item_new_with_label(label);
-@@ -7944,8 +7944,8 @@
+@@ -7965,8 +7965,8 @@ public static final int /*long*/ gtk_lis
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -20266,7 +20280,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_remove_items(list, items);
-@@ -7954,8 +7954,8 @@
+@@ -7975,8 +7975,8 @@ public static final void gtk_list_remove
}
}
/** @param list cast=(GtkList *) */
@@ -20277,7 +20291,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_select_item(list, item);
-@@ -7964,8 +7964,8 @@
+@@ -7985,8 +7985,8 @@ public static final void gtk_list_select
}
}
/** @param list cast=(GtkList *) */
@@ -20288,7 +20302,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_unselect_all(list);
-@@ -7974,8 +7974,8 @@
+@@ -7995,8 +7995,8 @@ public static final void gtk_list_unsele
}
}
/** @param list cast=(GtkList *) */
@@ -20299,7 +20313,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_unselect_item(list, item);
-@@ -7987,8 +7987,8 @@
+@@ -8008,8 +8008,8 @@ public static final void gtk_list_unsele
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20310,7 +20324,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -7997,8 +7997,8 @@
+@@ -8018,8 +8018,8 @@ public static final void gtk_list_store_
}
}
/** @param store cast=(GtkListStore *) */
@@ -20321,7 +20335,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -8011,8 +8011,8 @@
+@@ -8032,8 +8032,8 @@ public static final void gtk_list_store_
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -20332,7 +20346,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -8024,8 +8024,8 @@
+@@ -8045,8 +8045,8 @@ public static final void gtk_list_store_
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
@@ -20343,7 +20357,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -8037,8 +8037,8 @@
+@@ -8058,8 +8058,8 @@ public static final int /*long*/ gtk_lis
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20354,7 +20368,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -8050,8 +8050,8 @@
+@@ -8071,8 +8071,8 @@ public static final void gtk_list_store_
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20365,7 +20379,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8063,8 +8063,8 @@
+@@ -8084,8 +8084,8 @@ public static final void gtk_list_store_
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20376,7 +20390,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8076,8 +8076,8 @@
+@@ -8097,8 +8097,8 @@ public static final void gtk_list_store_
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20387,7 +20401,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8090,8 +8090,8 @@
+@@ -8111,8 +8111,8 @@ public static final void gtk_list_store_
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -20398,7 +20412,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8103,8 +8103,8 @@
+@@ -8124,8 +8124,8 @@ public static final void gtk_list_store_
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20409,7 +20423,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8161,8 +8161,8 @@
+@@ -8182,8 +8182,8 @@ public static final int gtk_main_iterati
}
}
/** @param event cast=(GdkEvent *) */
@@ -20420,7 +20434,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -8170,8 +8170,8 @@
+@@ -8191,8 +8191,8 @@ public static final void gtk_main_do_eve
lock.unlock();
}
}
@@ -20431,7 +20445,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -8180,8 +8180,8 @@
+@@ -8201,8 +8201,8 @@ public static final int /*long*/ gtk_men
}
}
/** @param menu cast=(GtkMenu *) */
@@ -20442,7 +20456,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_get_attach_widget(menu);
-@@ -8190,8 +8190,8 @@
+@@ -8211,8 +8211,8 @@ public static final int /*long*/ gtk_men
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -20453,7 +20467,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -8200,8 +8200,8 @@
+@@ -8221,8 +8221,8 @@ public static final void gtk_menu_item_r
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -20464,7 +20478,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -8213,8 +8213,8 @@
+@@ -8234,8 +8234,8 @@ public static final int /*long*/ gtk_men
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
@@ -20475,7 +20489,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -8222,8 +8222,8 @@
+@@ -8243,8 +8243,8 @@ public static final void gtk_menu_item_s
lock.unlock();
}
}
@@ -20486,7 +20500,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_new();
-@@ -8232,8 +8232,8 @@
+@@ -8253,8 +8253,8 @@ public static final int /*long*/ gtk_men
}
}
/** @param menu cast=(GtkMenu *) */
@@ -20497,7 +20511,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -8250,8 +8250,8 @@
+@@ -8271,8 +8271,8 @@ public static final void gtk_menu_popdow
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
@@ -20508,7 +20522,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -8260,8 +8260,8 @@
+@@ -8281,8 +8281,8 @@ public static final void gtk_menu_popup(
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
@@ -20519,7 +20533,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -8274,8 +8274,8 @@
+@@ -8295,8 +8295,8 @@ public static final void gtk_menu_shell_
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -20530,7 +20544,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -8287,8 +8287,8 @@
+@@ -8308,8 +8308,8 @@ public static final void gtk_menu_shell_
* @param menu_shell cast=(GtkMenuShell *)
* @param menu_item cast=(GtkWidget *)
*/
@@ -20541,7 +20555,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -8301,8 +8301,8 @@
+@@ -8322,8 +8322,8 @@ public static final void gtk_menu_shell_
* @param menu_shell cast=(GtkMenuShell *)
* @param take_focus cast=(gboolean)
*/
@@ -20552,7 +20566,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -8317,8 +8317,8 @@
+@@ -8338,8 +8338,8 @@ public static final void gtk_menu_shell_
* @param buttons cast=(GtkButtonsType)
* @param message_format cast=(const gchar *)
*/
@@ -20563,7 +20577,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -8331,8 +8331,8 @@
+@@ -8352,8 +8352,8 @@ public static final int /*long*/ gtk_mes
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
@@ -20574,7 +20588,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -8341,8 +8341,8 @@
+@@ -8362,8 +8362,8 @@ public static final void gtk_misc_set_al
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -20585,7 +20599,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -8351,8 +8351,8 @@
+@@ -8372,8 +8372,8 @@ public static final int gtk_notebook_get
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -20596,7 +20610,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -8366,8 +8366,8 @@
+@@ -8387,8 +8387,8 @@ public static final boolean gtk_notebook
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -20607,7 +20621,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -8375,8 +8375,8 @@
+@@ -8396,8 +8396,8 @@ public static final void gtk_notebook_in
lock.unlock();
}
}
@@ -20618,7 +20632,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_new();
-@@ -8385,8 +8385,8 @@
+@@ -8406,8 +8406,8 @@ public static final int /*long*/ gtk_not
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -20629,7 +20643,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -8395,8 +8395,8 @@
+@@ -8416,8 +8416,8 @@ public static final void gtk_notebook_ne
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -20640,7 +20654,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -8408,8 +8408,8 @@
+@@ -8429,8 +8429,8 @@ public static final void gtk_notebook_pr
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -20651,7 +20665,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -8421,8 +8421,8 @@
+@@ -8442,8 +8442,8 @@ public static final void gtk_notebook_re
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -20662,7 +20676,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -8434,8 +8434,8 @@
+@@ -8455,8 +8455,8 @@ public static final void gtk_notebook_se
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
@@ -20673,7 +20687,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -8447,8 +8447,8 @@
+@@ -8468,8 +8468,8 @@ public static final void gtk_notebook_se
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
@@ -20684,7 +20698,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -8460,8 +8460,8 @@
+@@ -8481,8 +8481,8 @@ public static final void gtk_notebook_se
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
@@ -20695,7 +20709,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -8470,8 +8470,8 @@
+@@ -8491,8 +8491,8 @@ public static final void gtk_notebook_se
}
}
/** @param object cast=(GtkObject *) */
@@ -20706,7 +20720,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_object_sink(object);
-@@ -8480,8 +8480,8 @@
+@@ -8501,8 +8501,8 @@ public static final void gtk_object_sink
}
}
/** @method flags=dynamic */
@@ -20717,7 +20731,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -8490,8 +8490,8 @@
+@@ -8511,8 +8511,8 @@ public static final int /*long*/ gtk_pag
}
}
/** @method flags=dynamic */
@@ -20728,7 +20742,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -8500,8 +8500,8 @@
+@@ -8521,8 +8521,8 @@ public static final int gtk_page_setup_g
}
}
/** @method flags=dynamic */
@@ -20739,7 +20753,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -8510,8 +8510,8 @@
+@@ -8531,8 +8531,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20750,7 +20764,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -8520,8 +8520,8 @@
+@@ -8541,8 +8541,8 @@ public static final int /*long*/ gtk_pag
}
}
/** @method flags=dynamic */
@@ -20761,7 +20775,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -8530,8 +8530,8 @@
+@@ -8551,8 +8551,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20772,7 +20786,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -8540,8 +8540,8 @@
+@@ -8561,8 +8561,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20783,7 +20797,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -8550,8 +8550,8 @@
+@@ -8571,8 +8571,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20794,7 +20808,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -8560,8 +8560,8 @@
+@@ -8581,8 +8581,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20805,7 +20819,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -8570,8 +8570,8 @@
+@@ -8591,8 +8591,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20816,7 +20830,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -8580,8 +8580,8 @@
+@@ -8601,8 +8601,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20827,7 +20841,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -8590,8 +8590,8 @@
+@@ -8611,8 +8611,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20838,7 +20852,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -8600,8 +8600,8 @@
+@@ -8621,8 +8621,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20849,7 +20863,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -8610,8 +8610,8 @@
+@@ -8631,8 +8631,8 @@ public static final void gtk_page_setup_
}
}
/** @method flags=dynamic */
@@ -20860,7 +20874,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -8620,8 +8620,8 @@
+@@ -8641,8 +8641,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20871,7 +20885,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -8630,8 +8630,8 @@
+@@ -8651,8 +8651,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20882,7 +20896,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -8640,8 +8640,8 @@
+@@ -8661,8 +8661,8 @@ public static final double gtk_page_setu
}
}
/** @method flags=dynamic */
@@ -20893,7 +20907,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -8656,8 +8656,8 @@
+@@ -8677,8 +8677,8 @@ public static final double gtk_page_setu
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20904,7 +20918,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8671,8 +8671,8 @@
+@@ -8692,8 +8692,8 @@ public static final void gtk_paint_handl
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20915,7 +20929,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8687,8 +8687,8 @@
+@@ -8708,8 +8708,8 @@ public static final void gtk_paint_flat_
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20926,7 +20940,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -8702,8 +8702,8 @@
+@@ -8723,8 +8723,8 @@ public static final void gtk_paint_focus
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20937,7 +20951,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8717,8 +8717,8 @@
+@@ -8738,8 +8738,8 @@ public static final void gtk_paint_optio
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20948,7 +20962,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8732,8 +8732,8 @@
+@@ -8753,8 +8753,8 @@ public static final void gtk_paint_slide
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20959,7 +20973,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8747,8 +8747,8 @@
+@@ -8768,8 +8768,8 @@ public static final void gtk_paint_tab(i
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20970,7 +20984,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -8763,8 +8763,8 @@
+@@ -8784,8 +8784,8 @@ public static final void gtk_paint_arrow
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -20981,7 +20995,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8778,8 +8778,8 @@
+@@ -8799,8 +8799,8 @@ public static final void gtk_paint_box(i
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -20992,7 +21006,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_box_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -8793,8 +8793,8 @@
+@@ -8814,8 +8814,8 @@ public static final void gtk_paint_box_g
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -21003,7 +21017,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8808,8 +8808,8 @@
+@@ -8829,8 +8829,8 @@ public static final void gtk_paint_check
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -21014,7 +21028,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -8823,8 +8823,8 @@
+@@ -8844,8 +8844,8 @@ public static final void gtk_paint_expan
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -21025,7 +21039,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -8838,8 +8838,8 @@
+@@ -8859,8 +8859,8 @@ public static final void gtk_paint_exten
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -21036,7 +21050,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -8854,8 +8854,8 @@
+@@ -8875,8 +8875,8 @@ public static final void gtk_paint_hline
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
@@ -21047,7 +21061,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -8869,8 +8869,8 @@
+@@ -8890,8 +8890,8 @@ public static final void gtk_paint_layou
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -21058,7 +21072,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_shadow_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -8884,8 +8884,8 @@
+@@ -8905,8 +8905,8 @@ public static final void gtk_paint_shado
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -21069,7 +21083,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8899,8 +8899,8 @@
+@@ -8920,8 +8920,8 @@ public static final void gtk_paint_shado
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -21080,7 +21094,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -8909,8 +8909,8 @@
+@@ -8930,8 +8930,8 @@ public static final void gtk_paint_vline
}
}
/** @method flags=dynamic */
@@ -21091,7 +21105,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -8919,8 +8919,8 @@
+@@ -8940,8 +8940,8 @@ public static final void gtk_paper_size_
}
}
/** @method flags=dynamic */
@@ -21102,7 +21116,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -8929,8 +8929,8 @@
+@@ -8950,8 +8950,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21113,7 +21127,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -8939,8 +8939,8 @@
+@@ -8960,8 +8960,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21124,7 +21138,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -8949,8 +8949,8 @@
+@@ -8970,8 +8970,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21135,7 +21149,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -8959,8 +8959,8 @@
+@@ -8980,8 +8980,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21146,7 +21160,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -8969,8 +8969,8 @@
+@@ -8990,8 +8990,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21157,7 +21171,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -8979,8 +8979,8 @@
+@@ -9000,8 +9000,8 @@ public static final int /*long*/ gtk_pap
}
}
/** @method flags=dynamic */
@@ -21168,7 +21182,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -8989,8 +8989,8 @@
+@@ -9010,8 +9010,8 @@ public static final double gtk_paper_siz
}
}
/** @method flags=dynamic */
@@ -21179,7 +21193,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -8999,8 +8999,8 @@
+@@ -9020,8 +9020,8 @@ public static final double gtk_paper_siz
}
}
/** @method flags=dynamic */
@@ -21190,7 +21204,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -9009,8 +9009,8 @@
+@@ -9030,8 +9030,8 @@ public static final boolean gtk_paper_si
}
}
/** @param plug cast=(GtkPlug *) */
@@ -21201,7 +21215,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -9018,8 +9018,8 @@
+@@ -9039,8 +9039,8 @@ public static final int /*long*/ gtk_plu
lock.unlock();
}
}
@@ -21212,7 +21226,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -9028,8 +9028,8 @@
+@@ -9049,8 +9049,8 @@ public static final int /*long*/ gtk_plu
}
}
/** @method flags=dynamic */
@@ -21223,7 +21237,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -9038,8 +9038,8 @@
+@@ -9059,8 +9059,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21234,7 +21248,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -9048,8 +9048,8 @@
+@@ -9069,8 +9069,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21245,7 +21259,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -9063,8 +9063,8 @@
+@@ -9084,8 +9084,8 @@ public static final boolean gtk_printer_
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
@@ -21256,7 +21270,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -9076,8 +9076,8 @@
+@@ -9097,8 +9097,8 @@ public static final void gtk_enumerate_p
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
@@ -21267,7 +21281,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -9086,8 +9086,8 @@
+@@ -9107,8 +9107,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21278,7 +21292,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -9096,8 +9096,8 @@
+@@ -9117,8 +9117,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21289,7 +21303,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -9106,8 +9106,8 @@
+@@ -9127,8 +9127,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21300,7 +21314,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -9116,8 +9116,8 @@
+@@ -9137,8 +9137,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21311,7 +21325,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -9130,8 +9130,8 @@
+@@ -9151,8 +9151,8 @@ public static final int gtk_print_job_ge
* @param filename cast=(const gchar *)
* @param error cast=(GError **)
*/
@@ -21322,7 +21336,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -9143,8 +9143,8 @@
+@@ -9164,8 +9164,8 @@ public static final boolean gtk_print_jo
* @method flags=dynamic
* @param error cast=(GError **)
*/
@@ -21333,7 +21347,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -9157,8 +9157,8 @@
+@@ -9178,8 +9178,8 @@ public static final int /*long*/ gtk_pri
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
@@ -21344,7 +21358,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -9167,8 +9167,8 @@
+@@ -9188,8 +9188,8 @@ public static final void gtk_print_job_s
}
}
/** @method flags=dynamic */
@@ -21355,7 +21369,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -9180,8 +9180,8 @@
+@@ -9201,8 +9201,8 @@ public static final int /*long*/ gtk_pri
* @method flags=dynamic
* @param data cast=(gpointer)
*/
@@ -21366,7 +21380,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -9193,8 +9193,8 @@
+@@ -9214,8 +9214,8 @@ public static final void gtk_print_setti
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
@@ -21377,7 +21391,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -9207,8 +9207,8 @@
+@@ -9228,8 +9228,8 @@ public static final int /*long*/ gtk_pri
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
@@ -21388,7 +21402,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -9217,8 +9217,8 @@
+@@ -9238,8 +9238,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21399,7 +21413,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -9227,8 +9227,8 @@
+@@ -9248,8 +9248,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21410,7 +21424,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -9237,8 +9237,8 @@
+@@ -9258,8 +9258,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21421,7 +21435,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -9247,8 +9247,8 @@
+@@ -9268,8 +9268,8 @@ public static final int gtk_print_settin
}
}
/** @method flags=dynamic */
@@ -21432,7 +21446,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -9257,8 +9257,8 @@
+@@ -9278,8 +9278,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21443,7 +21457,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -9270,8 +9270,8 @@
+@@ -9291,8 +9291,8 @@ public static final boolean gtk_print_se
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
@@ -21454,7 +21468,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -9280,8 +9280,8 @@
+@@ -9301,8 +9301,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21465,7 +21479,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -9293,8 +9293,8 @@
+@@ -9314,8 +9314,8 @@ public static final int gtk_print_settin
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
@@ -21476,7 +21490,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -9303,8 +9303,8 @@
+@@ -9324,8 +9324,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21487,7 +21501,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -9313,8 +9313,8 @@
+@@ -9334,8 +9334,8 @@ public static final int gtk_print_settin
}
}
/** @method flags=dynamic */
@@ -21498,7 +21512,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -9326,8 +9326,8 @@
+@@ -9347,8 +9347,8 @@ public static final void gtk_print_setti
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
@@ -21509,7 +21523,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -9339,8 +9339,8 @@
+@@ -9360,8 +9360,8 @@ public static final int /*long*/ gtk_pri
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
@@ -21520,7 +21534,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -9349,8 +9349,8 @@
+@@ -9370,8 +9370,8 @@ public static final void gtk_print_setti
}
}
/** @method flags=dynamic */
@@ -21531,7 +21545,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -9359,8 +9359,8 @@
+@@ -9380,8 +9380,8 @@ public static final double gtk_print_set
}
}
/** @method flags=dynamic */
@@ -21542,7 +21556,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -9369,8 +9369,8 @@
+@@ -9390,8 +9390,8 @@ public static final double gtk_print_set
}
}
/** @method flags=dynamic */
@@ -21553,7 +21567,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -9383,8 +9383,8 @@
+@@ -9404,8 +9404,8 @@ public static final int gtk_print_settin
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
@@ -21564,7 +21578,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -9393,8 +9393,8 @@
+@@ -9414,8 +9414,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21575,7 +21589,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -9403,8 +9403,8 @@
+@@ -9424,8 +9424,8 @@ public static final void gtk_print_unix_
}
}
/** @method flags=dynamic */
@@ -21586,7 +21600,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -9416,8 +9416,8 @@
+@@ -9437,8 +9437,8 @@ public static final int /*long*/ gtk_pri
* @method flags=dynamic
* @param current_page cast=(gint)
*/
@@ -21597,7 +21611,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -9426,8 +9426,8 @@
+@@ -9447,8 +9447,8 @@ public static final void gtk_print_unix_
}
}
/** @method flags=dynamic */
@@ -21608,7 +21622,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -9436,8 +9436,8 @@
+@@ -9457,8 +9457,8 @@ public static final int gtk_print_unix_d
}
}
/** @method flags=dynamic */
@@ -21619,7 +21633,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -9446,8 +9446,8 @@
+@@ -9467,8 +9467,8 @@ public static final void gtk_print_unix_
}
}
/** @method flags=dynamic */
@@ -21630,7 +21644,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -9456,8 +9456,8 @@
+@@ -9477,8 +9477,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21641,7 +21655,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -9466,8 +9466,8 @@
+@@ -9487,8 +9487,8 @@ public static final int /*long*/ gtk_pri
}
}
/** @method flags=dynamic */
@@ -21652,7 +21666,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -9475,8 +9475,8 @@
+@@ -9496,8 +9496,8 @@ public static final void gtk_print_unix_
lock.unlock();
}
}
@@ -21663,7 +21677,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -9485,8 +9485,8 @@
+@@ -9506,8 +9506,8 @@ public static final int /*long*/ gtk_pro
}
}
/** @param pbar cast=(GtkProgressBar *) */
@@ -21674,7 +21688,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -9498,8 +9498,8 @@
+@@ -9519,8 +9519,8 @@ public static final void gtk_progress_ba
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
@@ -21685,7 +21699,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -9511,8 +9511,8 @@
+@@ -9532,8 +9532,8 @@ public static final void gtk_progress_ba
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
@@ -21696,7 +21710,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -9521,8 +9521,8 @@
+@@ -9542,8 +9542,8 @@ public static final void gtk_progress_ba
}
}
/** @param radio_button cast=(GtkRadioButton *) */
@@ -21707,7 +21721,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -9531,8 +9531,8 @@
+@@ -9552,8 +9552,8 @@ public static final int /*long*/ gtk_rad
}
}
/** @param group cast=(GSList *) */
@@ -21718,7 +21732,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -9541,8 +9541,8 @@
+@@ -9562,8 +9562,8 @@ public static final int /*long*/ gtk_rad
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
@@ -21729,7 +21743,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -9551,8 +9551,8 @@
+@@ -9572,8 +9572,8 @@ public static final int /*long*/ gtk_rad
}
}
/** @param group cast=(GSList *) */
@@ -21740,7 +21754,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -9564,8 +9564,8 @@
+@@ -9585,8 +9585,8 @@ public static final int /*long*/ gtk_rad
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
@@ -21751,7 +21765,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -9574,8 +9574,8 @@
+@@ -9595,8 +9595,8 @@ public static final int /*long*/ gtk_rad
}
}
/** @param range cast=(GtkRange *) */
@@ -21762,7 +21776,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -9584,8 +9584,8 @@
+@@ -9605,8 +9605,8 @@ public static final int /*long*/ gtk_ran
}
}
/** @param range cast=(GtkRange *) */
@@ -21773,7 +21787,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -9594,8 +9594,8 @@
+@@ -9615,8 +9615,8 @@ public static final void gtk_range_set_i
}
}
/** @param range cast=(GtkRange *) */
@@ -21784,7 +21798,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -9604,8 +9604,8 @@
+@@ -9625,8 +9625,8 @@ public static final void gtk_range_set_i
}
}
/** @param range cast=(GtkRange *) */
@@ -21795,7 +21809,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -9614,8 +9614,8 @@
+@@ -9635,8 +9635,8 @@ public static final void gtk_range_set_r
}
}
/** @param range cast=(GtkRange *) */
@@ -21806,7 +21820,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -9634,8 +9634,8 @@
+@@ -9655,8 +9655,8 @@ public static final void gtk_rc_parse_st
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -21817,7 +21831,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -9644,8 +9644,8 @@
+@@ -9665,8 +9665,8 @@ public static final int /*long*/ gtk_rc_
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -21828,7 +21842,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -9657,8 +9657,8 @@
+@@ -9678,8 +9678,8 @@ public static final int gtk_rc_style_get
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -21839,7 +21853,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -9670,8 +9670,8 @@
+@@ -9691,8 +9691,8 @@ public static final void gtk_rc_style_se
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
@@ -21850,7 +21864,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -9680,8 +9680,8 @@
+@@ -9701,8 +9701,8 @@ public static final void gtk_rc_style_se
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -21861,7 +21875,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -9693,8 +9693,8 @@
+@@ -9714,8 +9714,8 @@ public static final void gtk_rc_style_se
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
@@ -21872,7 +21886,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -9706,8 +9706,8 @@
+@@ -9727,8 +9727,8 @@ public static final void gtk_scale_set_d
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
@@ -21883,7 +21897,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -9719,8 +9719,8 @@
+@@ -9740,8 +9740,8 @@ public static final void gtk_scale_set_d
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -21894,7 +21908,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -9732,8 +9732,8 @@
+@@ -9753,8 +9753,8 @@ public static final void gtk_rc_style_se
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -21905,7 +21919,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -9745,8 +9745,8 @@
+@@ -9766,8 +9766,8 @@ public static final void gtk_rc_style_se
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param child cast=(GtkWidget *)
*/
@@ -21916,7 +21930,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -9755,8 +9755,8 @@
+@@ -9776,8 +9776,8 @@ public static final void gtk_scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -21927,7 +21941,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -9769,8 +9769,8 @@
+@@ -9790,8 +9790,8 @@ public static final int /*long*/ gtk_scr
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
@@ -21938,7 +21952,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9779,8 +9779,8 @@
+@@ -9800,8 +9800,8 @@ public static final void gtk_scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -21949,7 +21963,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -9789,8 +9789,8 @@
+@@ -9810,8 +9810,8 @@ public static final int gtk_scrolled_win
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -21960,7 +21974,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -9802,8 +9802,8 @@
+@@ -9823,8 +9823,8 @@ public static final int /*long*/ gtk_scr
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
@@ -21971,7 +21985,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -9815,8 +9815,8 @@
+@@ -9836,8 +9836,8 @@ public static final int /*long*/ gtk_scr
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param placement cast=(GtkCornerType)
*/
@@ -21982,7 +21996,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -9829,8 +9829,8 @@
+@@ -9850,8 +9850,8 @@ public static final void gtk_scrolled_wi
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
@@ -21993,7 +22007,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9842,8 +9842,8 @@
+@@ -9863,8 +9863,8 @@ public static final void gtk_scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
@@ -22004,7 +22018,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -9851,8 +9851,8 @@
+@@ -9872,8 +9872,8 @@ public static final void gtk_scrolled_wi
lock.unlock();
}
}
@@ -22015,7 +22029,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -9861,8 +9861,8 @@
+@@ -9882,8 +9882,8 @@ public static final int /*long*/ gtk_set
}
}
/** @param selection_data cast=(GtkSelectionData *) */
@@ -22026,7 +22040,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -9877,8 +9877,8 @@
+@@ -9898,8 +9898,8 @@ public static final void gtk_selection_d
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
@@ -22037,7 +22051,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -9886,8 +9886,8 @@
+@@ -9907,8 +9907,8 @@ public static final void gtk_selection_d
lock.unlock();
}
}
@@ -22048,7 +22062,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -9895,8 +9895,8 @@
+@@ -9916,8 +9916,8 @@ public static final int /*long*/ gtk_sep
lock.unlock();
}
}
@@ -22059,7 +22073,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_set_locale();
-@@ -9905,8 +9905,8 @@
+@@ -9926,8 +9926,8 @@ public static final int /*long*/ gtk_set
}
}
/** @param socket cast=(GtkSocket *) */
@@ -22070,7 +22084,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -9914,8 +9914,8 @@
+@@ -9935,8 +9935,8 @@ public static final int /*long*/ gtk_soc
lock.unlock();
}
}
@@ -22081,7 +22095,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_socket_new();
-@@ -9924,8 +9924,8 @@
+@@ -9945,8 +9945,8 @@ public static final int /*long*/ gtk_soc
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -22092,7 +22106,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -9937,8 +9937,8 @@
+@@ -9958,8 +9958,8 @@ public static final int /*long*/ gtk_spi
* @param spin_button cast=(GtkSpinButton*)
* @param adjustment cast=(GtkAdjustment *)
**/
@@ -22103,7 +22117,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
-@@ -9947,8 +9947,8 @@
+@@ -9968,8 +9968,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22114,7 +22128,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -9958,8 +9958,8 @@
+@@ -9979,8 +9979,8 @@ public static final int /*long*/ gtk_spi
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22125,7 +22139,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -9968,8 +9968,8 @@
+@@ -9989,8 +9989,8 @@ public static final int gtk_spin_button_
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22136,7 +22150,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -9978,8 +9978,8 @@
+@@ -9999,8 +9999,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22147,7 +22161,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -9988,8 +9988,8 @@
+@@ -10009,8 +10009,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22158,7 +22172,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -9998,8 +9998,8 @@
+@@ -10019,8 +10019,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22169,7 +22183,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -10008,8 +10008,8 @@
+@@ -10029,8 +10029,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22180,7 +22194,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -10018,8 +10018,8 @@
+@@ -10039,8 +10039,8 @@ public static final void gtk_spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -22191,7 +22205,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -10030,8 +10030,8 @@
+@@ -10051,8 +10051,8 @@ public static final void gtk_spin_button
/**
* @method flags=dynamic
*/
@@ -22202,7 +22216,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-@@ -10042,8 +10042,8 @@
+@@ -10063,8 +10063,8 @@ public static final boolean gtk_status_i
/**
* @method flags=dynamic
*/
@@ -22213,7 +22227,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
-@@ -10052,8 +10052,8 @@
+@@ -10073,8 +10073,8 @@ public static final boolean gtk_status_i
}
}
/** @method flags=dynamic */
@@ -22224,7 +22238,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_new();
-@@ -10064,8 +10064,8 @@
+@@ -10085,8 +10085,8 @@ public static final int /*long*/ gtk_sta
/**
* @method flags=dynamic
*/
@@ -22235,7 +22249,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-@@ -10076,8 +10076,8 @@
+@@ -10097,8 +10097,8 @@ public static final void gtk_status_icon
/**
* @method flags=dynamic
*/
@@ -22246,7 +22260,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
-@@ -10088,8 +10088,8 @@
+@@ -10109,8 +10109,8 @@ public static final void gtk_status_icon
/**
* @method flags=dynamic
*/
@@ -22257,7 +22271,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
-@@ -10101,8 +10101,8 @@
+@@ -10122,8 +10122,8 @@ public static final void gtk_status_icon
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22268,7 +22282,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -10114,8 +10114,8 @@
+@@ -10135,8 +10135,8 @@ public static final void gtk_style_get_b
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22279,7 +22293,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -10127,8 +10127,8 @@
+@@ -10148,8 +10148,8 @@ public static final void gtk_style_get_b
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22290,7 +22304,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -10140,8 +10140,8 @@
+@@ -10161,8 +10161,8 @@ public static final void gtk_style_get_b
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22301,7 +22315,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -10153,8 +10153,8 @@
+@@ -10174,8 +10174,8 @@ public static final void gtk_style_get_d
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22312,7 +22326,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -10166,8 +10166,8 @@
+@@ -10187,8 +10187,8 @@ public static final void gtk_style_get_f
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -22323,7 +22337,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -10179,8 +10179,8 @@
+@@ -10200,8 +10200,8 @@ public static final void gtk_style_get_f
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -22334,7 +22348,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -10192,8 +10192,8 @@
+@@ -10213,8 +10213,8 @@ public static final void gtk_style_get_b
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -22345,7 +22359,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -10205,8 +10205,8 @@
+@@ -10226,8 +10226,8 @@ public static final void gtk_style_get_l
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -22356,7 +22370,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -10218,8 +10218,8 @@
+@@ -10239,8 +10239,8 @@ public static final void gtk_style_get_d
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -22367,7 +22381,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -10231,8 +10231,8 @@
+@@ -10252,8 +10252,8 @@ public static final void gtk_style_get_m
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -22378,7 +22392,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -10244,8 +10244,8 @@
+@@ -10265,8 +10265,8 @@ public static final void gtk_style_get_t
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -22389,7 +22403,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -10257,8 +10257,8 @@
+@@ -10278,8 +10278,8 @@ public static final void gtk_style_get_t
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -22400,7 +22414,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -10270,8 +10270,8 @@
+@@ -10291,8 +10291,8 @@ public static final void gtk_style_get_b
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -22411,7 +22425,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -10280,8 +10280,8 @@
+@@ -10301,8 +10301,8 @@ public static final void gtk_style_get_w
}
}
/** @param style cast=(GtkStyle *) */
@@ -22422,7 +22436,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -10293,8 +10293,8 @@
+@@ -10314,8 +10314,8 @@ public static final int /*long*/ gtk_sty
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22433,7 +22447,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -10306,8 +10306,8 @@
+@@ -10327,8 +10327,8 @@ public static final void gtk_style_get_l
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -22444,7 +22458,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -10316,8 +10316,8 @@
+@@ -10337,8 +10337,8 @@ public static final void gtk_style_get_t
}
}
/** @param style cast=(GtkStyle *) */
@@ -22455,7 +22469,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -10326,8 +10326,8 @@
+@@ -10347,8 +10347,8 @@ public static final int gtk_style_get_xt
}
}
/** @param style cast=(GtkStyle *) */
@@ -22466,7 +22480,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -10341,8 +10341,8 @@
+@@ -10362,8 +10362,8 @@ public static final int gtk_style_get_yt
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22477,7 +22491,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -10354,8 +10354,8 @@
+@@ -10375,8 +10375,8 @@ public static final int /*long*/ gtk_sty
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
@@ -22488,7 +22502,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -10364,8 +10364,8 @@
+@@ -10385,8 +10385,8 @@ public static final int /*long*/ gtk_tar
}
}
/** @param list cast=(GtkTargetList *) */
@@ -22499,7 +22513,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -10377,8 +10377,8 @@
+@@ -10398,8 +10398,8 @@ public static final void gtk_target_list
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
@@ -22510,7 +22524,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -10391,8 +10391,8 @@
+@@ -10412,8 +10412,8 @@ public static final void gtk_text_buffer
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
@@ -22521,7 +22535,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -10405,8 +10405,8 @@
+@@ -10426,8 +10426,8 @@ public static final void gtk_text_buffer
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -22532,7 +22546,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -10419,8 +10419,8 @@
+@@ -10440,8 +10440,8 @@ public static final void gtk_text_buffer
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -22543,7 +22557,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -10429,8 +10429,8 @@
+@@ -10450,8 +10450,8 @@ public static final void gtk_text_buffer
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -22554,7 +22568,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -10442,8 +10442,8 @@
+@@ -10463,8 +10463,8 @@ public static final int gtk_text_buffer_
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
@@ -22565,7 +22579,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -10452,8 +10452,8 @@
+@@ -10473,8 +10473,8 @@ public static final void gtk_text_buffer
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -22576,7 +22590,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -10466,8 +10466,8 @@
+@@ -10487,8 +10487,8 @@ public static final int /*long*/ gtk_tex
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
@@ -22587,7 +22601,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -10480,8 +10480,8 @@
+@@ -10501,8 +10501,8 @@ public static final void gtk_text_buffer
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
@@ -22598,7 +22612,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -10494,8 +10494,8 @@
+@@ -10515,8 +10515,8 @@ public static final void gtk_text_buffer
* @param iter cast=(GtkTextIter *)
* @param char_offset cast=(gint)
*/
@@ -22609,7 +22623,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -10504,8 +10504,8 @@
+@@ -10525,8 +10525,8 @@ public static final void gtk_text_buffer
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -22620,7 +22634,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -10514,8 +10514,8 @@
+@@ -10535,8 +10535,8 @@ public static final int gtk_text_buffer_
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -22631,7 +22645,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -10528,8 +10528,8 @@
+@@ -10549,8 +10549,8 @@ public static final int /*long*/ gtk_tex
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -22642,7 +22656,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -10543,8 +10543,8 @@
+@@ -10564,8 +10564,8 @@ public static final boolean gtk_text_buf
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
@@ -22653,7 +22667,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -10558,8 +10558,8 @@
+@@ -10579,8 +10579,8 @@ public static final int /*long*/ gtk_tex
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -22664,7 +22678,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10573,8 +10573,8 @@
+@@ -10594,8 +10594,8 @@ public static final void gtk_text_buffer
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -22675,7 +22689,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10587,8 +10587,8 @@
+@@ -10608,8 +10608,8 @@ public static final void gtk_text_buffer
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
@@ -22686,7 +22700,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -10602,8 +10602,8 @@
+@@ -10623,8 +10623,8 @@ public static final void gtk_text_buffer
* @param override_location cast=(GtkTextIter *)
* @param default_editable cast=(gboolean)
*/
@@ -22697,7 +22711,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -10615,8 +10615,8 @@
+@@ -10636,8 +10636,8 @@ public static final void gtk_text_buffer
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
@@ -22708,7 +22722,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -10629,8 +10629,8 @@
+@@ -10650,8 +10650,8 @@ public static final void gtk_text_buffer
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -22719,7 +22733,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -10666,8 +10666,8 @@
+@@ -10687,8 +10687,8 @@ public static final int gtk_text_iter_ge
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
@@ -22730,7 +22744,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -10676,8 +10676,8 @@
+@@ -10697,8 +10697,8 @@ public static final void gtk_text_view_b
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -22741,7 +22755,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -10686,8 +10686,8 @@
+@@ -10707,8 +10707,8 @@ public static final int /*long*/ gtk_tex
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -22752,7 +22766,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -10701,8 +10701,8 @@
+@@ -10722,8 +10722,8 @@ public static final boolean gtk_text_vie
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -22763,7 +22777,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -10715,8 +10715,8 @@
+@@ -10736,8 +10736,8 @@ public static final void gtk_text_view_g
* @param iter cast=(const GtkTextIter *)
* @param location cast=(GdkRectangle *),flags=no_in
*/
@@ -22774,7 +22788,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -10730,8 +10730,8 @@
+@@ -10751,8 +10751,8 @@ public static final void gtk_text_view_g
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
@@ -22785,7 +22799,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -10743,8 +10743,8 @@
+@@ -10764,8 +10764,8 @@ public static final void gtk_text_view_g
* @param text_view cast=(GtkTextView *)
* @param visible_rect cast=(GdkRectangle *),flags=no_in
*/
@@ -22796,7 +22810,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -10756,8 +10756,8 @@
+@@ -10777,8 +10777,8 @@ public static final void gtk_text_view_g
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
@@ -22807,7 +22821,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -10765,8 +10765,8 @@
+@@ -10786,8 +10786,8 @@ public static final int /*long*/ gtk_tex
lock.unlock();
}
}
@@ -22818,7 +22832,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_new();
-@@ -10778,8 +10778,8 @@
+@@ -10799,8 +10799,8 @@ public static final int /*long*/ gtk_tex
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
@@ -22829,7 +22843,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -10795,8 +10795,8 @@
+@@ -10816,8 +10816,8 @@ public static final void gtk_text_view_s
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
@@ -22840,7 +22854,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -10808,8 +10808,8 @@
+@@ -10829,8 +10829,8 @@ public static final boolean gtk_text_vie
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
@@ -22851,7 +22865,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -10818,8 +10818,8 @@
+@@ -10839,8 +10839,8 @@ public static final void gtk_text_view_s
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -22862,7 +22876,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -10831,8 +10831,8 @@
+@@ -10852,8 +10852,8 @@ public static final void gtk_text_view_s
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -22873,7 +22887,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -10841,8 +10841,8 @@
+@@ -10862,8 +10862,8 @@ public static final void gtk_text_view_s
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -22884,7 +22898,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -10858,8 +10858,8 @@
+@@ -10879,8 +10879,8 @@ public static final void gtk_text_view_s
* @param buffer_x cast=(gint *)
* @param buffer_y cast=(gint *)
*/
@@ -22895,7 +22909,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -10872,8 +10872,8 @@
+@@ -10893,8 +10893,8 @@ public static final void gtk_text_view_w
* @param function cast=(GtkFunction)
* @param data cast=(gpointer)
*/
@@ -22906,7 +22920,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_timeout_add(interval, function, data);
-@@ -10892,8 +10892,8 @@
+@@ -10913,8 +10913,8 @@ public static final void gtk_timeout_rem
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -22917,7 +22931,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -10901,8 +10901,8 @@
+@@ -10922,8 +10922,8 @@ public static final boolean gtk_toggle_b
lock.unlock();
}
}
@@ -22928,7 +22942,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -10911,8 +10911,8 @@
+@@ -10932,8 +10932,8 @@ public static final int /*long*/ gtk_tog
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -22939,7 +22953,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -10924,8 +10924,8 @@
+@@ -10945,8 +10945,8 @@ public static final boolean gtk_toggle_b
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
@@ -22950,7 +22964,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -10937,8 +10937,8 @@
+@@ -10958,8 +10958,8 @@ public static final void gtk_toggle_butt
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
@@ -22961,7 +22975,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -10950,8 +10950,8 @@
+@@ -10971,8 +10971,8 @@ public static final void gtk_toggle_butt
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
@@ -22972,7 +22986,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-@@ -10966,8 +10966,8 @@
+@@ -10987,8 +10987,8 @@ public static final void gtk_toggle_butt
* @param tooltip_private_text cast=(const char *)
* @param position cast=(gint)
*/
@@ -22983,7 +22997,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -10975,8 +10975,8 @@
+@@ -10996,8 +10996,8 @@ public static final void gtk_toolbar_ins
lock.unlock();
}
}
@@ -22994,7 +23008,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -10988,8 +10988,8 @@
+@@ -11009,8 +11009,8 @@ public static final int /*long*/ gtk_too
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
@@ -23005,7 +23019,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -10998,8 +10998,8 @@
+@@ -11019,8 +11019,8 @@ public static final void gtk_toolbar_set
}
}
/** @param widget cast=(GtkWidget *) */
@@ -23016,7 +23030,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -11008,8 +11008,8 @@
+@@ -11029,8 +11029,8 @@ public static final int /*long*/ gtk_too
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -23027,7 +23041,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -11018,8 +11018,8 @@
+@@ -11039,8 +11039,8 @@ public static final void gtk_tooltips_di
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -23038,7 +23052,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -11027,8 +11027,8 @@
+@@ -11048,8 +11048,8 @@ public static final void gtk_tooltips_en
lock.unlock();
}
}
@@ -23049,7 +23063,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -11037,8 +11037,8 @@
+@@ -11058,8 +11058,8 @@ public static final int /*long*/ gtk_too
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -23060,7 +23074,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -11052,8 +11052,8 @@
+@@ -11073,8 +11073,8 @@ public static final void gtk_tooltips_fo
* @param tip_text cast=(const gchar *)
* @param tip_private cast=(const gchar *)
*/
@@ -23071,7 +23085,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -11065,8 +11065,8 @@
+@@ -11086,8 +11086,8 @@ public static final void gtk_tooltips_se
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23082,7 +23096,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11078,8 +11078,8 @@
+@@ -11099,8 +11099,8 @@ public static final void gtk_tree_model_
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23093,7 +23107,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11092,8 +11092,8 @@
+@@ -11113,8 +11113,8 @@ public static final void gtk_tree_model_
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
@@ -23104,7 +23118,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -11105,8 +11105,8 @@
+@@ -11126,8 +11126,8 @@ public static final boolean gtk_tree_mod
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23115,7 +23129,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -11115,8 +11115,8 @@
+@@ -11136,8 +11136,8 @@ public static final boolean gtk_tree_mod
}
}
/** @param tree_model cast=(GtkTreeModel *) */
@@ -23126,7 +23140,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -11128,8 +11128,8 @@
+@@ -11149,8 +11149,8 @@ public static final int gtk_tree_model_g
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23137,7 +23151,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -11137,8 +11137,8 @@
+@@ -11158,8 +11158,8 @@ public static final int /*long*/ gtk_tre
lock.unlock();
}
}
@@ -23148,7 +23162,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -11151,8 +11151,8 @@
+@@ -11172,8 +11172,8 @@ public static final int /*long*/ gtk_tre
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -23159,7 +23173,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -11164,8 +11164,8 @@
+@@ -11185,8 +11185,8 @@ public static final boolean gtk_tree_mod
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23170,7 +23184,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -11177,8 +11177,8 @@
+@@ -11198,8 +11198,8 @@ public static final int gtk_tree_model_i
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23181,7 +23195,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -11191,8 +11191,8 @@
+@@ -11212,8 +11212,8 @@ public static final boolean gtk_tree_mod
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -23192,7 +23206,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -11201,8 +11201,8 @@
+@@ -11222,8 +11222,8 @@ public static final boolean gtk_tree_mod
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23203,7 +23217,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -11214,8 +11214,8 @@
+@@ -11235,8 +11235,8 @@ public static final void gtk_tree_path_a
* @param a cast=(const GtkTreePath *)
* @param b cast=(const GtkTreePath *)
*/
@@ -23214,7 +23228,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -11224,8 +11224,8 @@
+@@ -11245,8 +11245,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23225,7 +23239,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -11234,8 +11234,8 @@
+@@ -11255,8 +11255,8 @@ public static final void gtk_tree_path_d
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23236,7 +23250,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -11244,8 +11244,8 @@
+@@ -11265,8 +11265,8 @@ public static final void gtk_tree_path_f
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23247,7 +23261,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -11254,8 +11254,8 @@
+@@ -11275,8 +11275,8 @@ public static final int gtk_tree_path_ge
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23258,7 +23272,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -11263,8 +11263,8 @@
+@@ -11284,8 +11284,8 @@ public static final int /*long*/ gtk_tre
lock.unlock();
}
}
@@ -23269,7 +23283,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -11272,8 +11272,8 @@
+@@ -11293,8 +11293,8 @@ public static final int /*long*/ gtk_tre
lock.unlock();
}
}
@@ -23280,7 +23294,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -11282,8 +11282,8 @@
+@@ -11303,8 +11303,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param path cast=(const gchar *) */
@@ -23291,7 +23305,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11292,8 +11292,8 @@
+@@ -11313,8 +11313,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param path cast=(const gchar *) */
@@ -23302,7 +23316,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11302,8 +11302,8 @@
+@@ -11323,8 +11323,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23313,7 +23327,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -11312,8 +11312,8 @@
+@@ -11333,8 +11333,8 @@ public static final void gtk_tree_path_n
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23324,7 +23338,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -11322,8 +11322,8 @@
+@@ -11343,8 +11343,8 @@ public static final boolean gtk_tree_pat
}
}
/** @param path cast=(GtkTreePath *) */
@@ -23335,7 +23349,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -11335,8 +11335,8 @@
+@@ -11356,8 +11356,8 @@ public static final boolean gtk_tree_pat
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
@@ -23346,7 +23360,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -11349,8 +11349,8 @@
+@@ -11370,8 +11370,8 @@ public static final int gtk_tree_selecti
* @param model cast=(GtkTreeModel **)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23357,7 +23371,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -11363,8 +11363,8 @@
+@@ -11384,8 +11384,8 @@ public static final boolean gtk_tree_sel
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
@@ -23368,7 +23382,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -11376,8 +11376,8 @@
+@@ -11397,8 +11397,8 @@ public static final int /*long*/ gtk_tre
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
@@ -23379,7 +23393,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -11386,8 +11386,8 @@
+@@ -11407,8 +11407,8 @@ public static final boolean gtk_tree_sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -23390,7 +23404,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -11399,8 +11399,8 @@
+@@ -11420,8 +11420,8 @@ public static final void gtk_tree_select
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23401,7 +23415,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -11413,8 +11413,8 @@
+@@ -11434,8 +11434,8 @@ public static final void gtk_tree_select
* @param func cast=(GtkTreeSelectionForeachFunc)
* @param data cast=(gpointer)
*/
@@ -23412,7 +23426,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -11426,8 +11426,8 @@
+@@ -11447,8 +11447,8 @@ public static final void gtk_tree_select
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
@@ -23423,7 +23437,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -11436,8 +11436,8 @@
+@@ -11457,8 +11457,8 @@ public static final void gtk_tree_select
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -23434,7 +23448,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -11449,8 +11449,8 @@
+@@ -11470,8 +11470,8 @@ public static final void gtk_tree_select
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23445,7 +23459,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -11463,8 +11463,8 @@
+@@ -11484,8 +11484,8 @@ public static final void gtk_tree_select
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -23456,7 +23470,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -11473,8 +11473,8 @@
+@@ -11494,8 +11494,8 @@ public static final void gtk_tree_store_
}
}
/** @param store cast=(GtkTreeStore *) */
@@ -23467,7 +23481,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -11488,8 +11488,8 @@
+@@ -11509,8 +11509,8 @@ public static final void gtk_tree_store_
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -23478,7 +23492,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -11498,8 +11498,8 @@
+@@ -11519,8 +11519,8 @@ public static final void gtk_tree_store_
}
}
/** @param types cast=(GType *) */
@@ -23489,7 +23503,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -11511,8 +11511,8 @@
+@@ -11532,8 +11532,8 @@ public static final int /*long*/ gtk_tre
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23500,7 +23514,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -11524,8 +11524,8 @@
+@@ -11545,8 +11545,8 @@ public static final void gtk_tree_store_
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23511,7 +23525,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11537,8 +11537,8 @@
+@@ -11558,8 +11558,8 @@ public static final void gtk_tree_store_
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23522,7 +23536,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11550,8 +11550,8 @@
+@@ -11571,8 +11571,8 @@ public static final void gtk_tree_store_
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23533,7 +23547,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11564,8 +11564,8 @@
+@@ -11585,8 +11585,8 @@ public static final void gtk_tree_store_
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -23544,7 +23558,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11577,8 +11577,8 @@
+@@ -11598,8 +11598,8 @@ public static final void gtk_tree_store_
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23555,7 +23569,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11590,8 +11590,8 @@
+@@ -11611,8 +11611,8 @@ public static final void gtk_tree_store_
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -23566,7 +23580,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -11603,8 +11603,8 @@
+@@ -11624,8 +11624,8 @@ public static final int /*long*/ gtk_tre
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -23577,7 +23591,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -11618,8 +11618,8 @@
+@@ -11639,8 +11639,8 @@ public static final boolean gtk_tree_vie
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
@@ -23588,7 +23602,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -11634,8 +11634,8 @@
+@@ -11655,8 +11655,8 @@ public static final void gtk_tree_view_c
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
@@ -23599,7 +23613,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -11651,8 +11651,8 @@
+@@ -11672,8 +11672,8 @@ public static final boolean gtk_tree_vie
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -23610,7 +23624,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -11665,8 +11665,8 @@
+@@ -11686,8 +11686,8 @@ public static final void gtk_tree_view_c
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -23621,7 +23635,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -11675,8 +11675,8 @@
+@@ -11696,8 +11696,8 @@ public static final void gtk_tree_view_c
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23632,7 +23646,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -11685,8 +11685,8 @@
+@@ -11706,8 +11706,8 @@ public static final void gtk_tree_view_c
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23643,7 +23657,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -11695,8 +11695,8 @@
+@@ -11716,8 +11716,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -23654,7 +23668,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -11705,8 +11705,8 @@
+@@ -11726,8 +11726,8 @@ public static final int gtk_tree_view_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -23665,7 +23679,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -11715,8 +11715,8 @@
+@@ -11736,8 +11736,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -23676,7 +23690,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -11725,8 +11725,8 @@
+@@ -11746,8 +11746,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23687,7 +23701,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -11735,8 +11735,8 @@
+@@ -11756,8 +11756,8 @@ public static final int gtk_tree_view_co
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23698,7 +23712,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -11745,8 +11745,8 @@
+@@ -11766,8 +11766,8 @@ public static final int gtk_tree_view_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -23709,7 +23723,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -11755,8 +11755,8 @@
+@@ -11776,8 +11776,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23720,7 +23734,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -11765,8 +11765,8 @@
+@@ -11786,8 +11786,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23731,7 +23745,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -11775,8 +11775,8 @@
+@@ -11796,8 +11796,8 @@ public static final int gtk_tree_view_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -23742,7 +23756,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -11784,8 +11784,8 @@
+@@ -11805,8 +11805,8 @@ public static final int gtk_tree_view_co
lock.unlock();
}
}
@@ -23753,7 +23767,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -11798,8 +11798,8 @@
+@@ -11819,8 +11819,8 @@ public static final int /*long*/ gtk_tre
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -23764,7 +23778,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -11812,8 +11812,8 @@
+@@ -11833,8 +11833,8 @@ public static final void gtk_tree_view_c
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -23775,7 +23789,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -11822,8 +11822,8 @@
+@@ -11843,8 +11843,8 @@ public static final void gtk_tree_view_c
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23786,7 +23800,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -11838,8 +11838,8 @@
+@@ -11859,8 +11859,8 @@ public static final void gtk_tree_view_c
* @param func_data cast=(gpointer)
* @param destroy cast=(GtkDestroyNotify)
*/
@@ -23797,7 +23811,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -11851,8 +11851,8 @@
+@@ -11872,8 +11872,8 @@ public static final void gtk_tree_view_c
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
@@ -23808,7 +23822,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -11864,8 +11864,8 @@
+@@ -11885,8 +11885,8 @@ public static final void gtk_tree_view_c
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
@@ -23819,7 +23833,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -11877,8 +11877,8 @@
+@@ -11898,8 +11898,8 @@ public static final void gtk_tree_view_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param min_width cast=(gint)
*/
@@ -23830,7 +23844,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -11890,8 +11890,8 @@
+@@ -11911,8 +11911,8 @@ public static final void gtk_tree_view_c
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
@@ -23841,7 +23855,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -11903,8 +11903,8 @@
+@@ -11924,8 +11924,8 @@ public static final void gtk_tree_view_c
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
@@ -23852,7 +23866,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -11916,8 +11916,8 @@
+@@ -11937,8 +11937,8 @@ public static final void gtk_tree_view_c
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
@@ -23863,7 +23877,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -11929,8 +11929,8 @@
+@@ -11950,8 +11950,8 @@ public static final void gtk_tree_view_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
@@ -23874,7 +23888,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -11942,8 +11942,8 @@
+@@ -11963,8 +11963,8 @@ public static final void gtk_tree_view_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
@@ -23885,7 +23899,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -11955,8 +11955,8 @@
+@@ -11976,8 +11976,8 @@ public static final void gtk_tree_view_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param title cast=(const gchar *)
*/
@@ -23896,7 +23910,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -11965,8 +11965,8 @@
+@@ -11986,8 +11986,8 @@ public static final void gtk_tree_view_c
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -23907,7 +23921,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -11978,8 +11978,8 @@
+@@ -11999,8 +11999,8 @@ public static final void gtk_tree_view_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
@@ -23918,7 +23932,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -11991,8 +11991,8 @@
+@@ -12012,8 +12012,8 @@ public static final void gtk_tree_view_c
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -23929,7 +23943,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -12001,8 +12001,8 @@
+@@ -12022,8 +12022,8 @@ public static final void gtk_tree_view_s
}
}
/** @param view cast=(GtkTreeView *) */
@@ -23940,7 +23954,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -12015,8 +12015,8 @@
+@@ -12036,8 +12036,8 @@ public static final void gtk_tree_view_s
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
@@ -23951,7 +23965,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -12030,8 +12030,8 @@
+@@ -12051,8 +12051,8 @@ public static final boolean gtk_tree_vie
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
@@ -23962,7 +23976,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -12040,8 +12040,8 @@
+@@ -12061,8 +12061,8 @@ public static final void gtk_tree_view_g
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -23973,7 +23987,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -12055,8 +12055,8 @@
+@@ -12076,8 +12076,8 @@ public static final int /*long*/ gtk_tre
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -23984,7 +23998,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -12065,8 +12065,8 @@
+@@ -12086,8 +12086,8 @@ public static final void gtk_tree_view_g
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -23995,7 +24009,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -12078,8 +12078,8 @@
+@@ -12099,8 +12099,8 @@ public static final int /*long*/gtk_tree
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
@@ -24006,7 +24020,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -12088,8 +12088,8 @@
+@@ -12109,8 +12109,8 @@ public static final int /*long*/ gtk_tre
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24017,7 +24031,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -12102,8 +12102,8 @@
+@@ -12123,8 +12123,8 @@ public static final int /*long*/ gtk_tre
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
@@ -24028,7 +24042,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -12112,8 +12112,8 @@
+@@ -12133,8 +12133,8 @@ public static final void gtk_tree_view_g
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24039,7 +24053,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -12130,8 +12130,8 @@
+@@ -12151,8 +12151,8 @@ public static final boolean gtk_tree_vie
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
@@ -24050,7 +24064,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -12140,8 +12140,8 @@
+@@ -12161,8 +12161,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24061,7 +24075,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -12150,8 +12150,8 @@
+@@ -12171,8 +12171,8 @@ public static final boolean gtk_tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24072,7 +24086,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -12163,8 +12163,8 @@
+@@ -12184,8 +12184,8 @@ public static final int /*long*/ gtk_tre
* @param tree_view cast=(GtkTreeView *)
* @param visible_rect flags=no_in
*/
@@ -24083,7 +24097,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -12177,8 +12177,8 @@
+@@ -12198,8 +12198,8 @@ public static final void gtk_tree_view_g
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
@@ -24094,7 +24108,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -12191,8 +12191,8 @@
+@@ -12212,8 +12212,8 @@ public static final int gtk_tree_view_in
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
@@ -24105,7 +24119,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -12201,8 +12201,8 @@
+@@ -12222,8 +12222,8 @@ public static final void gtk_tree_view_m
}
}
/** @param model cast=(GtkTreeModel *) */
@@ -24116,7 +24130,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -12214,8 +12214,8 @@
+@@ -12235,8 +12235,8 @@ public static final int /*long*/ gtk_tre
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
@@ -24127,7 +24141,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -12227,8 +12227,8 @@
+@@ -12248,8 +12248,8 @@ public static final void gtk_tree_view_r
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -24138,7 +24152,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -12244,8 +12244,8 @@
+@@ -12265,8 +12265,8 @@ public static final boolean gtk_tree_vie
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
@@ -24149,7 +24163,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -12258,8 +12258,8 @@
+@@ -12279,8 +12279,8 @@ public static final void gtk_tree_view_s
* @param tree_x cast=(gint)
* @param tree_y cast=(gint)
*/
@@ -24160,7 +24174,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -12272,8 +12272,8 @@
+@@ -12293,8 +12293,8 @@ public static final void gtk_tree_view_s
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
@@ -24171,7 +24185,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -12285,8 +12285,8 @@
+@@ -12306,8 +12306,8 @@ public static final void gtk_tree_view_s
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
@@ -24182,7 +24196,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-@@ -12298,8 +12298,8 @@
+@@ -12319,8 +12319,8 @@ public static final void gtk_tree_view_s
* @param tree_view cast=(GtkTreeView *)
* @param visible cast=(gboolean)
*/
@@ -24193,7 +24207,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -12311,8 +12311,8 @@
+@@ -12332,8 +12332,8 @@ public static final void gtk_tree_view_s
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
@@ -24204,7 +24218,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -12321,8 +12321,8 @@
+@@ -12342,8 +12342,8 @@ public static final void gtk_tree_view_s
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24215,7 +24229,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -12334,8 +12334,8 @@
+@@ -12355,8 +12355,8 @@ public static final void gtk_tree_view_s
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(gint)
*/
@@ -24226,7 +24240,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -12350,8 +12350,8 @@
+@@ -12371,8 +12371,8 @@ public static final void gtk_tree_view_s
* @param wx cast=(gint *)
* @param wy cast=(gint *)
*/
@@ -24237,7 +24251,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_tree_to_widget_coords(tree_view, tx, ty, wx, wy);
-@@ -12360,8 +12360,8 @@
+@@ -12381,8 +12381,8 @@ public static final void gtk_tree_view_t
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24248,7 +24262,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -12370,8 +12370,8 @@
+@@ -12391,8 +12391,8 @@ public static final void gtk_tree_view_u
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -24259,7 +24273,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -12383,8 +12383,8 @@
+@@ -12404,8 +12404,8 @@ public static final void gtk_tree_view_w
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -24270,7 +24284,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -12393,8 +12393,8 @@
+@@ -12414,8 +12414,8 @@ public static final int /*long*/ gtk_vbo
}
}
/** @param viewport cast=(GtkViewport *) */
@@ -24281,7 +24295,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_viewport_get_shadow_type(viewport);
-@@ -12406,8 +12406,8 @@
+@@ -12427,8 +12427,8 @@ public static final int gtk_viewport_get
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
@@ -24292,7 +24306,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
-@@ -12416,8 +12416,8 @@
+@@ -12437,8 +12437,8 @@ public static final void gtk_viewport_se
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -24303,7 +24317,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -12426,8 +12426,8 @@
+@@ -12447,8 +12447,8 @@ public static final int /*long*/ gtk_vsc
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -24314,7 +24328,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -12435,8 +12435,8 @@
+@@ -12456,8 +12456,8 @@ public static final int /*long*/ gtk_vsc
lock.unlock();
}
}
@@ -24325,7 +24339,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -12451,8 +12451,8 @@
+@@ -12472,8 +12472,8 @@ public static final int /*long*/ gtk_vse
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -24336,7 +24350,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -12464,8 +12464,8 @@
+@@ -12485,8 +12485,8 @@ public static final void gtk_widget_add_
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
@@ -24347,7 +24361,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -12474,8 +12474,8 @@
+@@ -12495,8 +12495,8 @@ public static final void gtk_widget_add_
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24358,7 +24372,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -12487,8 +12487,8 @@
+@@ -12508,8 +12508,8 @@ public static final boolean gtk_widget_c
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -24369,7 +24383,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12500,8 +12500,8 @@
+@@ -12521,8 +12521,8 @@ public static final int /*long*/ gtk_wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -24380,7 +24394,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12510,8 +12510,8 @@
+@@ -12531,8 +12531,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24391,7 +24405,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -12523,8 +12523,8 @@
+@@ -12544,8 +12544,8 @@ public static final void gtk_widget_dest
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -24402,7 +24416,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -12533,8 +12533,8 @@
+@@ -12554,8 +12554,8 @@ public static final boolean gtk_widget_e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24413,7 +24427,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -12543,8 +12543,8 @@
+@@ -12564,8 +12564,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24424,7 +24438,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -12561,8 +12561,8 @@
+@@ -12582,8 +12582,8 @@ public static final int gtk_widget_get_d
lock.unlock();
}
}
@@ -24435,7 +24449,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -12571,8 +12571,8 @@
+@@ -12592,8 +12592,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24446,7 +24460,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -12581,8 +12581,8 @@
+@@ -12602,8 +12602,8 @@ public static final int gtk_widget_get_d
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24457,7 +24471,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -12591,8 +12591,8 @@
+@@ -12612,8 +12612,8 @@ public static final int gtk_widget_get_e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24468,7 +24482,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -12601,8 +12601,8 @@
+@@ -12622,8 +12622,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24479,7 +24493,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -12611,8 +12611,8 @@
+@@ -12632,8 +12632,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24490,7 +24504,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -12621,8 +12621,8 @@
+@@ -12642,8 +12642,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24501,7 +24515,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_parent_window(widget);
-@@ -12631,8 +12631,8 @@
+@@ -12652,8 +12652,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24512,7 +24526,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -12645,8 +12645,8 @@
+@@ -12666,8 +12666,8 @@ public static final int /*long*/ gtk_wid
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -24523,7 +24537,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -12655,8 +12655,8 @@
+@@ -12676,8 +12676,8 @@ public static final void gtk_widget_get_
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24534,7 +24548,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -12665,8 +12665,8 @@
+@@ -12686,8 +12686,8 @@ public static final int /*long*/ gtk_wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24545,7 +24559,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -12675,8 +12675,8 @@
+@@ -12696,8 +12696,8 @@ public static final void gtk_widget_grab
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24556,7 +24570,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -12688,8 +12688,8 @@
+@@ -12709,8 +12709,8 @@ public static final void gtk_widget_hide
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
@@ -24567,7 +24581,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -12698,8 +12698,8 @@
+@@ -12719,8 +12719,8 @@ public static final boolean gtk_widget_i
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24578,7 +24592,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -12708,8 +12708,8 @@
+@@ -12729,8 +12729,8 @@ public static final boolean gtk_widget_i
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24589,7 +24603,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -12721,8 +12721,8 @@
+@@ -12742,8 +12742,8 @@ public static final void gtk_widget_map(
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
@@ -24600,7 +24614,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -12735,8 +12735,8 @@
+@@ -12756,8 +12756,8 @@ public static final boolean gtk_widget_m
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -24611,7 +24625,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -12749,8 +12749,8 @@
+@@ -12770,8 +12770,8 @@ public static final void gtk_widget_modi
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -24622,7 +24636,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -12763,8 +12763,8 @@
+@@ -12784,8 +12784,8 @@ public static final void gtk_widget_modi
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -24633,7 +24647,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -12776,8 +12776,8 @@
+@@ -12797,8 +12797,8 @@ public static final void gtk_widget_modi
* @param widget cast=(GtkWidget *)
* @param pango_font_descr cast=(PangoFontDescription *)
*/
@@ -24644,7 +24658,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -12789,8 +12789,8 @@
+@@ -12810,8 +12810,8 @@ public static final void gtk_widget_modi
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
@@ -24655,7 +24669,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -12803,8 +12803,8 @@
+@@ -12824,8 +12824,8 @@ public static final void gtk_widget_modi
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -24666,7 +24680,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -12813,8 +12813,8 @@
+@@ -12834,8 +12834,8 @@ public static final void gtk_widget_modi
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24677,7 +24691,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -12823,8 +12823,8 @@
+@@ -12844,8 +12844,8 @@ public static final void gtk_widget_queu
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24688,7 +24702,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -12838,8 +12838,8 @@
+@@ -12859,8 +12859,8 @@ public static final void gtk_widget_real
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -24699,7 +24713,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -12851,8 +12851,8 @@
+@@ -12872,8 +12872,8 @@ public static final void gtk_widget_remo
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
@@ -24710,7 +24724,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -12864,8 +12864,8 @@
+@@ -12885,8 +12885,8 @@ public static final void gtk_widget_repa
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -24721,7 +24735,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -12874,8 +12874,8 @@
+@@ -12895,8 +12895,8 @@ public static final int gtk_widget_send_
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24732,7 +24746,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -12897,8 +12897,8 @@
+@@ -12918,8 +12918,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
@@ -24743,7 +24757,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -12910,8 +12910,8 @@
+@@ -12931,8 +12931,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
@@ -24754,7 +24768,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -12923,8 +12923,8 @@
+@@ -12944,8 +12944,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
@@ -24765,7 +24779,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -12936,8 +12936,8 @@
+@@ -12957,8 +12957,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
@@ -24776,7 +24790,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -12949,8 +12949,8 @@
+@@ -12970,8 +12970,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
@@ -24787,7 +24801,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -12963,8 +12963,8 @@
+@@ -12984,8 +12984,8 @@ public static final void gtk_widget_set_
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -24798,7 +24812,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -12976,8 +12976,8 @@
+@@ -12997,8 +12997,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
@@ -24809,7 +24823,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -12989,8 +12989,8 @@
+@@ -13010,8 +13010,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkStyle *)
*/
@@ -24820,7 +24834,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -13004,8 +13004,8 @@
+@@ -13025,8 +13025,8 @@ public static final void gtk_widget_set_
* @param offset_x cast=(gint)
* @param offset_y cast=(gint)
*/
@@ -24831,7 +24845,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -13014,8 +13014,8 @@
+@@ -13035,8 +13035,8 @@ public static final void gtk_widget_shap
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24842,7 +24856,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -13024,8 +13024,8 @@
+@@ -13045,8 +13045,8 @@ public static final void gtk_widget_show
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24853,7 +24867,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -13037,8 +13037,8 @@
+@@ -13058,8 +13058,8 @@ public static final void gtk_widget_show
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
@@ -24864,7 +24878,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -13050,8 +13050,8 @@
+@@ -13071,8 +13071,8 @@ public static final void gtk_widget_size
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
@@ -24875,7 +24889,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -13064,8 +13064,8 @@
+@@ -13085,8 +13085,8 @@ public static final void gtk_widget_size
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -24886,7 +24900,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13078,8 +13078,8 @@
+@@ -13099,8 +13099,8 @@ public static final void gtk_widget_styl
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -24897,7 +24911,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13091,8 +13091,8 @@
+@@ -13112,8 +13112,8 @@ public static final void gtk_widget_styl
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
@@ -24908,7 +24922,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -13101,8 +13101,8 @@
+@@ -13122,8 +13122,8 @@ public static final boolean gtk_widget_t
}
}
/** @param widget cast=(GtkWidget *) */
@@ -24919,7 +24933,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -13111,8 +13111,8 @@
+@@ -13132,8 +13132,8 @@ public static final void gtk_widget_unre
}
}
/** @param window cast=(GtkWindow *) */
@@ -24930,7 +24944,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -13124,8 +13124,8 @@
+@@ -13145,8 +13145,8 @@ public static final boolean gtk_window_a
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -24941,7 +24955,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -13134,8 +13134,8 @@
+@@ -13155,8 +13155,8 @@ public static final void gtk_window_add_
}
}
/** @param handle cast=(GtkWindow *) */
@@ -24952,7 +24966,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -13144,8 +13144,8 @@
+@@ -13165,8 +13165,8 @@ public static final void gtk_window_deic
}
}
/** @param window cast=(GtkWindow *) */
@@ -24963,7 +24977,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -13157,8 +13157,8 @@
+@@ -13178,8 +13178,8 @@ public static final int /*long*/ gtk_win
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -24974,7 +24988,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -13167,8 +13167,8 @@
+@@ -13188,8 +13188,8 @@ public static final int /*long*/ gtk_win
}
}
/** @param window cast=(GtkWindow *) */
@@ -24985,7 +24999,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -13177,8 +13177,8 @@
+@@ -13198,8 +13198,8 @@ public static final int /*long*/ gtk_win
}
}
/** @param window cast=(GtkWindow *) */
@@ -24996,7 +25010,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -13187,8 +13187,8 @@
+@@ -13208,8 +13208,8 @@ public static final boolean gtk_window_g
}
}
/** @param window cast=(GtkWindow *) */
@@ -25007,7 +25021,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -13200,8 +13200,8 @@
+@@ -13221,8 +13221,8 @@ public static final int gtk_window_get_m
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -25018,7 +25032,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -13214,8 +13214,8 @@
+@@ -13235,8 +13235,8 @@ public static final double gtk_window_ge
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -25029,7 +25043,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -13228,8 +13228,8 @@
+@@ -13249,8 +13249,8 @@ public static final void gtk_window_get_
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -25040,7 +25054,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -13241,8 +13241,8 @@
+@@ -13262,8 +13262,8 @@ public static final void gtk_window_get_
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -25051,7 +25065,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -13254,8 +13254,8 @@
+@@ -13275,8 +13275,8 @@ public static final void gtk_window_grou
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -25062,7 +25076,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -13263,8 +13263,8 @@
+@@ -13284,8 +13284,8 @@ public static final void gtk_window_grou
lock.unlock();
}
}
@@ -25073,7 +25087,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_group_new();
-@@ -13273,8 +13273,8 @@
+@@ -13294,8 +13294,8 @@ public static final int /*long*/ gtk_win
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25084,7 +25098,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_is_active(handle);
-@@ -13283,8 +13283,8 @@
+@@ -13304,8 +13304,8 @@ public static final boolean gtk_window_i
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25095,7 +25109,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -13292,8 +13292,8 @@
+@@ -13313,8 +13313,8 @@ public static final void gtk_window_icon
lock.unlock();
}
}
@@ -25106,7 +25120,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -13302,8 +13302,8 @@
+@@ -13323,8 +13323,8 @@ public static final int /*long*/ gtk_win
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25117,7 +25131,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -13312,8 +13312,8 @@
+@@ -13333,8 +13333,8 @@ public static final void gtk_window_maxi
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25128,7 +25142,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -13322,8 +13322,8 @@
+@@ -13343,8 +13343,8 @@ public static final void gtk_window_full
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25139,7 +25153,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -13336,8 +13336,8 @@
+@@ -13357,8 +13357,8 @@ public static final void gtk_window_unfu
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -25150,7 +25164,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -13346,8 +13346,8 @@
+@@ -13367,8 +13367,8 @@ public static final void gtk_window_move
}
}
/** @param type cast=(GtkWindowType) */
@@ -25161,7 +25175,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_new(type);
-@@ -13356,8 +13356,8 @@
+@@ -13377,8 +13377,8 @@ public static final int /*long*/ gtk_win
}
}
/** @param window cast=(GtkWindow *) */
@@ -25172,7 +25186,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_present(window);
-@@ -13369,8 +13369,8 @@
+@@ -13390,8 +13390,8 @@ public static final void gtk_window_pres
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -25183,7 +25197,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -13383,8 +13383,8 @@
+@@ -13404,8 +13404,8 @@ public static final void gtk_window_remo
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -25194,7 +25208,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -13396,8 +13396,8 @@
+@@ -13417,8 +13417,8 @@ public static final void gtk_window_resi
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
@@ -25205,7 +25219,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -13409,8 +13409,8 @@
+@@ -13430,8 +13430,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -25216,7 +25230,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -13423,8 +13423,8 @@
+@@ -13444,8 +13444,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -25227,7 +25241,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -13437,8 +13437,8 @@
+@@ -13458,8 +13458,8 @@ public static final void gtk_window_set_
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
@@ -25238,7 +25252,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -13450,8 +13450,8 @@
+@@ -13471,8 +13471,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
@@ -25249,7 +25263,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -13463,8 +13463,8 @@
+@@ -13484,8 +13484,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
@@ -25260,7 +25274,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -13476,8 +13476,8 @@
+@@ -13497,8 +13497,8 @@ public static final void gtk_window_set_
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -25271,7 +25285,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -13490,8 +13490,8 @@
+@@ -13511,8 +13511,8 @@ public static final void gtk_window_set_
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
@@ -25282,7 +25296,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -13503,8 +13503,8 @@
+@@ -13524,8 +13524,8 @@ public static final void gtk_widget_set_
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
@@ -25293,7 +25307,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -13516,8 +13516,8 @@
+@@ -13537,8 +13537,8 @@ public static final void gtk_widget_set_
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
@@ -25304,7 +25318,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -13529,8 +13529,8 @@
+@@ -13550,8 +13550,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
@@ -25315,7 +25329,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -13543,8 +13543,8 @@
+@@ -13564,8 +13564,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
@@ -25326,7 +25340,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -13553,8 +13553,8 @@
+@@ -13574,8 +13574,8 @@ public static final void gtk_window_set_
}
}
/** @param window cast=(GtkWindow *) */
@@ -25337,7 +25351,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -13566,8 +13566,8 @@
+@@ -13587,8 +13587,8 @@ public static final void gtk_window_set_
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
@@ -25348,7 +25362,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -13576,8 +13576,8 @@
+@@ -13597,8 +13597,8 @@ public static final void gtk_window_set_
}
}
/** @param handle cast=(GtkWindow *) */
@@ -25359,7 +25373,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -13590,261 +13590,261 @@
+@@ -13611,261 +13611,261 @@ public static final void gtk_window_unma
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -25671,7 +25685,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -13853,8 +13853,8 @@
+@@ -13874,8 +13874,8 @@ public static final int /*long*/ pango_a
}
}
/** @param desc cast=(const PangoFontDescription *) */
@@ -25682,7 +25696,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -13862,8 +13862,8 @@
+@@ -13883,8 +13883,8 @@ public static final int /*long*/ pango_a
lock.unlock();
}
}
@@ -25693,7 +25707,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -13871,8 +13871,8 @@
+@@ -13892,8 +13892,8 @@ public static final int /*long*/ pango_a
lock.unlock();
}
}
@@ -25704,7 +25718,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -13884,8 +13884,8 @@
+@@ -13905,8 +13905,8 @@ public static final int /*long*/ pango_a
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
@@ -25715,7 +25729,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -13897,8 +13897,8 @@
+@@ -13918,8 +13918,8 @@ public static final int /*long*/ pango_a
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -25726,7 +25740,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -13910,8 +13910,8 @@
+@@ -13931,8 +13931,8 @@ public static final void pango_attr_list
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -25737,7 +25751,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -13920,8 +13920,8 @@
+@@ -13941,8 +13941,8 @@ public static final void pango_attr_list
}
}
/** @param list cast=(PangoAttrList *) */
@@ -25748,7 +25762,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -13930,8 +13930,8 @@
+@@ -13951,8 +13951,8 @@ public static final int /*long*/ pango_a
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -25759,7 +25773,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -13940,8 +13940,8 @@
+@@ -13961,8 +13961,8 @@ public static final boolean pango_attr_i
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -25770,7 +25784,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -13953,8 +13953,8 @@
+@@ -13974,8 +13974,8 @@ public static final void pango_attr_iter
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
@@ -25781,7 +25795,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -13963,8 +13963,8 @@
+@@ -13984,8 +13984,8 @@ public static final int /*long*/ pango_a
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -25792,7 +25806,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -13974,8 +13974,8 @@
+@@ -13995,8 +13995,8 @@ public static final int /*long*/ pango_a
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -25803,7 +25817,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -13983,8 +13983,8 @@
+@@ -14004,8 +14004,8 @@ public static final void pango_attr_iter
lock.unlock();
}
}
@@ -25814,7 +25828,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_list_new();
-@@ -13993,8 +13993,8 @@
+@@ -14014,8 +14014,8 @@ public static final int /*long*/ pango_a
}
}
/** @param list cast=(PangoAttrList *) */
@@ -25825,7 +25839,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -14003,8 +14003,8 @@
+@@ -14024,8 +14024,8 @@ public static final void pango_attr_list
}
}
/** @method flags=dynamic */
@@ -25836,7 +25850,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -14012,8 +14012,8 @@
+@@ -14033,8 +14033,8 @@ public static final int /*long*/ pango_a
lock.unlock();
}
}
@@ -25847,7 +25861,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -14022,8 +14022,8 @@
+@@ -14043,8 +14043,8 @@ public static final int /*long*/ pango_a
}
}
/** @method flags=dynamic */
@@ -25858,7 +25872,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -14031,8 +14031,8 @@
+@@ -14052,8 +14052,8 @@ public static final int /*long*/ pango_a
lock.unlock();
}
}
@@ -25869,7 +25883,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -14040,8 +14040,8 @@
+@@ -14061,8 +14061,8 @@ public static final int /*long*/ pango_a
lock.unlock();
}
}
@@ -25880,7 +25894,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -14050,8 +14050,8 @@
+@@ -14071,8 +14071,8 @@ public static final int /*long*/ pango_a
}
}
/** @method flags=dynamic */
@@ -25891,7 +25905,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -14060,8 +14060,8 @@
+@@ -14081,8 +14081,8 @@ public static final int /*long*/ pango_c
}
}
/** @method flags=dynamic */
@@ -25902,7 +25916,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -14070,8 +14070,8 @@
+@@ -14091,8 +14091,8 @@ public static final int /*long*/ pango_c
}
}
/** @method flags=dynamic */
@@ -25913,7 +25927,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -14080,8 +14080,8 @@
+@@ -14101,8 +14101,8 @@ public static final int /*long*/ pango_c
}
}
/** @method flags=dynamic */
@@ -25924,7 +25938,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -14093,8 +14093,8 @@
+@@ -14114,8 +14114,8 @@ public static final int /*long*/ pango_c
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -25935,7 +25949,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -14106,8 +14106,8 @@
+@@ -14127,8 +14127,8 @@ public static final int /*long*/ pango_c
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -25946,7 +25960,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -14116,8 +14116,8 @@
+@@ -14137,8 +14137,8 @@ public static final void pango_cairo_con
}
}
/** @method flags=dynamic */
@@ -25957,7 +25971,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -14126,8 +14126,8 @@
+@@ -14147,8 +14147,8 @@ public static final void pango_cairo_fon
}
}
/** @method flags=dynamic */
@@ -25968,7 +25982,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -14136,8 +14136,8 @@
+@@ -14157,8 +14157,8 @@ public static final void pango_cairo_lay
}
}
/** @method flags=dynamic */
@@ -25979,7 +25993,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -14146,8 +14146,8 @@
+@@ -14167,8 +14167,8 @@ public static final void pango_cairo_sho
}
}
/** @param context cast=(PangoContext *) */
@@ -25990,7 +26004,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -14156,8 +14156,8 @@
+@@ -14177,8 +14177,8 @@ public static final int pango_context_ge
}
}
/** @param context cast=(PangoContext *) */
@@ -26001,7 +26015,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -14170,8 +14170,8 @@
+@@ -14191,8 +14191,8 @@ public static final int /*long*/ pango_c
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
@@ -26012,7 +26026,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -14184,8 +14184,8 @@
+@@ -14205,8 +14205,8 @@ public static final int /*long*/ pango_c
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
@@ -26023,7 +26037,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -14194,8 +14194,8 @@
+@@ -14215,8 +14215,8 @@ public static final void pango_context_l
}
}
/** @param context cast=(PangoContext *) */
@@ -26034,7 +26048,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -14207,8 +14207,8 @@
+@@ -14228,8 +14228,8 @@ public static final void pango_context_s
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
@@ -26045,7 +26059,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -14217,8 +14217,8 @@
+@@ -14238,8 +14238,8 @@ public static final void pango_context_s
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26056,7 +26070,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -14227,8 +14227,8 @@
+@@ -14248,8 +14248,8 @@ public static final int /*long*/ pango_f
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26067,7 +26081,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -14237,8 +14237,8 @@
+@@ -14258,8 +14258,8 @@ public static final void pango_font_desc
}
}
/** @param str cast=(const char *),flags=no_out critical */
@@ -26078,7 +26092,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -14247,8 +14247,8 @@
+@@ -14268,8 +14268,8 @@ public static final int /*long*/ pango_f
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26089,7 +26103,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -14257,8 +14257,8 @@
+@@ -14278,8 +14278,8 @@ public static final int /*long*/ pango_f
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26100,7 +26114,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -14267,8 +14267,8 @@
+@@ -14288,8 +14288,8 @@ public static final int pango_font_descr
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26111,7 +26125,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_stretch(desc);
-@@ -14277,8 +14277,8 @@
+@@ -14298,8 +14298,8 @@ public static final int pango_font_descr
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26122,7 +26136,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_variant(desc);
-@@ -14287,8 +14287,8 @@
+@@ -14308,8 +14308,8 @@ public static final int pango_font_descr
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26133,7 +26147,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -14297,8 +14297,8 @@
+@@ -14318,8 +14318,8 @@ public static final int pango_font_descr
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26144,7 +26158,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -14306,8 +14306,8 @@
+@@ -14327,8 +14327,8 @@ public static final int pango_font_descr
lock.unlock();
}
}
@@ -26155,7 +26169,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_new();
-@@ -14319,8 +14319,8 @@
+@@ -14340,8 +14340,8 @@ public static final int /*long*/ pango_f
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
@@ -26166,7 +26180,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -14332,8 +14332,8 @@
+@@ -14353,8 +14353,8 @@ public static final void pango_font_desc
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
@@ -26177,7 +26191,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -14345,8 +14345,8 @@
+@@ -14366,8 +14366,8 @@ public static final void pango_font_desc
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
@@ -26188,7 +26202,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -14358,8 +14358,8 @@
+@@ -14379,8 +14379,8 @@ public static final void pango_font_desc
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
@@ -26199,7 +26213,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -14371,8 +14371,8 @@
+@@ -14392,8 +14392,8 @@ public static final void pango_font_desc
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
@@ -26210,7 +26224,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -14381,8 +14381,8 @@
+@@ -14402,8 +14402,8 @@ public static final void pango_font_desc
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -26221,7 +26235,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -14391,8 +14391,8 @@
+@@ -14412,8 +14412,8 @@ public static final int /*long*/ pango_f
}
}
/** @param face cast=(PangoFontFace *) */
@@ -26232,7 +26246,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -14401,8 +14401,8 @@
+@@ -14422,8 +14422,8 @@ public static final int /*long*/ pango_f
}
}
/** @param family cast=(PangoFontFamily *) */
@@ -26243,7 +26257,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -14415,8 +14415,8 @@
+@@ -14436,8 +14436,8 @@ public static final int /*long*/ pango_f
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
@@ -26254,7 +26268,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -14428,8 +14428,8 @@
+@@ -14449,8 +14449,8 @@ public static final void pango_font_fami
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
@@ -26265,7 +26279,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -14438,8 +14438,8 @@
+@@ -14459,8 +14459,8 @@ public static final int /*long*/ pango_f
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -26276,7 +26290,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -14448,8 +14448,8 @@
+@@ -14469,8 +14469,8 @@ public static final int pango_font_metri
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -26287,7 +26301,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -14458,8 +14458,8 @@
+@@ -14479,8 +14479,8 @@ public static final int pango_font_metri
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -26298,7 +26312,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -14468,8 +14468,8 @@
+@@ -14489,8 +14489,8 @@ public static final int pango_font_metri
}
}
/** @method flags=dynamic */
@@ -26309,7 +26323,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -14478,8 +14478,8 @@
+@@ -14499,8 +14499,8 @@ public static final int pango_font_metri
}
}
/** @method flags=dynamic */
@@ -26320,7 +26334,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -14488,8 +14488,8 @@
+@@ -14509,8 +14509,8 @@ public static final int pango_font_metri
}
}
/** @method flags=dynamic */
@@ -26331,7 +26345,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -14498,8 +14498,8 @@
+@@ -14519,8 +14519,8 @@ public static final int pango_font_metri
}
}
/** @method flags=dynamic */
@@ -26342,7 +26356,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -14508,8 +14508,8 @@
+@@ -14529,8 +14529,8 @@ public static final int pango_font_metri
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -26353,7 +26367,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -14518,8 +14518,8 @@
+@@ -14539,8 +14539,8 @@ public static final void pango_font_metr
}
}
/** @param language cast=(const char *),flags=no_out */
@@ -26364,7 +26378,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -14528,8 +14528,8 @@
+@@ -14549,8 +14549,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26375,7 +26389,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -14538,8 +14538,8 @@
+@@ -14559,8 +14559,8 @@ public static final void pango_layout_co
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26386,7 +26400,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -14548,8 +14548,8 @@
+@@ -14569,8 +14569,8 @@ public static final int pango_layout_get
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26397,7 +26411,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -14558,8 +14558,8 @@
+@@ -14579,8 +14579,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26408,7 +26422,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -14568,8 +14568,8 @@
+@@ -14589,8 +14589,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26419,7 +26433,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -14578,8 +14578,8 @@
+@@ -14599,8 +14599,8 @@ public static final int pango_layout_get
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26430,7 +26444,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -14588,8 +14588,8 @@
+@@ -14609,8 +14609,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26441,7 +26455,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -14598,8 +14598,8 @@
+@@ -14619,8 +14619,8 @@ public static final boolean pango_layout
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26452,7 +26466,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -14608,8 +14608,8 @@
+@@ -14629,8 +14629,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26463,7 +26477,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -14622,8 +14622,8 @@
+@@ -14643,8 +14643,8 @@ public static final int pango_layout_get
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
@@ -26474,7 +26488,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -14636,8 +14636,8 @@
+@@ -14657,8 +14657,8 @@ public static final void pango_layout_ge
* @param width cast=(int *)
* @param height cast=(int *)
*/
@@ -26485,7 +26499,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -14646,8 +14646,8 @@
+@@ -14667,8 +14667,8 @@ public static final void pango_layout_ge
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26496,7 +26510,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -14656,8 +14656,8 @@
+@@ -14677,8 +14677,8 @@ public static final int pango_layout_get
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26507,7 +26521,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -14666,8 +14666,8 @@
+@@ -14687,8 +14687,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26518,7 +26532,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -14676,8 +14676,8 @@
+@@ -14697,8 +14697,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26529,7 +26543,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -14689,8 +14689,8 @@
+@@ -14710,8 +14710,8 @@ public static final int pango_layout_get
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
@@ -26540,7 +26554,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -14699,8 +14699,8 @@
+@@ -14720,8 +14720,8 @@ public static final void pango_layout_in
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -26551,7 +26565,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -14713,8 +14713,8 @@
+@@ -14734,8 +14734,8 @@ public static final void pango_layout_it
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
@@ -26562,7 +26576,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -14723,8 +14723,8 @@
+@@ -14744,8 +14744,8 @@ public static final void pango_layout_it
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -26573,7 +26587,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -14733,8 +14733,8 @@
+@@ -14754,8 +14754,8 @@ public static final int pango_layout_ite
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -26584,7 +26598,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -14743,8 +14743,8 @@
+@@ -14764,8 +14764,8 @@ public static final int /*long*/ pango_l
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -26595,7 +26609,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -14753,8 +14753,8 @@
+@@ -14774,8 +14774,8 @@ public static final boolean pango_layout
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -26606,7 +26620,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -14767,8 +14767,8 @@
+@@ -14788,8 +14788,8 @@ public static final boolean pango_layout
* @param ink_rect cast=(PangoRectangle *),flags=no_in
* @param logical_rect cast=(PangoRectangle *),flags=no_in
*/
@@ -26617,7 +26631,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -14781,8 +14781,8 @@
+@@ -14802,8 +14802,8 @@ public static final void pango_layout_li
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
@@ -26628,7 +26642,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -14791,8 +14791,8 @@
+@@ -14812,8 +14812,8 @@ public static final boolean pango_layout
}
}
/** @param context cast=(PangoContext *) */
@@ -26639,7 +26653,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_new(context);
-@@ -14801,8 +14801,8 @@
+@@ -14822,8 +14822,8 @@ public static final int /*long*/ pango_l
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26650,7 +26664,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -14814,8 +14814,8 @@
+@@ -14835,8 +14835,8 @@ public static final void pango_layout_se
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -26661,7 +26675,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -14824,8 +14824,8 @@
+@@ -14845,8 +14845,8 @@ public static final void pango_layout_se
}
}
/** @method flags=dynamic */
@@ -26672,7 +26686,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -14837,8 +14837,8 @@
+@@ -14858,8 +14858,8 @@ public static final void pango_layout_se
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
@@ -26683,7 +26697,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -14847,8 +14847,8 @@
+@@ -14868,8 +14868,8 @@ public static final void pango_layout_se
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26694,7 +26708,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -14857,8 +14857,8 @@
+@@ -14878,8 +14878,8 @@ public static final void pango_layout_se
}
}
/** @param layout cast=(PangoLayout*) */
@@ -26705,7 +26719,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -14870,8 +14870,8 @@
+@@ -14891,8 +14891,8 @@ public static final void pango_layout_se
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
@@ -26716,7 +26730,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -14880,8 +14880,8 @@
+@@ -14901,8 +14901,8 @@ public static final void pango_layout_se
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26727,7 +26741,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -14893,8 +14893,8 @@
+@@ -14914,8 +14914,8 @@ public static final void pango_layout_se
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -26738,7 +26752,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -14907,8 +14907,8 @@
+@@ -14928,8 +14928,8 @@ public static final void pango_layout_se
* @param text cast=(const char *),flags=no_out critical
* @param length cast=(int)
*/
@@ -26749,7 +26763,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -14917,8 +14917,8 @@
+@@ -14938,8 +14938,8 @@ public static final void pango_layout_se
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26760,7 +26774,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -14927,8 +14927,8 @@
+@@ -14948,8 +14948,8 @@ public static final void pango_layout_se
}
}
/** @param layout cast=(PangoLayout *) */
@@ -26771,7 +26785,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -14941,8 +14941,8 @@
+@@ -14962,8 +14962,8 @@ public static final void pango_layout_se
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
@@ -26782,7 +26796,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -14951,8 +14951,8 @@
+@@ -14972,8 +14972,8 @@ public static final boolean pango_layout
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -26793,7 +26807,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -14965,8 +14965,8 @@
+@@ -14986,8 +14986,8 @@ public static final int pango_tab_array_
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
@@ -26804,7 +26818,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -14975,8 +14975,8 @@
+@@ -14996,8 +14996,8 @@ public static final void pango_tab_array
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -26815,7 +26829,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -14988,8 +14988,8 @@
+@@ -15009,8 +15009,8 @@ public static final void pango_tab_array
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
@@ -26826,7 +26840,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -15003,8 +15003,8 @@
+@@ -15024,8 +15024,8 @@ public static final int /*long*/ pango_t
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
@@ -26837,7 +26851,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -15018,8 +15018,8 @@
+@@ -15039,8 +15039,8 @@ public static final void pango_tab_array
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -26848,7 +26862,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-@@ -15033,8 +15033,8 @@
+@@ -15054,8 +15054,8 @@ public static final boolean atk_object_a
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -26859,10 +26873,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _atk_object_remove_relationship(object, relationship, target);
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java
---- x86/org/eclipse/swt/internal/gtk/PangoAttribute.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoAttribute.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoAttribute.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoAttribute.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoAttribute.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class PangoAttribute {
/** @field cast=(const PangoAttrClass *) */
@@ -26871,10 +26885,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclips
public int start_index;
public int end_index;
public static final int sizeof = OS.PangoAttribute_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt/internal/gtk/PangoItem.java
---- x86/org/eclipse/swt/internal/gtk/PangoItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -19,16 +19,16 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoItem.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoItem.java 2011-03-21 11:34:23.345733664 +0000
+@@ -19,16 +19,16 @@ public class PangoItem {
public int length;
public int num_chars;
/** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */
@@ -26896,10 +26910,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt
+ public long /*int*/ analysis_extra_attrs;
public static final int sizeof = OS.PangoItem_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2010-09-09 12:02:46.000000000 +0000
-@@ -16,11 +16,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoLayoutLine.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2011-03-21 11:34:23.345733664 +0000
+@@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutLine {
/** @field cast=(PangoLayout *) */
@@ -26913,10 +26927,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclip
// public boolean is_paragraph_start;
// public byte resolved_dir;
public static final int sizeof = OS.PangoLayoutLine_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2010-09-09 12:02:46.000000000 +0000
-@@ -16,8 +16,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoLayoutRun.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2011-03-21 11:34:23.335733804 +0000
+@@ -16,8 +16,8 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutRun {
/** @field cast=(PangoItem *) */
@@ -26927,10 +26941,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclips
+ public long /*int*/ glyphs;
public static final int sizeof = OS.PangoLayoutRun_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java
---- x86/org/eclipse/swt/internal/gtk/XAnyEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -12,11 +12,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XAnyEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XAnyEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XAnyEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XAnyEvent.java 2011-03-21 11:34:23.345733664 +0000
+@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.gtk;
public abstract class XAnyEvent extends XEvent {
@@ -26945,10 +26959,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt
+ public long /*int*/ window;
public static final int sizeof = OS.XAnyEvent_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
---- x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -13,16 +13,16 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XClientMessageEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2011-03-21 11:34:23.335733804 +0000
+@@ -13,16 +13,16 @@ package org.eclipse.swt.internal.gtk;
public class XClientMessageEvent {
public int type;
@@ -26970,10 +26984,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/e
+ public long /*int*/[] data = new long /*int*/[5];
public static final int sizeof = OS.XClientMessageEvent_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java
---- x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -13,9 +13,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XCrossingEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XCrossingEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2011-03-21 11:34:23.335733804 +0000
+@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.gtk;
public class XCrossingEvent extends XAnyEvent {
/** @field cast=(Window) */
@@ -26985,10 +26999,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclips
/** @field cast=(Time) */
public int time;
public int x;
-diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
---- x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2010-09-09 12:02:46.000000000 +0000
-@@ -13,17 +13,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2011-03-21 11:34:23.335733804 +0000
+@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.gtk;
public class XRenderPictureAttributes {
public boolean repeat;
@@ -27009,10 +27023,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/
public boolean component_alpha;
public static final int sizeof = OS.XRenderPictureAttributes_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java
---- x86/org/eclipse/swt/internal/gtk/XWindowChanges.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java 2010-09-09 12:02:46.000000000 +0000
-@@ -17,7 +17,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XWindowChanges.java swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XWindowChanges.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/gtk/XWindowChanges.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/gtk/XWindowChanges.java 2011-03-21 11:34:23.335733804 +0000
+@@ -17,7 +17,7 @@ public class XWindowChanges {
public int width;
public int height;
public int border_width;
@@ -27021,10 +27035,10 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclips
public int stack_mode;
public static final int sizeof = OS.XWindowChanges_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/internal/Library.java
---- x86/org/eclipse/swt/internal/Library.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/Library.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,7 +40,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Library.java swt-gtk-3.6.2/org/eclipse/swt/internal/Library.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/Library.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/Library.java 2011-03-21 11:34:23.325733931 +0000
+@@ -40,7 +40,7 @@ public class Library {
static final String DELIMITER;
/* 64-bit support */
@@ -27033,10 +27047,10 @@ diff -urN x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/inter
static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$
static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$
-diff -urN x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/LONG.java
---- x86/org/eclipse/swt/internal/LONG.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/LONG.java 2010-09-09 12:02:46.000000000 +0000
-@@ -12,9 +12,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/LONG.java swt-gtk-3.6.2/org/eclipse/swt/internal/LONG.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/LONG.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/LONG.java 2011-03-21 11:34:23.475731816 +0000
+@@ -12,9 +12,9 @@ package org.eclipse.swt.internal;
/** @jniclass flags=no_gen */
public class LONG {
@@ -27048,10 +27062,10 @@ diff -urN x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal
this.value = value;
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
---- x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2010-09-09 12:02:46.000000000 +0000
-@@ -13,10 +13,10 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2011-03-21 11:34:23.445732231 +0000
+@@ -13,10 +13,10 @@ package org.eclipse.swt.internal.mozilla
/** @jniclass flags=cpp */
public class GREVersionRange {
/** @field cast=(const char *) */
@@ -27064,10 +27078,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java x86_64/
public boolean upperInclusive;
public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
---- x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,8 +40,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2011-03-21 11:34:23.445732231 +0000
+@@ -40,8 +40,8 @@ public static final native int GREVersio
* @param properties cast=(const GREProperty *)
* @param buffer cast=(char *)
*/
@@ -27078,10 +27092,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java x86_64/org/ec
lock.lock();
try {
return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
---- x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2010-09-09 12:02:46.000000000 +0000
-@@ -12,7 +12,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2011-03-21 11:34:23.455732087 +0000
+@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.mozilla
public class nsDynamicFunctionLoad {
/** @field cast=(const char *) */
@@ -27091,9 +27105,9 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java x86_64
- public int /*long*/ function;
+ public long /*int*/ function;
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2010-09-09 12:02:46.000000000 +0000
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsEmbedString.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsEmbedString.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2011-03-21 11:34:23.455732087 +0000
@@ -28,7 +28,7 @@
package org.eclipse.swt.internal.mozilla;
@@ -27103,7 +27117,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/ecl
public nsEmbedString() {
handle = XPCOM.nsEmbedString_new();
-@@ -42,14 +42,14 @@
+@@ -42,14 +42,14 @@ public nsEmbedString(String string) {
}
}
@@ -27120,10 +27134,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/ecl
char[] dest = new char[length];
XPCOM.memmove(dest, buffer, length * 2);
return new String(dest);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIAppShell.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIAppShell.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,11 +37,11 @@ public class nsIAppShell extends nsISupp
public static final nsID NS_IAPPSHELL_IID =
new nsID(NS_IAPPSHELL_IID_STR);
@@ -27137,7 +27151,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
}
-@@ -57,15 +57,15 @@
+@@ -57,15 +57,15 @@ public class nsIAppShell extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
}
@@ -27156,10 +27170,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIAuthInformation extends
public static final nsID NS_IAUTHINFORMATION_IID =
new nsID(NS_IAUTHINFORMATION_IID_STR);
@@ -27168,7 +27182,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/or
super(address);
}
-@@ -53,35 +53,35 @@
+@@ -53,35 +53,35 @@ public class nsIAuthInformation extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
}
@@ -27212,10 +27226,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/or
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,11 +37,11 @@ public class nsIBadCertListener2 extends
public static final nsID NS_IBADCERTLISTENER2_IID =
new nsID(NS_IBADCERTLISTENER2_IID_STR);
@@ -27230,10 +27244,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java x86_64/o
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,11 +37,11 @@ public class nsIBaseWindow extends nsISu
public static final nsID NS_IBASEWINDOW_IID =
new nsID(NS_IBASEWINDOW_IID_STR);
@@ -27247,7 +27261,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
}
-@@ -81,19 +81,19 @@
+@@ -81,19 +81,19 @@ public class nsIBaseWindow extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
}
@@ -27271,7 +27285,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
}
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ public class nsIBaseWindow extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
}
@@ -27280,7 +27294,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
}
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ public class nsIBaseWindow extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
}
@@ -27289,10 +27303,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java
---- x86/org/eclipse/swt/internal/mozilla/nsICancelable.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICancelable.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICancelable.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICancelable.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICancelable.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsICancelable extends nsISu
public static final nsID NS_ICANCELABLE_IID =
new nsID(NS_ICANCELABLE_IID_STR);
@@ -27301,10 +27315,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/ecl
super(address);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICategoryManager.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,15 +37,15 @@ public class nsICategoryManager extends
public static final nsID NS_ICATEGORYMANAGER_IID =
new nsID(NS_ICATEGORYMANAGER_IID_STR);
@@ -27323,7 +27337,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/or
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
}
-@@ -57,11 +57,11 @@
+@@ -57,11 +57,11 @@ public class nsICategoryManager extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
}
@@ -27337,10 +27351,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/or
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
---- x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,31 +37,31 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,31 +37,31 @@ public class nsICertificateDialogs exten
public static final nsID NS_ICERTIFICATEDIALOGS_IID =
new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
@@ -27380,10 +27394,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java x86_64
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
---- x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsICertOverrideService exte
public static final nsID NS_ICERTOVERRIDESERVICE_IID =
new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
@@ -27392,7 +27406,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_6
super(address);
}
-@@ -47,27 +47,27 @@
+@@ -47,27 +47,27 @@ public class nsICertOverrideService exte
public static final int ERROR_TIME = 4;
@@ -27427,10 +27441,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_6
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java
---- x86/org/eclipse/swt/internal/mozilla/nsIChannel.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,55 +37,55 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIChannel.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIChannel.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIChannel.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIChannel.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,55 +37,55 @@ public class nsIChannel extends nsIReque
public static final nsID NS_ICHANNEL_IID =
new nsID(NS_ICHANNEL_IID_STR);
@@ -27499,7 +27513,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclips
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);
}
-@@ -97,11 +97,11 @@
+@@ -97,11 +97,11 @@ public class nsIChannel extends nsIReque
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);
}
@@ -27513,10 +27527,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclips
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
---- x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,27 +37,27 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIClassInfo.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,27 +37,27 @@ public class nsIClassInfo extends nsISup
public static final nsID NS_ICLASSINFO_IID =
new nsID(NS_ICLASSINFO_IID_STR);
@@ -27550,7 +27564,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
}
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ public class nsIClassInfo extends nsISup
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
}
@@ -27559,10 +27573,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIComponentManager.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,23 +37,23 @@ public class nsIComponentManager extends
public static final nsID NS_ICOMPONENTMANAGER_IID =
new nsID(NS_ICOMPONENTMANAGER_IID_STR);
@@ -27592,10 +27606,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/o
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,31 +37,31 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,31 +37,31 @@ public class nsIComponentRegistrar exten
public static final nsID NS_ICOMPONENTREGISTRAR_IID =
new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
@@ -27634,7 +27648,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
}
-@@ -73,19 +73,19 @@
+@@ -73,19 +73,19 @@ public class nsIComponentRegistrar exten
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
}
@@ -27658,10 +27672,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,7 +37,7 @@ public class nsIContextMenuListener exte
public static final nsID NS_ICONTEXTMENULISTENER_IID =
new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
@@ -27670,7 +27684,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_6
super(address);
}
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ public class nsIContextMenuListener exte
public static final int CONTEXT_INPUT = 16;
@@ -27680,10 +27694,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_6
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookie.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookie.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookie.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookie.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookie.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,15 +37,15 @@ public class nsICookie extends nsISuppor
public static final nsID NS_ICOOKIE_IID =
new nsID(NS_ICOOKIE_IID_STR);
@@ -27702,7 +27716,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
}
-@@ -53,11 +53,11 @@
+@@ -53,11 +53,11 @@ public class nsICookie extends nsISuppor
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
}
@@ -27716,7 +27730,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
}
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ public class nsICookie extends nsISuppor
public static final int STATUS_REJECTED = 4;
@@ -27725,7 +27739,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
}
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ public class nsICookie extends nsISuppor
public static final int POLICY_NO_II = 5;
@@ -27734,10 +27748,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieManager.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieManager.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,7 +37,7 @@ public class nsICookieManager extends ns
public static final nsID NS_ICOOKIEMANAGER_IID =
new nsID(NS_ICOOKIEMANAGER_IID_STR);
@@ -27746,7 +27760,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/
super(address);
}
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ public class nsICookieManager extends ns
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
}
@@ -27760,10 +27774,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,23 +37,23 @@ public class nsICookieService_1_9 exten
public static final nsID NS_ICOOKIESERVICE_IID =
new nsID(NS_ICOOKIESERVICE_IID_STR);
@@ -27792,10 +27806,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java x86_64/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsICookieService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsICookieService.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,23 +37,23 @@ public class nsICookieService extends ns
public static final nsID NS_ICOOKIESERVICE_IID =
new nsID(NS_ICOOKIESERVICE_IID_STR);
@@ -27824,10 +27838,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDataType.java x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDataType.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDataType.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDataType.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDataType.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDataType.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,7 +37,7 @@ public class nsIDataType extends nsISupp
public static final nsID NS_IDATATYPE_IID =
new nsID(NS_IDATATYPE_IID_STR);
@@ -27836,10 +27850,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDataType.java x86_64/org/eclip
super(address);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIDirectoryService extends
public static final nsID NS_IDIRECTORYSERVICE_IID =
new nsID(NS_IDIRECTORYSERVICE_IID_STR);
@@ -27848,7 +27862,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/o
super(address);
}
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ public class nsIDirectoryService extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
}
@@ -27862,10 +27876,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/o
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider
public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
@@ -27880,10 +27894,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider
public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
@@ -27897,10 +27911,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/internal/mozilla/nsID.java
---- x86/org/eclipse/swt/internal/mozilla/nsID.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsID.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,9 +44,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsID.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsID.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsID.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsID.java 2011-03-21 11:34:23.435732379 +0000
+@@ -44,9 +44,9 @@ public nsID(String id) {
}
public boolean Equals(nsID other) {
@@ -27912,10 +27926,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/
XPCOM.memmove (otherPtr, other, nsID.sizeof);
boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
XPCOM.nsID_delete (ptr);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,15 +37,15 @@ public class nsIDocShell_1_8 extends nsI
public static final nsID NS_IDOCSHELL_IID =
new nsID(NS_IDOCSHELL_IID_STR);
@@ -27934,7 +27948,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
}
-@@ -55,11 +55,11 @@
+@@ -55,11 +55,11 @@ public class nsIDocShell_1_8 extends nsI
public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
@@ -27948,7 +27962,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
}
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ public class nsIDocShell_1_8 extends nsI
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
}
@@ -27957,7 +27971,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
}
-@@ -75,35 +75,35 @@
+@@ -75,35 +75,35 @@ public class nsIDocShell_1_8 extends nsI
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
}
@@ -28001,7 +28015,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
}
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ public class nsIDocShell_1_8 extends nsI
public static final int ENUMERATE_BACKWARDS = 1;
@@ -28010,7 +28024,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
}
-@@ -255,11 +255,11 @@
+@@ -255,11 +255,11 @@ public class nsIDocShell_1_8 extends nsI
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
}
@@ -28024,7 +28038,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
}
-@@ -267,11 +267,11 @@
+@@ -267,11 +267,11 @@ public class nsIDocShell_1_8 extends nsI
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
}
@@ -28038,7 +28052,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
}
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ public class nsIDocShell_1_8 extends nsI
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
}
@@ -28047,10 +28061,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDocShell.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDocShell.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,23 +37,23 @@ public class nsIDocShell extends nsISupp
public static final nsID NS_IDOCSHELL_IID =
new nsID(NS_IDOCSHELL_IID_STR);
@@ -28079,7 +28093,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
}
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ public class nsIDocShell extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
}
@@ -28088,7 +28102,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
}
-@@ -69,43 +69,43 @@
+@@ -69,43 +69,43 @@ public class nsIDocShell extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
}
@@ -28142,7 +28156,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
}
-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ public class nsIDocShell extends nsISupp
public static final int ENUMERATE_BACKWARDS = 1;
@@ -28151,7 +28165,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
}
-@@ -255,11 +255,11 @@
+@@ -255,11 +255,11 @@ public class nsIDocShell extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
}
@@ -28165,10 +28179,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,7 +37,7 @@ public class nsIDOMEvent extends nsISupp
public static final nsID NS_IDOMEVENT_IID =
new nsID(NS_IDOMEVENT_IID_STR);
@@ -28177,7 +28191,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclip
super(address);
}
-@@ -47,15 +47,15 @@
+@@ -47,15 +47,15 @@ public class nsIDOMEvent extends nsISupp
public static final int BUBBLING_PHASE = 3;
@@ -28196,7 +28210,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
}
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ public class nsIDOMEvent extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
}
@@ -28205,7 +28219,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
}
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ public class nsIDOMEvent extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
}
@@ -28214,10 +28228,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,19 +37,19 @@ public class nsIDOMEventTarget extends n
public static final nsID NS_IDOMEVENTTARGET_IID =
new nsID(NS_IDOMEVENTTARGET_IID_STR);
@@ -28241,10 +28255,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIDOMKeyEvent extends nsID
public static final nsID NS_IDOMKEYEVENT_IID =
new nsID(NS_IDOMKEYEVENT_IID_STR);
@@ -28253,7 +28267,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/ec
super(address);
}
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ public class nsIDOMKeyEvent extends nsID
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
}
@@ -28262,10 +28276,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/ec
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIDOMMouseEvent extends ns
public static final nsID NS_IDOMMOUSEEVENT_IID =
new nsID(NS_IDOMMOUSEEVENT_IID_STR);
@@ -28274,7 +28288,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/
super(address);
}
-@@ -77,11 +77,11 @@
+@@ -77,11 +77,11 @@ public class nsIDOMMouseEvent extends ns
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
}
@@ -28288,10 +28302,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,15 +37,15 @@ public class nsIDOMSerializer_1_7 extend
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
@@ -28310,10 +28324,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,15 +37,15 @@ public class nsIDOMSerializer extends ns
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
@@ -28332,10 +28346,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,11 +37,11 @@ public class nsIDOMUIEvent extends nsIDO
public static final nsID NS_IDOMUIEVENT_IID =
new nsID(NS_IDOMUIEVENT_IID_STR);
@@ -28349,7 +28363,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/ecl
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
}
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ public class nsIDOMUIEvent extends nsIDO
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
}
@@ -28358,10 +28372,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/ecl
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIDOMWindowCollection exte
public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
@@ -28370,7 +28384,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_6
super(address);
}
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ public class nsIDOMWindowCollection exte
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
}
@@ -28384,10 +28398,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_6
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,35 +37,35 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,35 +37,35 @@ public class nsIDOMWindow extends nsISup
public static final nsID NS_IDOMWINDOW_IID =
new nsID(NS_IDOMWINDOW_IID_STR);
@@ -28431,7 +28445,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName);
}
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ public class nsIDOMWindow extends nsISup
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);
}
@@ -28440,10 +28454,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,11 +37,11 @@ public class nsIDownload_1_8 extends nsI
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
@@ -28457,7 +28471,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);
}
-@@ -49,27 +49,27 @@
+@@ -49,27 +49,27 @@ public class nsIDownload_1_8 extends nsI
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);
}
@@ -28491,7 +28505,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);
}
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ public class nsIDownload_1_8 extends nsI
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);
}
@@ -28500,10 +28514,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/e
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDownload.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDownload.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIDownload.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIDownload.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,23 +37,23 @@ public class nsIDownload extends nsISupp
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
@@ -28532,7 +28546,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
}
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ public class nsIDownload extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
}
@@ -28541,7 +28555,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
}
-@@ -73,23 +73,23 @@
+@@ -73,23 +73,23 @@ public class nsIDownload extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
}
@@ -28571,10 +28585,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclip
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,7 +37,7 @@ public class nsIEmbeddingSiteWindow exte
public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
@@ -28583,7 +28597,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_6
super(address);
}
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ public class nsIEmbeddingSiteWindow exte
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
}
@@ -28592,7 +28606,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_6
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
}
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ public class nsIEmbeddingSiteWindow exte
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
}
@@ -28601,10 +28615,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_6
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFactory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFactory.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFactory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFactory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFactory.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,11 +37,11 @@ public class nsIFactory extends nsISuppo
public static final nsID NS_IFACTORY_IID =
new nsID(NS_IFACTORY_IID_STR);
@@ -28618,10 +28632,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFile.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFile.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFile.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFile.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFile.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,7 +37,7 @@ public class nsIFile extends nsISupports
public static final nsID NS_IFILE_IID =
new nsID(NS_IFILE_IID_STR);
@@ -28630,7 +28644,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/s
super(address);
}
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ public class nsIFile extends nsISupports
public static final int DIRECTORY_TYPE = 1;
@@ -28644,7 +28658,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/s
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
}
-@@ -61,43 +61,43 @@
+@@ -61,43 +61,43 @@ public class nsIFile extends nsISupports
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
}
@@ -28698,7 +28712,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/s
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
}
-@@ -149,19 +149,19 @@
+@@ -149,19 +149,19 @@ public class nsIFile extends nsISupports
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
}
@@ -28722,7 +28736,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/s
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
}
-@@ -205,23 +205,23 @@
+@@ -205,23 +205,23 @@ public class nsIFile extends nsISupports
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
}
@@ -28751,10 +28765,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/s
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIFilePicker_1_8 extends n
public static final nsID NS_IFILEPICKER_IID =
new nsID(NS_IFILEPICKER_IID_STR);
@@ -28763,7 +28777,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org
super(address);
}
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ public class nsIFilePicker_1_8 extends n
public static final int filterXUL = 32;
public static final int filterApps = 64;
@@ -28772,7 +28786,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
}
-@@ -64,23 +64,23 @@
+@@ -64,23 +64,23 @@ public class nsIFilePicker_1_8 extends n
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
}
@@ -28801,7 +28815,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
}
-@@ -92,27 +92,27 @@
+@@ -92,27 +92,27 @@ public class nsIFilePicker_1_8 extends n
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
}
@@ -28835,10 +28849,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIFilePicker extends nsISu
public static final nsID NS_IFILEPICKER_IID =
new nsID(NS_IFILEPICKER_IID_STR);
@@ -28847,7 +28861,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecl
super(address);
}
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ public class nsIFilePicker extends nsISu
public static final int filterXUL = 32;
public static final int filterApps = 64;
@@ -28856,7 +28870,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
}
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ public class nsIFilePicker extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
}
@@ -28865,7 +28879,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
}
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ public class nsIFilePicker extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
}
@@ -28874,7 +28888,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
}
-@@ -92,27 +92,27 @@
+@@ -92,27 +92,27 @@ public class nsIFilePicker extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
}
@@ -28908,10 +28922,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,31 +37,31 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_8 ex
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
@@ -28950,7 +28964,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
}
-@@ -69,11 +69,11 @@
+@@ -69,11 +69,11 @@ public class nsIHelperAppLauncher_1_8 ex
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
}
@@ -28964,10 +28978,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,31 +37,31 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_9 ex
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
@@ -29006,7 +29020,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
}
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_1_9 ex
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
}
@@ -29015,7 +29029,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
}
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ public class nsIHelperAppLauncher_1_9 ex
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
}
@@ -29024,10 +29038,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2011-03-21 11:34:23.475731816 +0000
+@@ -37,7 +37,7 @@ public class nsIHelperAppLauncherDialog_
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
@@ -29036,7 +29050,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.ja
super(address);
}
-@@ -47,11 +47,11 @@
+@@ -47,11 +47,11 @@ public class nsIHelperAppLauncherDialog_
public static final int REASON_TYPESNIFFED = 2;
@@ -29051,10 +29065,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.ja
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,19 +37,19 @@ public class nsIHelperAppLauncherDialog
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
@@ -29079,10 +29093,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,27 +37,27 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,27 +37,27 @@ public class nsIHelperAppLauncher extend
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
@@ -29116,7 +29130,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
}
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ public class nsIHelperAppLauncher extend
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
}
@@ -29125,7 +29139,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
}
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ public class nsIHelperAppLauncher extend
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
}
@@ -29134,10 +29148,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIInputStream.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIInputStream.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,7 +37,7 @@ public class nsIInputStream extends nsIS
public static final nsID NS_IINPUTSTREAM_IID =
new nsID(NS_IINPUTSTREAM_IID_STR);
@@ -29146,7 +29160,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/ec
super(address);
}
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ public class nsIInputStream extends nsIS
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
}
@@ -29155,10 +29169,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/ec
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,11 +37,11 @@ public class nsIInterfaceRequestor exten
public static final nsID NS_IINTERFACEREQUESTOR_IID =
new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
@@ -29173,10 +29187,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIIOService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIIOService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIIOService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIIOService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIIOService.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,11 +37,11 @@ public class nsIIOService extends nsISup
public static final nsID NS_IIOSERVICE_IID =
new nsID(NS_IIOSERVICE_IID_STR);
@@ -29190,7 +29204,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
}
-@@ -49,19 +49,19 @@
+@@ -49,19 +49,19 @@ public class nsIIOService extends nsISup
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
}
@@ -29214,7 +29228,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
}
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ public class nsIIOService extends nsISup
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
}
@@ -29223,10 +29237,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
---- x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIJSContextStack extends n
public static final nsID NS_IJSCONTEXTSTACK_IID =
new nsID(NS_IJSCONTEXTSTACK_IID_STR);
@@ -29235,7 +29249,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org
super(address);
}
-@@ -45,15 +45,15 @@
+@@ -45,15 +45,15 @@ public class nsIJSContextStack extends n
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
}
@@ -29254,10 +29268,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsILocalFile.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsILocalFile.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,19 +37,19 @@ public class nsILocalFile extends nsIFil
public static final nsID NS_ILOCALFILE_IID =
new nsID(NS_ILOCALFILE_IID_STR);
@@ -29281,7 +29295,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/ecli
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
}
-@@ -61,15 +61,15 @@
+@@ -61,15 +61,15 @@ public class nsILocalFile extends nsIFil
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
}
@@ -29300,7 +29314,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/ecli
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
}
-@@ -77,19 +77,19 @@
+@@ -77,19 +77,19 @@ public class nsILocalFile extends nsIFil
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
}
@@ -29324,7 +29338,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/ecli
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
}
-@@ -101,11 +101,11 @@
+@@ -101,11 +101,11 @@ public class nsILocalFile extends nsIFil
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
}
@@ -29338,10 +29352,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/ecli
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIMemory.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIMemory.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIMemory.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIMemory.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIMemory.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,19 +37,19 @@ public class nsIMemory extends nsISuppor
public static final nsID NS_IMEMORY_IID =
new nsID(NS_IMEMORY_IID_STR);
@@ -29365,10 +29379,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,7 +37,7 @@ public class nsIMIMEInputStream extends
public static final nsID NS_IMIMEINPUTSTREAM_IID =
new nsID(NS_IMIMEINPUTSTREAM_IID_STR);
@@ -29377,7 +29391,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java x86_64/or
super(address);
}
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ public class nsIMIMEInputStream extends
return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 3, getAddress(), name, value);
}
@@ -29387,10 +29401,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java x86_64/or
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIObserverService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIObserverService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,23 +37,23 @@ public class nsIObserverService extends
public static final nsID NS_IOBSERVERSERVICE_IID =
new nsID(NS_IOBSERVERSERVICE_IID_STR);
@@ -29419,10 +29433,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/or
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,7 +37,7 @@ public class nsIPrefBranch extends nsISu
public static final nsID NS_IPREFBRANCH_IID =
new nsID(NS_IPREFBRANCH_IID_STR);
@@ -29431,7 +29445,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/ecl
super(address);
}
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ public class nsIPrefBranch extends nsISu
public static final int PREF_BOOL = 128;
@@ -29440,7 +29454,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
}
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ public class nsIPrefBranch extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
}
@@ -29449,7 +29463,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
}
-@@ -81,11 +81,11 @@
+@@ -81,11 +81,11 @@ public class nsIPrefBranch extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
}
@@ -29463,7 +29477,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
}
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ public class nsIPrefBranch extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
}
@@ -29472,10 +29486,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,11 +37,11 @@ public class nsIPrefLocalizedString exte
public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
@@ -29489,7 +29503,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_6
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);
}
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ public class nsIPrefLocalizedString exte
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);
}
@@ -29498,10 +29512,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_6
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrefService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,11 +37,11 @@ public class nsIPrefService extends nsIS
public static final nsID NS_IPREFSERVICE_IID =
new nsID(NS_IPREFSERVICE_IID_STR);
@@ -29515,7 +29529,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/ec
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
}
-@@ -53,15 +53,15 @@
+@@ -53,15 +53,15 @@ public class nsIPrefService extends nsIS
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
}
@@ -29534,10 +29548,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/ec
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrincipal.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2011-03-21 11:34:23.475731816 +0000
+@@ -37,7 +37,7 @@ public class nsIPrincipal extends nsISe
public static final nsID NS_IPRINCIPAL_IID =
new nsID(NS_IPRINCIPAL_IID_STR);
@@ -29546,7 +29560,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/ecli
super(address);
}
-@@ -49,11 +49,11 @@
+@@ -49,11 +49,11 @@ public class nsIPrincipal extends nsISe
public static final int ENABLE_GRANTED = 4;
@@ -29560,7 +29574,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/ecli
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
}
-@@ -61,19 +61,19 @@
+@@ -61,19 +61,19 @@ public class nsIPrincipal extends nsISe
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
}
@@ -29584,7 +29598,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/ecli
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
}
-@@ -81,35 +81,35 @@
+@@ -81,35 +81,35 @@ public class nsIPrincipal extends nsISe
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
}
@@ -29628,7 +29642,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/ecli
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
}
-@@ -117,27 +117,27 @@
+@@ -117,27 +117,27 @@ public class nsIPrincipal extends nsISe
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
}
@@ -29663,10 +29677,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/ecli
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,11 +37,11 @@ public class nsIProgressDialog_1_8 exten
public static final nsID NS_IPROGRESSDIALOG_IID =
new nsID(NS_IPROGRESSDIALOG_IID_STR);
@@ -29680,7 +29694,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
}
-@@ -53,19 +53,19 @@
+@@ -53,19 +53,19 @@ public class nsIProgressDialog_1_8 exten
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
}
@@ -29704,10 +29718,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,11 +37,11 @@ public class nsIProgressDialog extends n
public static final nsID NS_IPROGRESSDIALOG_IID =
new nsID(NS_IPROGRESSDIALOG_IID_STR);
@@ -29721,7 +29735,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
}
-@@ -53,11 +53,11 @@
+@@ -53,11 +53,11 @@ public class nsIProgressDialog extends n
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
}
@@ -29735,10 +29749,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPromptService2.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,15 +37,15 @@ public class nsIPromptService2 extends n
public static final nsID NS_IPROMPTSERVICE2_IID =
new nsID(NS_IPROMPTSERVICE2_IID_STR);
@@ -29757,10 +29771,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org
return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPromptService.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIPromptService.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,23 +37,23 @@ public class nsIPromptService extends ns
public static final nsID NS_IPROMPTSERVICE_IID =
new nsID(NS_IPROMPTSERVICE_IID_STR);
@@ -29789,7 +29803,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
}
-@@ -91,23 +91,23 @@
+@@ -91,23 +91,23 @@ public class nsIPromptService extends ns
public static final int STD_YES_NO_BUTTONS = 1027;
@@ -29818,10 +29832,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProperties.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProperties.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProperties.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIProperties.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIProperties.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,15 +37,15 @@ public class nsIProperties extends nsISu
public static final nsID NS_IPROPERTIES_IID =
new nsID(NS_IPROPERTIES_IID_STR);
@@ -29840,7 +29854,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
}
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ public class nsIProperties extends nsISu
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
}
@@ -29849,10 +29863,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java
---- x86/org/eclipse/swt/internal/mozilla/nsIRequest.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIRequest.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIRequest.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIRequest.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIRequest.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,11 +37,11 @@ public class nsIRequest extends nsISuppo
public static final nsID NS_IREQUEST_IID =
new nsID(NS_IREQUEST_IID_STR);
@@ -29866,7 +29880,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
}
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ public class nsIRequest extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
@@ -29875,7 +29889,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
}
-@@ -65,15 +65,15 @@
+@@ -65,15 +65,15 @@ public class nsIRequest extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
}
@@ -29894,10 +29908,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
---- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,19 +37,19 @@ public class nsIScriptSecurityManager_1_
public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
@@ -29921,7 +29935,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.ja
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
}
-@@ -65,47 +65,47 @@
+@@ -65,47 +65,47 @@ public class nsIScriptSecurityManager_1_
public static final int DISALLOW_SCRIPT = 8;
@@ -29980,7 +29994,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.ja
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
// }
-@@ -125,11 +125,11 @@
+@@ -125,11 +125,11 @@ public class nsIScriptSecurityManager_1_
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
}
@@ -29994,7 +30008,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.ja
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
// }
-@@ -137,23 +137,23 @@
+@@ -137,23 +137,23 @@ public class nsIScriptSecurityManager_1_
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
// }
@@ -30024,10 +30038,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.ja
// }
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,19 +37,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,19 +37,19 @@ public class nsIScriptSecurityManager_1
public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
@@ -30051,7 +30065,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
}
-@@ -65,47 +65,47 @@
+@@ -65,47 +65,47 @@ public class nsIScriptSecurityManager_1
public static final int DISALLOW_SCRIPT = 8;
@@ -30110,7 +30124,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
// }
-@@ -125,11 +125,11 @@
+@@ -125,11 +125,11 @@ public class nsIScriptSecurityManager_1
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
}
@@ -30124,7 +30138,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
}
-@@ -137,23 +137,23 @@
+@@ -137,23 +137,23 @@ public class nsIScriptSecurityManager_1
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
}
@@ -30154,10 +30168,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
---- x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,23 +37,23 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,23 +37,23 @@ public class nsISecurityCheckedComponent
public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
@@ -30186,10 +30200,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISerializable.java x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java
---- x86/org/eclipse/swt/internal/mozilla/nsISerializable.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISerializable.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISerializable.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISerializable.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISerializable.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,15 +37,15 @@ public class nsISerializable extends ns
public static final nsID NS_ISERIALIZABLE_IID =
new nsID(NS_ISERIALIZABLE_IID_STR);
@@ -30209,10 +30223,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISerializable.java x86_64/org/e
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIServiceManager.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,15 +37,15 @@ public class nsIServiceManager extends n
public static final nsID NS_ISERVICEMANAGER_IID =
new nsID(NS_ISERVICEMANAGER_IID_STR);
@@ -30231,10 +30245,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
---- x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsISimpleEnumerator extends
public static final nsID NS_ISIMPLEENUMERATOR_IID =
new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
@@ -30243,7 +30257,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/o
super(address);
}
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ public class nsISimpleEnumerator extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
}
@@ -30252,10 +30266,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/o
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
---- x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISSLStatus.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,15 +37,15 @@ public class nsISSLStatus extends nsISup
public static final nsID NS_ISSLSTATUS_IID =
new nsID(NS_ISSLSTATUS_IID_STR);
@@ -30274,10 +30288,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupports.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,17 +44,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISupports.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISupports.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISupports.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISupports.java 2011-03-21 11:34:23.445732231 +0000
+@@ -44,17 +44,17 @@ public class nsISupports {
public static final nsID NS_ISUPPORTS_IID =
new nsID(NS_ISUPPORTS_IID_STR);
@@ -30299,10 +30313,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclip
return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,11 +37,11 @@ public class nsISupportsWeakReference ex
public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
@@ -30317,10 +30331,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsITooltipListener.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,7 +37,7 @@ public class nsITooltipListener extends
public static final nsID NS_ITOOLTIPLISTENER_IID =
new nsID(NS_ITOOLTIPLISTENER_IID_STR);
@@ -30329,10 +30343,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/or
super(address);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java
---- x86/org/eclipse/swt/internal/mozilla/nsITransfer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsITransfer.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsITransfer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsITransfer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsITransfer.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,11 +37,11 @@ public class nsITransfer extends nsIWebP
public static final nsID NS_ITRANSFER_IID =
new nsID(NS_ITRANSFER_IID_STR);
@@ -30346,10 +30360,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclip
return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,39 +37,39 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,39 +37,39 @@ public class nsIURIContentListener exten
public static final nsID NS_IURICONTENTLISTENER_IID =
new nsID(NS_IURICONTENTLISTENER_IID_STR);
@@ -30398,10 +30412,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURI.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,67 +37,67 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIURI.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIURI.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIURI.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIURI.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,67 +37,67 @@ public class nsIURI extends nsISupports
public static final nsID NS_IURI_IID =
new nsID(NS_IURI_IID_STR);
@@ -30485,7 +30499,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/sw
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
}
-@@ -109,15 +109,15 @@
+@@ -109,15 +109,15 @@ public class nsIURI extends nsISupports
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
}
@@ -30504,7 +30518,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/sw
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
}
-@@ -125,23 +125,23 @@
+@@ -125,23 +125,23 @@ public class nsIURI extends nsISupports
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
}
@@ -30533,10 +30547,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/sw
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java
---- x86/org/eclipse/swt/internal/mozilla/nsIVariant.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIVariant.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIVariant.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIVariant.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIVariant.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,7 +37,7 @@ public class nsIVariant extends nsISuppo
public static final nsID NS_IVARIANT_IID =
new nsID(NS_IVARIANT_IID_STR);
@@ -30545,7 +30559,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
super(address);
}
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ public class nsIVariant extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
}
@@ -30559,7 +30573,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ public class nsIVariant extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
}
@@ -30568,7 +30582,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
}
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ public class nsIVariant extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
}
@@ -30577,7 +30591,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
}
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ public class nsIVariant extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
}
@@ -30586,7 +30600,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
}
-@@ -97,51 +97,51 @@
+@@ -97,51 +97,51 @@ public class nsIVariant extends nsISuppo
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
}
@@ -30650,10 +30664,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclips
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWeakReference.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,11 +37,11 @@ public class nsIWeakReference extends ns
public static final nsID NS_IWEAKREFERENCE_IID =
new nsID(NS_IWEAKREFERENCE_IID_STR);
@@ -30668,10 +30682,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIWebBrowserChromeFocus ex
public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
@@ -30680,10 +30694,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86
super(address);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,7 +37,7 @@ public class nsIWebBrowserChrome extends
public static final nsID NS_IWEBBROWSERCHROME_IID =
new nsID(NS_IWEBBROWSERCHROME_IID_STR);
@@ -30692,7 +30706,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/o
super(address);
}
-@@ -51,11 +51,11 @@
+@@ -51,11 +51,11 @@ public class nsIWebBrowserChrome extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
}
@@ -30706,10 +30720,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/o
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIWebBrowserFocus extends
public static final nsID NS_IWEBBROWSERFOCUS_IID =
new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
@@ -30718,7 +30732,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/or
super(address);
}
-@@ -57,19 +57,19 @@
+@@ -57,19 +57,19 @@ public class nsIWebBrowserFocus extends
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
}
@@ -30743,10 +30757,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/or
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,35 +37,35 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,35 +37,35 @@ public class nsIWebBrowser extends nsISu
public static final nsID NS_IWEBBROWSER_IID =
new nsID(NS_IWEBBROWSER_IID_STR);
@@ -30791,10 +30805,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/ecl
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2011-03-21 11:34:23.475731816 +0000
+@@ -37,7 +37,7 @@ public class nsIWebBrowserSetup extends
public static final nsID NS_IWEBBROWSERSETUP_IID =
new nsID(NS_IWEBBROWSERSETUP_IID_STR);
@@ -30803,10 +30817,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java x86_64/or
super(address);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,15 +37,15 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,15 +37,15 @@ public class nsIWebBrowserStream extends
public static final nsID NS_IWEBBROWSERSTREAM_IID =
new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
@@ -30825,10 +30839,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java x86_64/o
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,7 +37,7 @@ public class nsIWebNavigationInfo extend
public static final nsID NS_IWEBNAVIGATIONINFO_IID =
new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
@@ -30837,7 +30851,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/
super(address);
}
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ public class nsIWebNavigationInfo extend
public static final int OTHER = 32768;
@@ -30847,10 +30861,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2011-03-21 11:34:23.475731816 +0000
+@@ -37,7 +37,7 @@ public class nsIWebNavigation extends ns
public static final nsID NS_IWEBNAVIGATION_IID =
new nsID(NS_IWEBNAVIGATION_IID_STR);
@@ -30859,7 +30873,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/
super(address);
}
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ public class nsIWebNavigation extends ns
public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
@@ -30868,7 +30882,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
}
-@@ -97,23 +97,23 @@
+@@ -97,23 +97,23 @@ public class nsIWebNavigation extends ns
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
}
@@ -30897,10 +30911,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgress.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,7 +37,7 @@ public class nsIWebProgress extends nsIS
public static final nsID NS_IWEBPROGRESS_IID =
new nsID(NS_IWEBPROGRESS_IID_STR);
@@ -30909,7 +30923,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/ec
super(address);
}
-@@ -61,15 +61,15 @@
+@@ -61,15 +61,15 @@ public class nsIWebProgress extends nsIS
public static final int NOTIFY_ALL = 255;
@@ -30928,10 +30942,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/ec
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2011-03-21 11:34:23.465731960 +0000
+@@ -37,11 +37,11 @@ public class nsIWebProgressListener2 ext
public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
@@ -30945,10 +30959,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_
return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2011-03-21 11:34:23.445732231 +0000
+@@ -37,7 +37,7 @@ public class nsIWebProgressListener exte
public static final nsID NS_IWEBPROGRESSLISTENER_IID =
new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
@@ -30957,7 +30971,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_6
super(address);
}
-@@ -71,23 +71,23 @@
+@@ -71,23 +71,23 @@ public class nsIWebProgressListener exte
public static final int STATE_SECURE_LOW = 131072;
@@ -30987,10 +31001,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_6
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,13 +37,13 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,13 +37,13 @@ public class nsIWindowCreator2 extends n
public static final nsID NS_IWINDOWCREATOR2_IID =
new nsID(NS_IWINDOWCREATOR2_IID_STR);
@@ -31006,10 +31020,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org
return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,11 +37,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2011-03-21 11:34:23.435732379 +0000
+@@ -37,11 +37,11 @@ public class nsIWindowCreator extends ns
public static final nsID NS_IWINDOWCREATOR_IID =
new nsID(NS_IWINDOWCREATOR_IID_STR);
@@ -31024,10 +31038,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,51 +37,51 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,51 +37,51 @@ public class nsIWindowWatcher extends ns
public static final nsID NS_IWINDOWWATCHER_IID =
new nsID(NS_IWINDOWWATCHER_IID_STR);
@@ -31092,10 +31106,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIWritableVariant extends
public static final nsID NS_IWRITABLEVARIANT_IID =
new nsID(NS_IWRITABLEVARIANT_IID_STR);
@@ -31104,7 +31118,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/or
super(address);
}
-@@ -101,23 +101,23 @@
+@@ -101,23 +101,23 @@ public class nsIWritableVariant extends
// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
// }
@@ -31133,7 +31147,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/or
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
}
-@@ -129,15 +129,15 @@
+@@ -129,15 +129,15 @@ public class nsIWritableVariant extends
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
}
@@ -31152,7 +31166,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/or
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
}
-@@ -161,7 +161,7 @@
+@@ -161,7 +161,7 @@ public class nsIWritableVariant extends
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
}
@@ -31161,10 +31175,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/or
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
}
}
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
---- x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,87 +37,87 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIX509Cert.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,87 +37,87 @@ public class nsIX509Cert extends nsISupp
public static final nsID NS_IX509CERT_IID =
new nsID(NS_IX509CERT_IID_STR);
@@ -31273,7 +31287,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
}
-@@ -173,15 +173,15 @@
+@@ -173,15 +173,15 @@ public class nsIX509Cert extends nsISupp
public static final int CERT_USAGE_AnyCA = 11;
@@ -31292,7 +31306,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
}
-@@ -189,15 +189,15 @@
+@@ -189,15 +189,15 @@ public class nsIX509Cert extends nsISupp
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
}
@@ -31312,10 +31326,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclip
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
---- x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,39 +37,39 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2011-03-21 11:34:23.425732531 +0000
+@@ -37,39 +37,39 @@ public class nsIX509CertValidity extends
public static final nsID NS_IX509CERTVALIDITY_IID =
new nsID(NS_IX509CERTVALIDITY_IID_STR);
@@ -31365,10 +31379,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java x86_64/o
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2010-09-09 12:02:46.000000000 +0000
-@@ -37,7 +37,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2011-03-21 11:34:23.455732087 +0000
+@@ -37,7 +37,7 @@ public class nsIXPCSecurityManager exten
public static final nsID NS_IXPCSECURITYMANAGER_IID =
new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
@@ -31377,7 +31391,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64
super(address);
}
-@@ -55,15 +55,15 @@
+@@ -55,15 +55,15 @@ public class nsIXPCSecurityManager exten
public static final int HOOK_ALL = 63;
@@ -31396,7 +31410,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
}
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ public class nsIXPCSecurityManager exten
public static final int ACCESS_SET_PROPERTY = 2;
@@ -31406,10 +31420,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64
}
}
\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOM.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java 2010-09-09 12:02:46.000000000 +0000
-@@ -140,25 +140,25 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/XPCOM.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/XPCOM.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/XPCOM.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/XPCOM.java 2011-03-21 11:34:23.475731816 +0000
+@@ -140,25 +140,25 @@ public static final native int nsDynamic
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
@@ -31441,7 +31455,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
-@@ -167,8 +167,8 @@
+@@ -167,8 +167,8 @@ public static final int JS_EvaluateUCScr
}
}
/** @method flags=no_gen */
@@ -31452,7 +31466,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_Free(mozillaPath, aPtr);
-@@ -177,8 +177,8 @@
+@@ -177,8 +177,8 @@ public static final boolean NS_Free(byte
}
}
/** @param result cast=(nsIComponentManager**) */
@@ -31463,7 +31477,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_GetComponentManager(result);
-@@ -187,8 +187,8 @@
+@@ -187,8 +187,8 @@ public static final int NS_GetComponentM
}
}
/** @param result cast=(nsIServiceManager**) */
@@ -31474,7 +31488,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_GetServiceManager(result);
-@@ -201,8 +201,8 @@
+@@ -201,8 +201,8 @@ public static final int NS_GetServiceMan
* @param binDirectory cast=(nsIFile *)
* @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
*/
@@ -31485,7 +31499,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
-@@ -214,8 +214,8 @@
+@@ -214,8 +214,8 @@ public static final int NS_InitXPCOM2(in
* @param path cast=(nsAString *),flags=struct
* @param result cast=(nsILocalFile**)
*/
@@ -31496,7 +31510,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_NewLocalFile(path, followLinks, result);
-@@ -224,8 +224,8 @@
+@@ -224,8 +224,8 @@ public static final int NS_NewLocalFile(
}
}
/** @method flags=new */
@@ -31507,7 +31521,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new();
-@@ -237,8 +237,8 @@
+@@ -237,8 +237,8 @@ public static final int /*long*/ nsEmbed
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -31518,7 +31532,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -250,8 +250,8 @@
+@@ -250,8 +250,8 @@ public static final int /*long*/ nsEmbed
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -31529,7 +31543,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -263,8 +263,8 @@
+@@ -263,8 +263,8 @@ public static final int /*long*/ nsEmbed
* @method flags=delete
* @param ptr cast=(nsEmbedCString *)
*/
@@ -31540,7 +31554,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsEmbedCString_delete(ptr);
-@@ -276,8 +276,8 @@
+@@ -276,8 +276,8 @@ public static final void nsEmbedCString_
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -31551,7 +31565,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_Length(ptr);
-@@ -289,8 +289,8 @@
+@@ -289,8 +289,8 @@ public static final int nsEmbedCString_L
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -31562,7 +31576,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
-@@ -302,8 +302,8 @@
+@@ -302,8 +302,8 @@ public static final int nsIScriptGlobalO
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -31573,7 +31587,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);
-@@ -315,8 +315,8 @@
+@@ -315,8 +315,8 @@ public static final int /*long*/ nsIScri
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -31584,7 +31598,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
-@@ -328,8 +328,8 @@
+@@ -328,8 +328,8 @@ public static final int /*long*/ nsIScri
* @method flags=cpp
* @param ptr cast=(nsIScriptContext *)
*/
@@ -31595,7 +31609,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptContext_GetNativeContext(ptr);
-@@ -342,8 +342,8 @@
+@@ -342,8 +342,8 @@ public static final int /*long*/ nsIScri
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -31606,7 +31620,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_get(ptr);
-@@ -355,8 +355,8 @@
+@@ -355,8 +355,8 @@ public static final int /*long*/ nsEmbed
* @method flags=delete
* @param ptr cast=(nsID *)
*/
@@ -31617,7 +31631,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsID_delete(ptr);
-@@ -365,8 +365,8 @@
+@@ -365,8 +365,8 @@ public static final void nsID_delete(int
}
}
/** @method flags=new */
@@ -31628,7 +31642,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsID_new();
-@@ -379,8 +379,8 @@
+@@ -379,8 +379,8 @@ public static final int /*long*/ nsID_ne
* @param ptr cast=(nsID *)
* @param other cast=(nsID *),flags=struct
*/
@@ -31639,7 +31653,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsID_Equals(ptr, other);
-@@ -389,8 +389,8 @@
+@@ -389,8 +389,8 @@ public static final int nsID_Equals(int
}
}
/** @method flags=new */
@@ -31650,7 +31664,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_new();
-@@ -402,8 +402,8 @@
+@@ -402,8 +402,8 @@ public static final int /*long*/ nsEmbed
* @method flags=new
* @param aString cast=(PRUnichar *)
*/
@@ -31661,7 +31675,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_new(aString);
-@@ -415,8 +415,8 @@
+@@ -415,8 +415,8 @@ public static final int /*long*/ nsEmbed
* @method flags=delete
* @param ptr cast=(nsEmbedString *)
*/
@@ -31672,7 +31686,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsEmbedString_delete(ptr);
-@@ -428,8 +428,8 @@
+@@ -428,8 +428,8 @@ public static final void nsEmbedString_d
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -31683,7 +31697,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_Length(ptr);
-@@ -441,8 +441,8 @@
+@@ -441,8 +441,8 @@ public static final int nsEmbedString_Le
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -31694,7 +31708,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_get(ptr);
-@@ -455,8 +455,8 @@
+@@ -455,8 +455,8 @@ public static final int /*long*/ nsEmbed
* @param ptr cast=(nsIMemory *)
* @param size cast=(size_t)
*/
@@ -31705,7 +31719,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIMemory_Alloc(ptr, size);
-@@ -470,8 +470,8 @@
+@@ -470,8 +470,8 @@ public static final int /*long*/ nsIMemo
* @param ptr2 cast=(void *)
* @param size cast=(size_t)
*/
@@ -31716,7 +31730,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIMemory_Realloc(ptr1, ptr2, size);
-@@ -480,8 +480,8 @@
+@@ -480,8 +480,8 @@ public static final int /*long*/ nsIMemo
}
}
/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
@@ -31727,7 +31741,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _XPCOMGlueLoadXULFunctions(functionLoad);
-@@ -509,8 +509,8 @@
+@@ -509,8 +509,8 @@ public static final int XPCOMGlueShutdow
}
}
@@ -31738,7 +31752,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr);
-@@ -526,8 +526,8 @@
+@@ -526,8 +526,8 @@ public static final int Call(int /*long*
* @param aFromSegment cast=(const char *)
* @param aWriteCount cast=(PRUint32 *)
*/
@@ -31749,7 +31763,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
-@@ -543,8 +543,8 @@
+@@ -543,8 +543,8 @@ public static final int /*long*/ Call(in
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
* @param aStaticComponents cast=(nsStaticModuleInfo const *)
*/
@@ -31760,7 +31774,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
-@@ -553,8 +553,8 @@
+@@ -553,8 +553,8 @@ public static final int Call(int /*long*
}
}
@@ -31771,7 +31785,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl);
-@@ -563,8 +563,8 @@
+@@ -563,8 +563,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -31782,7 +31796,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -572,8 +572,8 @@
+@@ -572,8 +572,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31793,7 +31807,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -581,8 +581,8 @@
+@@ -581,8 +581,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31804,7 +31818,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -590,8 +590,8 @@
+@@ -590,8 +590,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31815,7 +31829,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -599,8 +599,8 @@
+@@ -599,8 +599,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31826,7 +31840,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -608,8 +608,8 @@
+@@ -608,8 +608,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31837,7 +31851,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -617,8 +617,8 @@
+@@ -617,8 +617,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31848,7 +31862,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -626,8 +626,8 @@
+@@ -626,8 +626,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31859,7 +31873,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -635,8 +635,8 @@
+@@ -635,8 +635,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31870,7 +31884,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -644,8 +644,8 @@
+@@ -644,8 +644,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31881,7 +31895,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -654,8 +654,8 @@
+@@ -654,8 +654,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -31892,7 +31906,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -663,8 +663,8 @@
+@@ -663,8 +663,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31903,7 +31917,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -672,8 +672,8 @@
+@@ -672,8 +672,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31914,7 +31928,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -681,8 +681,8 @@
+@@ -681,8 +681,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31925,7 +31939,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -690,8 +690,8 @@
+@@ -690,8 +690,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31936,7 +31950,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -699,8 +699,8 @@
+@@ -699,8 +699,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31947,7 +31961,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -708,8 +708,8 @@
+@@ -708,8 +708,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31958,7 +31972,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -717,8 +717,8 @@
+@@ -717,8 +717,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31969,7 +31983,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -726,8 +726,8 @@
+@@ -726,8 +726,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31980,7 +31994,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -735,8 +735,8 @@
+@@ -735,8 +735,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -31991,7 +32005,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -744,8 +744,8 @@
+@@ -744,8 +744,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32002,7 +32016,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -753,8 +753,8 @@
+@@ -753,8 +753,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32013,7 +32027,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -762,8 +762,8 @@
+@@ -762,8 +762,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32024,7 +32038,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -771,8 +771,8 @@
+@@ -771,8 +771,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32035,7 +32049,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -780,8 +780,8 @@
+@@ -780,8 +780,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32046,7 +32060,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -789,8 +789,8 @@
+@@ -789,8 +789,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32057,7 +32071,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -798,8 +798,8 @@
+@@ -798,8 +798,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32068,7 +32082,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -807,8 +807,8 @@
+@@ -807,8 +807,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32079,7 +32093,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -816,8 +816,8 @@
+@@ -816,8 +816,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32090,7 +32104,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -825,8 +825,8 @@
+@@ -825,8 +825,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32101,7 +32115,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -834,8 +834,8 @@
+@@ -834,8 +834,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32112,7 +32126,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -843,8 +843,8 @@
+@@ -843,8 +843,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32123,7 +32137,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -852,8 +852,8 @@
+@@ -852,8 +852,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32134,7 +32148,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -862,8 +862,8 @@
+@@ -862,8 +862,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -32145,7 +32159,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -871,8 +871,8 @@
+@@ -871,8 +871,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32156,7 +32170,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -880,8 +880,8 @@
+@@ -880,8 +880,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32167,7 +32181,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -889,8 +889,8 @@
+@@ -889,8 +889,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32178,7 +32192,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -898,8 +898,8 @@
+@@ -898,8 +898,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32189,7 +32203,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -907,8 +907,8 @@
+@@ -907,8 +907,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32200,7 +32214,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -916,8 +916,8 @@
+@@ -916,8 +916,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32211,7 +32225,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -925,8 +925,8 @@
+@@ -925,8 +925,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32222,7 +32236,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -934,8 +934,8 @@
+@@ -934,8 +934,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32233,7 +32247,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -944,8 +944,8 @@
+@@ -944,8 +944,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -32244,7 +32258,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -953,8 +953,8 @@
+@@ -953,8 +953,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32255,7 +32269,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -963,8 +963,8 @@
+@@ -963,8 +963,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -32266,7 +32280,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -972,8 +972,8 @@
+@@ -972,8 +972,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32277,7 +32291,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -981,8 +981,8 @@
+@@ -981,8 +981,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32288,7 +32302,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -990,8 +990,8 @@
+@@ -990,8 +990,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32299,7 +32313,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -999,8 +999,8 @@
+@@ -999,8 +999,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32310,7 +32324,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1008,8 +1008,8 @@
+@@ -1008,8 +1008,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32321,7 +32335,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1017,8 +1017,8 @@
+@@ -1017,8 +1017,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32332,7 +32346,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1026,8 +1026,8 @@
+@@ -1026,8 +1026,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32343,7 +32357,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1035,8 +1035,8 @@
+@@ -1035,8 +1035,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32354,7 +32368,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1044,8 +1044,8 @@
+@@ -1044,8 +1044,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32365,7 +32379,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1053,8 +1053,8 @@
+@@ -1053,8 +1053,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32376,7 +32390,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1062,8 +1062,8 @@
+@@ -1062,8 +1062,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32387,7 +32401,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1071,8 +1071,8 @@
+@@ -1071,8 +1071,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32398,7 +32412,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1080,8 +1080,8 @@
+@@ -1080,8 +1080,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32409,7 +32423,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1089,8 +1089,8 @@
+@@ -1089,8 +1089,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32420,7 +32434,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1098,8 +1098,8 @@
+@@ -1098,8 +1098,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32431,7 +32445,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1107,8 +1107,8 @@
+@@ -1107,8 +1107,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32442,7 +32456,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1116,8 +1116,8 @@
+@@ -1116,8 +1116,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32453,7 +32467,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1125,8 +1125,8 @@
+@@ -1125,8 +1125,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32464,7 +32478,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1134,8 +1134,8 @@
+@@ -1134,8 +1134,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32475,7 +32489,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1143,8 +1143,8 @@
+@@ -1143,8 +1143,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32486,7 +32500,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1152,8 +1152,8 @@
+@@ -1152,8 +1152,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32497,7 +32511,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1161,8 +1161,8 @@
+@@ -1161,8 +1161,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32508,7 +32522,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1170,8 +1170,8 @@
+@@ -1170,8 +1170,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32519,7 +32533,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1179,8 +1179,8 @@
+@@ -1179,8 +1179,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32530,7 +32544,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1188,8 +1188,8 @@
+@@ -1188,8 +1188,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32541,7 +32555,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1197,8 +1197,8 @@
+@@ -1197,8 +1197,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32552,7 +32566,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1206,8 +1206,8 @@
+@@ -1206,8 +1206,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32563,7 +32577,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1215,8 +1215,8 @@
+@@ -1215,8 +1215,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32574,7 +32588,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1224,8 +1224,8 @@
+@@ -1224,8 +1224,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32585,7 +32599,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1233,8 +1233,8 @@
+@@ -1233,8 +1233,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32596,7 +32610,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1242,8 +1242,8 @@
+@@ -1242,8 +1242,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32607,7 +32621,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1251,8 +1251,8 @@
+@@ -1251,8 +1251,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32618,7 +32632,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1260,8 +1260,8 @@
+@@ -1260,8 +1260,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32629,7 +32643,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1269,8 +1269,8 @@
+@@ -1269,8 +1269,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32640,7 +32654,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1278,8 +1278,8 @@
+@@ -1278,8 +1278,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32651,7 +32665,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1287,8 +1287,8 @@
+@@ -1287,8 +1287,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32662,7 +32676,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1296,8 +1296,8 @@
+@@ -1296,8 +1296,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32673,7 +32687,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1305,8 +1305,8 @@
+@@ -1305,8 +1305,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32684,7 +32698,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1314,8 +1314,8 @@
+@@ -1314,8 +1314,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32695,7 +32709,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1323,8 +1323,8 @@
+@@ -1323,8 +1323,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32706,7 +32720,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1332,8 +1332,8 @@
+@@ -1332,8 +1332,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32717,7 +32731,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1342,8 +1342,8 @@
+@@ -1342,8 +1342,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -32728,7 +32742,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1351,8 +1351,8 @@
+@@ -1351,8 +1351,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32739,7 +32753,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1360,8 +1360,8 @@
+@@ -1360,8 +1360,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32750,7 +32764,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1369,8 +1369,8 @@
+@@ -1369,8 +1369,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32761,7 +32775,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1378,8 +1378,8 @@
+@@ -1378,8 +1378,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32772,7 +32786,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1387,8 +1387,8 @@
+@@ -1387,8 +1387,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32783,7 +32797,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1396,8 +1396,8 @@
+@@ -1396,8 +1396,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32794,7 +32808,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1405,8 +1405,8 @@
+@@ -1405,8 +1405,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32805,7 +32819,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1414,8 +1414,8 @@
+@@ -1414,8 +1414,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32816,7 +32830,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1423,8 +1423,8 @@
+@@ -1423,8 +1423,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32827,7 +32841,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1432,8 +1432,8 @@
+@@ -1432,8 +1432,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32838,7 +32852,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1441,8 +1441,8 @@
+@@ -1441,8 +1441,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32849,7 +32863,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1450,8 +1450,8 @@
+@@ -1450,8 +1450,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32860,7 +32874,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1459,8 +1459,8 @@
+@@ -1459,8 +1459,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32871,7 +32885,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1468,8 +1468,8 @@
+@@ -1468,8 +1468,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32882,7 +32896,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1477,8 +1477,8 @@
+@@ -1477,8 +1477,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32893,7 +32907,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1486,8 +1486,8 @@
+@@ -1486,8 +1486,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32904,7 +32918,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1495,8 +1495,8 @@
+@@ -1495,8 +1495,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32915,7 +32929,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1504,8 +1504,8 @@
+@@ -1504,8 +1504,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32926,7 +32940,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1513,8 +1513,8 @@
+@@ -1513,8 +1513,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32937,7 +32951,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1522,8 +1522,8 @@
+@@ -1522,8 +1522,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32948,7 +32962,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1531,8 +1531,8 @@
+@@ -1531,8 +1531,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32959,7 +32973,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1540,8 +1540,8 @@
+@@ -1540,8 +1540,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32970,7 +32984,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1549,8 +1549,8 @@
+@@ -1549,8 +1549,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32981,7 +32995,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1558,8 +1558,8 @@
+@@ -1558,8 +1558,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -32992,7 +33006,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1567,8 +1567,8 @@
+@@ -1567,8 +1567,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33003,7 +33017,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1576,8 +1576,8 @@
+@@ -1576,8 +1576,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33014,7 +33028,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1585,8 +1585,8 @@
+@@ -1585,8 +1585,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33025,7 +33039,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1594,8 +1594,8 @@
+@@ -1594,8 +1594,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33036,7 +33050,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1603,8 +1603,8 @@
+@@ -1603,8 +1603,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33047,7 +33061,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1612,8 +1612,8 @@
+@@ -1612,8 +1612,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33058,7 +33072,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1621,8 +1621,8 @@
+@@ -1621,8 +1621,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33069,7 +33083,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1630,8 +1630,8 @@
+@@ -1630,8 +1630,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33080,7 +33094,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1639,8 +1639,8 @@
+@@ -1639,8 +1639,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33091,7 +33105,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1649,8 +1649,8 @@
+@@ -1649,8 +1649,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33102,7 +33116,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1658,8 +1658,8 @@
+@@ -1658,8 +1658,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33113,7 +33127,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1667,8 +1667,8 @@
+@@ -1667,8 +1667,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33124,7 +33138,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1676,8 +1676,8 @@
+@@ -1676,8 +1676,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33135,7 +33149,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1685,8 +1685,8 @@
+@@ -1685,8 +1685,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33146,7 +33160,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1694,8 +1694,8 @@
+@@ -1694,8 +1694,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33157,7 +33171,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1703,8 +1703,8 @@
+@@ -1703,8 +1703,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33168,7 +33182,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1712,8 +1712,8 @@
+@@ -1712,8 +1712,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33179,7 +33193,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1721,8 +1721,8 @@
+@@ -1721,8 +1721,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33190,7 +33204,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1730,8 +1730,8 @@
+@@ -1730,8 +1730,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33201,7 +33215,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1740,8 +1740,8 @@
+@@ -1740,8 +1740,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33212,7 +33226,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1749,8 +1749,8 @@
+@@ -1749,8 +1749,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33223,7 +33237,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1758,8 +1758,8 @@
+@@ -1758,8 +1758,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33234,7 +33248,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1767,8 +1767,8 @@
+@@ -1767,8 +1767,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33245,7 +33259,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1777,8 +1777,8 @@
+@@ -1777,8 +1777,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33256,7 +33270,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1786,8 +1786,8 @@
+@@ -1786,8 +1786,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33267,7 +33281,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1795,8 +1795,8 @@
+@@ -1795,8 +1795,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33278,7 +33292,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1804,8 +1804,8 @@
+@@ -1804,8 +1804,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33289,7 +33303,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1813,8 +1813,8 @@
+@@ -1813,8 +1813,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33300,7 +33314,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1822,8 +1822,8 @@
+@@ -1822,8 +1822,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33311,7 +33325,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1831,8 +1831,8 @@
+@@ -1831,8 +1831,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33322,7 +33336,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1841,8 +1841,8 @@
+@@ -1841,8 +1841,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33333,7 +33347,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1850,8 +1850,8 @@
+@@ -1850,8 +1850,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33344,7 +33358,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1859,8 +1859,8 @@
+@@ -1859,8 +1859,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33355,7 +33369,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1868,8 +1868,8 @@
+@@ -1868,8 +1868,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33366,7 +33380,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1878,8 +1878,8 @@
+@@ -1878,8 +1878,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33377,7 +33391,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1887,8 +1887,8 @@
+@@ -1887,8 +1887,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33388,7 +33402,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1896,8 +1896,8 @@
+@@ -1896,8 +1896,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33399,7 +33413,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1905,8 +1905,8 @@
+@@ -1905,8 +1905,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33410,7 +33424,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1914,8 +1914,8 @@
+@@ -1914,8 +1914,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33421,7 +33435,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1923,8 +1923,8 @@
+@@ -1923,8 +1923,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33432,7 +33446,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1932,8 +1932,8 @@
+@@ -1932,8 +1932,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33443,7 +33457,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1941,8 +1941,8 @@
+@@ -1941,8 +1941,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33454,7 +33468,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1950,8 +1950,8 @@
+@@ -1950,8 +1950,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33465,7 +33479,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1959,8 +1959,8 @@
+@@ -1959,8 +1959,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33476,7 +33490,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1968,8 +1968,8 @@
+@@ -1968,8 +1968,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33487,7 +33501,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1977,8 +1977,8 @@
+@@ -1977,8 +1977,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33498,7 +33512,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1986,8 +1986,8 @@
+@@ -1986,8 +1986,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33509,7 +33523,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1995,8 +1995,8 @@
+@@ -1995,8 +1995,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33520,7 +33534,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2004,8 +2004,8 @@
+@@ -2004,8 +2004,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33531,7 +33545,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2013,8 +2013,8 @@
+@@ -2013,8 +2013,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33542,7 +33556,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2022,8 +2022,8 @@
+@@ -2022,8 +2022,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33553,7 +33567,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2032,8 +2032,8 @@
+@@ -2032,8 +2032,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33564,7 +33578,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2041,8 +2041,8 @@
+@@ -2041,8 +2041,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33575,7 +33589,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2050,8 +2050,8 @@
+@@ -2050,8 +2050,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33586,7 +33600,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2059,8 +2059,8 @@
+@@ -2059,8 +2059,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33597,7 +33611,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2068,8 +2068,8 @@
+@@ -2068,8 +2068,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33608,7 +33622,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2077,8 +2077,8 @@
+@@ -2077,8 +2077,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33619,7 +33633,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2086,8 +2086,8 @@
+@@ -2086,8 +2086,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33630,7 +33644,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2095,8 +2095,8 @@
+@@ -2095,8 +2095,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33641,7 +33655,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2104,8 +2104,8 @@
+@@ -2104,8 +2104,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33652,7 +33666,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2113,8 +2113,8 @@
+@@ -2113,8 +2113,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33663,7 +33677,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2123,8 +2123,8 @@
+@@ -2123,8 +2123,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33674,7 +33688,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2132,8 +2132,8 @@
+@@ -2132,8 +2132,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33685,7 +33699,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2141,8 +2141,8 @@
+@@ -2141,8 +2141,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33696,7 +33710,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2150,8 +2150,8 @@
+@@ -2150,8 +2150,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33707,7 +33721,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2160,8 +2160,8 @@
+@@ -2160,8 +2160,8 @@ static final int VtblCall(int fnNumber,
}
}
@@ -33718,7 +33732,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2169,8 +2169,8 @@
+@@ -2169,8 +2169,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33729,7 +33743,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2178,8 +2178,8 @@
+@@ -2178,8 +2178,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33740,7 +33754,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2187,8 +2187,8 @@
+@@ -2187,8 +2187,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33751,7 +33765,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2196,8 +2196,8 @@
+@@ -2196,8 +2196,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33762,7 +33776,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2205,8 +2205,8 @@
+@@ -2205,8 +2205,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33773,7 +33787,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2214,8 +2214,8 @@
+@@ -2214,8 +2214,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33784,7 +33798,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2223,8 +2223,8 @@
+@@ -2223,8 +2223,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33795,7 +33809,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2232,8 +2232,8 @@
+@@ -2232,8 +2232,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33806,7 +33820,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2241,8 +2241,8 @@
+@@ -2241,8 +2241,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33817,7 +33831,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2250,8 +2250,8 @@
+@@ -2250,8 +2250,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33828,7 +33842,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-@@ -2259,8 +2259,8 @@
+@@ -2259,8 +2259,8 @@ static final int VtblCall(int fnNumber,
lock.unlock();
}
}
@@ -33839,10 +33853,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2010-09-09 12:02:46.000000000 +0000
-@@ -21,7 +21,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/XPCOMObject.java swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/mozilla/XPCOMObject.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2011-03-21 11:34:23.475731816 +0000
+@@ -21,7 +21,7 @@ public class XPCOMObject {
IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
}
@@ -33851,7 +33865,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ public class XPCOMObject {
public XPCOMObject (int[] argCounts) {
@@ -33860,7 +33874,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
synchronized (Callbacks) {
for (int i = 0, length = argCounts.length; i < length; i++) {
if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
-@@ -42,737 +42,737 @@
+@@ -42,737 +42,737 @@ public XPCOMObject (int[] argCounts) {
}
}
@@ -34841,7 +34855,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
C.free (pVtable[0]);
C.free (ppVtable);
-@@ -783,248 +783,248 @@
+@@ -783,248 +783,248 @@ public void dispose() {
ppVtable = 0;
}
@@ -35171,10 +35185,10 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
}
-diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java
---- x86/org/eclipse/swt/internal/opengl/glx/GLX.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java 2010-09-09 12:02:46.000000000 +0000
-@@ -231,8 +231,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/opengl/glx/GLX.java swt-gtk-3.6.2/org/eclipse/swt/internal/opengl/glx/GLX.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/opengl/glx/GLX.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/opengl/glx/GLX.java 2011-03-21 11:34:23.305734214 +0000
+@@ -231,8 +231,8 @@ public static final void glViewport(int
}
}
/** @param dpy cast=(Display *) */
@@ -35185,7 +35199,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXChooseVisual(dpy, screen, attribList);
-@@ -245,8 +245,8 @@
+@@ -245,8 +245,8 @@ public static final int /*long*/ glXChoo
* @param src cast=(GLXContext)
* @param dst cast=(GLXContext)
*/
@@ -35196,7 +35210,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXCopyContext(dpy, src, dst, mask);
-@@ -258,8 +258,8 @@
+@@ -258,8 +258,8 @@ public static final void glXCopyContext(
* @param dpy cast=(Display *)
* @param shareList cast=(GLXContext)
*/
@@ -35207,7 +35221,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXCreateContext(dpy, vis, shareList, direct);
-@@ -271,8 +271,8 @@
+@@ -271,8 +271,8 @@ public static final int /*long*/ glXCrea
* @param dpy cast=(Display *)
* @param pixmap cast=(Pixmap)
*/
@@ -35218,7 +35232,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXCreateGLXPixmap(dpy, vis, pixmap);
-@@ -284,8 +284,8 @@
+@@ -284,8 +284,8 @@ public static final int /*long*/ glXCrea
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
@@ -35229,7 +35243,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXDestroyContext(dpy, ctx);
-@@ -297,8 +297,8 @@
+@@ -297,8 +297,8 @@ public static final void glXDestroyConte
* @param dpy cast=(Display *)
* @param pix cast=(GLXPixmap)
*/
@@ -35240,7 +35254,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXDestroyGLXPixmap(dpy, pix);
-@@ -307,8 +307,8 @@
+@@ -307,8 +307,8 @@ public static final void glXDestroyGLXPi
}
}
/** @param dpy cast=(Display *) */
@@ -35251,7 +35265,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetClientString(dpy, name);
-@@ -317,8 +317,8 @@
+@@ -317,8 +317,8 @@ public static final int /*long*/ glXGetC
}
}
/** @param dpy cast=(Display *) */
@@ -35262,7 +35276,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetConfig(dpy, vis, attrib, value);
-@@ -326,8 +326,8 @@
+@@ -326,8 +326,8 @@ public static final int glXGetConfig(int
lock.unlock();
}
}
@@ -35273,7 +35287,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetCurrentContext();
-@@ -335,8 +335,8 @@
+@@ -335,8 +335,8 @@ public static final int /*long*/ glXGetC
lock.unlock();
}
}
@@ -35284,7 +35298,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetCurrentDrawable();
-@@ -348,8 +348,8 @@
+@@ -348,8 +348,8 @@ public static final int /*long*/ glXGetC
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
@@ -35295,7 +35309,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXIsDirect(dpy, ctx);
-@@ -362,8 +362,8 @@
+@@ -362,8 +362,8 @@ public static final boolean glXIsDirect(
* @param drawable cast=(GLXDrawable)
* @param ctx cast=(GLXContext)
*/
@@ -35306,7 +35320,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXMakeCurrent(dpy, drawable, ctx);
-@@ -372,8 +372,8 @@
+@@ -372,8 +372,8 @@ public static final boolean glXMakeCurre
}
}
/** @param dpy cast=(Display *) */
@@ -35317,7 +35331,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryExtension(dpy, errorBase, eventBase);
-@@ -382,8 +382,8 @@
+@@ -382,8 +382,8 @@ public static final boolean glXQueryExte
}
}
/** @param dpy cast=(Display *) */
@@ -35328,7 +35342,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryExtensionsString(dpy, screen);
-@@ -392,8 +392,8 @@
+@@ -392,8 +392,8 @@ public static final int /*long*/ glXQuer
}
}
/** @param dpy cast=(Display *) */
@@ -35339,7 +35353,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryServerString(dpy, screen, name);
-@@ -406,8 +406,8 @@
+@@ -406,8 +406,8 @@ public static final int /*long*/ glXQuer
* @param major flags=no_in
* @param minor flags=no_in
*/
@@ -35350,7 +35364,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryVersion(dpy, major, minor);
-@@ -419,8 +419,8 @@
+@@ -419,8 +419,8 @@ public static final boolean glXQueryVers
* @param dpy cast=(Display *)
* @param drawable cast=(GLXDrawable)
*/
@@ -35361,17 +35375,17 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXSwapBuffers(dpy, drawable);
-@@ -450,5 +450,5 @@
+@@ -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 -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
---- x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -12,7 +12,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java swt-gtk-3.6.2/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2011-03-21 11:34:23.305734214 +0000
+@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.opengl.
public class XVisualInfo {
/** @field cast=(Visual *) */
@@ -35380,10 +35394,10 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/ec
public int visualid;
public int screen;
public int depth;
-diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java
---- x86/org/eclipse/swt/internal/theme/ButtonDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -25,10 +25,10 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ButtonDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ButtonDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ButtonDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ButtonDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -25,10 +25,10 @@ public ButtonDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
@@ -35397,7 +35411,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(radioButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(radioButtonHandle, "indicator-spacing");
-@@ -74,8 +74,8 @@
+@@ -74,8 +74,8 @@ void draw(Theme theme, GC gc, Rectangle
}
if ((style & SWT.CHECK) != 0) {
@@ -35408,7 +35422,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(checkButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(checkButtonHandle, "indicator-spacing");
-@@ -122,8 +122,8 @@
+@@ -122,8 +122,8 @@ void draw(Theme theme, GC gc, Rectangle
if ((style & SWT.PUSH) != 0) {
@@ -35419,10 +35433,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java
---- x86/org/eclipse/swt/internal/theme/ComboDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -24,9 +24,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ComboDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ComboDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ComboDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ComboDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -24,9 +24,9 @@ public ComboDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35435,7 +35449,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
theme.transferClipping(gc, gtkStyle);
int x = bounds.x;
-@@ -61,10 +61,10 @@
+@@ -61,10 +61,10 @@ void draw(Theme theme, GC gc, Rectangle
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);
@@ -35448,7 +35462,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
gtkStyle = OS.gtk_widget_get_style(entryHandle);
theme.transferClipping(gc, gtkStyle);
state_type = getStateType(DrawData.WIDGET_WHOLE);
-@@ -100,8 +100,8 @@
+@@ -100,8 +100,8 @@ int getStateType(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
@@ -35459,10 +35473,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
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 -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt/internal/theme/DrawData.java
---- x86/org/eclipse/swt/internal/theme/DrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/DrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -79,21 +79,21 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/DrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/DrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/DrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/DrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -79,21 +79,21 @@ void draw(Theme theme, GC gc, Rectangle
}
void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
@@ -35490,7 +35504,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
OS.g_object_unref(pixbuf);
//TODO - stretching
if (rendered != 0) {
-@@ -106,12 +106,12 @@
+@@ -106,12 +106,12 @@ void drawImage(Theme theme, Image image,
}
void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
@@ -35507,7 +35521,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
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 @@
+@@ -160,7 +160,7 @@ int getStateType(int part) {
return state_type;
}
@@ -35516,7 +35530,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
return theme.labelHandle;
}
-@@ -169,9 +169,9 @@
+@@ -169,9 +169,9 @@ int hit(Theme theme, Point position, Rec
}
Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
@@ -35528,10 +35542,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
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 -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java
---- x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -22,9 +22,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ExpanderDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ExpanderDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -22,9 +22,9 @@ public ExpanderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35544,7 +35558,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/ec
theme.transferClipping(gc, gtkStyle);
int state_type = getStateType(DrawData.WIDGET_WHOLE);
int expander_style = OS.GTK_EXPANDER_COLAPSED;
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ void draw(Theme theme, GC gc, Rectangle
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
@@ -35553,10 +35567,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/ec
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 -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java
---- x86/org/eclipse/swt/internal/theme/GroupDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -29,9 +29,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/GroupDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/GroupDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/GroupDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/GroupDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -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) {
@@ -35569,10 +35583,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclip
theme.transferClipping(gc, gtkStyle);
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int ythickness = OS.gtk_style_get_ythickness(gtkStyle);
-diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -22,9 +22,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ProgressBarDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -22,9 +22,9 @@ public ProgressBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35585,10 +35599,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org
theme.transferClipping(gc, gtkStyle);
byte[] detail = Converter.wcsToMbcs(null, "trough", true);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
-diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -31,9 +31,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/TabFolderDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/TabFolderDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -31,9 +31,9 @@ public TabFolderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35601,10 +35615,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/e
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
height -= tabsHeight;
-diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabItemDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -27,8 +27,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/TabItemDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/TabItemDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/TabItemDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/TabItemDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -27,8 +27,8 @@ public TabItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
@@ -35615,7 +35629,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/ecl
int hborder, vborder;
if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
hborder = theme.getWidgetProperty(notebookHandle, "tab-hborder");
-@@ -50,9 +50,9 @@
+@@ -50,9 +50,9 @@ Rectangle computeTrim(Theme theme, GC gc
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35628,10 +35642,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/ecl
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 -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/internal/theme/Theme.java
---- x86/org/eclipse/swt/internal/theme/Theme.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/Theme.java 2010-09-09 12:02:46.000000000 +0000
-@@ -18,7 +18,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/Theme.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/Theme.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/Theme.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/Theme.java 2011-03-21 11:34:23.315734069 +0000
+@@ -18,7 +18,7 @@ import org.eclipse.swt.internal.gtk.*;
public class Theme {
Device device;
@@ -35640,7 +35654,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
frameHandle, entryHandle, checkButtonHandle, radioButtonHandle,
notebookHandle, treeHandle, progressHandle, toolbarHandle,
labelHandle, separatorHandle;
-@@ -68,29 +68,29 @@
+@@ -68,29 +68,29 @@ public Theme(Device device) {
}
//TODO - share this code
@@ -35678,7 +35692,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -109,10 +109,10 @@
+@@ -109,10 +109,10 @@ static int /*long*/ createPixbuf(Image i
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -35691,7 +35705,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-@@ -218,18 +218,18 @@
+@@ -218,18 +218,18 @@ public Rectangle measureText(GC gc, Rect
return data.measureText(this, text, flags, gc, bounds);
}
@@ -35715,7 +35729,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
if (damageRgn != 0) {
if (clipping != 0) {
clipping = OS.gdk_region_new();
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ void transferClipping(GC gc, int /*long*
clipping = damageRgn;
}
}
@@ -35724,10 +35738,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
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 -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -21,9 +21,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ToolBarDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ToolBarDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -21,9 +21,9 @@ public ToolBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -35740,10 +35754,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/ecl
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 -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2010-09-09 12:02:46.000000000 +0000
-@@ -27,8 +27,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ToolItemDrawData.java swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/theme/ToolItemDrawData.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2011-03-21 11:34:23.315734069 +0000
+@@ -27,8 +27,8 @@ public ToolItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
@@ -35754,7 +35768,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
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 @@
+@@ -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];
@@ -35771,7 +35785,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
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 @@
+@@ -63,8 +63,8 @@ void draw(Theme theme, GC gc, Rectangle
return;
}
@@ -35782,7 +35796,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
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 @@
+@@ -83,7 +83,7 @@ void draw(Theme theme, GC gc, Rectangle
}
int[] relief = new int[1];
@@ -35791,7 +35805,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
OS.gtk_widget_style_get(toolbarHandle, OS.button_relief, relief, 0);
int shadow_type = OS.GTK_SHADOW_OUT;
-@@ -149,8 +149,8 @@
+@@ -149,8 +149,8 @@ void draw(Theme theme, GC gc, Rectangle
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
if ((style & SWT.DROP_DOWN) != 0) {
@@ -35802,10 +35816,10 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
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 -urN x86/org/eclipse/swt/internal/webkit/JSClassDefinition.java x86_64/org/eclipse/swt/internal/webkit/JSClassDefinition.java
---- x86/org/eclipse/swt/internal/webkit/JSClassDefinition.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/webkit/JSClassDefinition.java 2010-09-09 12:02:46.000000000 +0000
-@@ -20,35 +20,35 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/webkit/JSClassDefinition.java swt-gtk-3.6.2/org/eclipse/swt/internal/webkit/JSClassDefinition.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/webkit/JSClassDefinition.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/webkit/JSClassDefinition.java 2011-03-21 11:34:23.325733931 +0000
+@@ -20,35 +20,35 @@ public class JSClassDefinition {
/** @field cast=(JSClassAttributes) */
public int attributes;
/** @field cast=(const char*) */
@@ -35856,10 +35870,10 @@ diff -urN x86/org/eclipse/swt/internal/webkit/JSClassDefinition.java x86_64/org/
public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/swt/internal/webkit/WebKitGTK.java
---- x86/org/eclipse/swt/internal/webkit/WebKitGTK.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/internal/webkit/WebKitGTK.java 2010-09-09 12:02:46.000000000 +0000
-@@ -81,8 +81,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/internal/webkit/WebKitGTK.java swt-gtk-3.6.2/org/eclipse/swt/internal/webkit/WebKitGTK.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/internal/webkit/WebKitGTK.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/internal/webkit/WebKitGTK.java 2011-03-21 11:34:23.325733931 +0000
+@@ -81,8 +81,8 @@ protected static byte [] ascii (String n
/**
* @param definition cast=(const JSClassDefinition*)
*/
@@ -35870,7 +35884,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSClassCreate (definition);
-@@ -94,8 +94,8 @@
+@@ -94,8 +94,8 @@ public static final int /*long*/ JSClass
/**
* @param ctx cast=(JSContextRef)
*/
@@ -35881,7 +35895,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSContextGetGlobalObject (ctx);
-@@ -111,8 +111,8 @@
+@@ -111,8 +111,8 @@ public static final int /*long*/ JSConte
* @param sourceURL cast=(JSStringRef)
* @param exception cast=(JSValueRef *)
*/
@@ -35892,7 +35906,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception);
-@@ -124,8 +124,8 @@
+@@ -124,8 +124,8 @@ public static final int /*long*/ JSEvalu
/**
* @param object cast=(JSObjectRef)
*/
@@ -35903,7 +35917,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectGetPrivate (object);
-@@ -140,8 +140,8 @@
+@@ -140,8 +140,8 @@ public static final int /*long*/ JSObjec
* @param propertyName cast=(JSStringRef)
* @param exception cast=(JSValueRef*)
*/
@@ -35914,7 +35928,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectGetProperty (ctx, object, propertyName, exception);
-@@ -156,8 +156,8 @@
+@@ -156,8 +156,8 @@ public static final int /*long*/ JSObjec
* @param propertyIndex cast=(unsigned)
* @param exception cast=(JSValueRef*)
*/
@@ -35925,7 +35939,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception);
-@@ -171,8 +171,8 @@
+@@ -171,8 +171,8 @@ public static final int /*long*/ JSObjec
* @param jsClass cast=(JSClassRef)
* @param data cast=(void *)
*/
@@ -35936,7 +35950,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectMake (ctx, jsClass, data);
-@@ -187,8 +187,8 @@
+@@ -187,8 +187,8 @@ public static final int /*long*/ JSObjec
* @param arguments cast=(const struct OpaqueJSValue * const*)
* @param exception cast=(JSValueRef*)
*/
@@ -35947,7 +35961,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectMakeArray (ctx, argumentCount, arguments, exception);
-@@ -202,8 +202,8 @@
+@@ -202,8 +202,8 @@ public static final int /*long*/ JSObjec
* @param name cast=(JSStringRef)
* @param callAsFunction cast=(JSObjectCallAsFunctionCallback)
*/
@@ -35958,7 +35972,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction);
-@@ -220,8 +220,8 @@
+@@ -220,8 +220,8 @@ public static final int /*long*/ JSObjec
* @param attributes cast=(JSPropertyAttributes)
* @param exception cast=(JSValueRef *)
*/
@@ -35969,7 +35983,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception);
-@@ -233,8 +233,8 @@
+@@ -233,8 +233,8 @@ public static final void JSObjectSetProp
/**
* @param string cast=(const char *)
*/
@@ -35980,7 +35994,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSStringCreateWithUTF8CString (string);
-@@ -246,8 +246,8 @@
+@@ -246,8 +246,8 @@ public static final int /*long*/ JSStrin
/**
* @param string cast=(JSStringRef)
*/
@@ -35991,7 +36005,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSStringGetLength (string);
-@@ -259,8 +259,8 @@
+@@ -259,8 +259,8 @@ public static final int /*long*/ JSStrin
/**
* @param string cast=(JSStringRef)
*/
@@ -36002,7 +36016,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSStringGetMaximumUTF8CStringSize (string);
-@@ -274,8 +274,8 @@
+@@ -274,8 +274,8 @@ public static final int /*long*/ JSStrin
* @param buffer cast=(char *)
* @param bufferSize cast=(size_t)
*/
@@ -36013,7 +36027,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSStringGetUTF8CString (string, buffer, bufferSize);
-@@ -288,8 +288,8 @@
+@@ -288,8 +288,8 @@ public static final int /*long*/ JSStrin
* @param a cast=(JSStringRef)
* @param b cast=(const char *)
*/
@@ -36024,7 +36038,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSStringIsEqualToUTF8CString (a, b);
-@@ -301,8 +301,8 @@
+@@ -301,8 +301,8 @@ public static final int JSStringIsEqualT
/**
* @param string cast=(JSStringRef)
*/
@@ -36035,7 +36049,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_JSStringRelease (string);
-@@ -315,8 +315,8 @@
+@@ -315,8 +315,8 @@ public static final void JSStringRelease
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
*/
@@ -36046,7 +36060,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueGetType (ctx, value);
-@@ -330,8 +330,8 @@
+@@ -330,8 +330,8 @@ public static final int JSValueGetType (
* @param value cast=(JSValueRef)
* @param jsClass cast=(JSClassRef)
*/
@@ -36057,7 +36071,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueIsObjectOfClass (ctx, value, jsClass);
-@@ -344,8 +344,8 @@
+@@ -344,8 +344,8 @@ public static final int JSValueIsObjectO
* @param ctx cast=(JSContextRef)
* @param bool cast=(bool)
*/
@@ -36068,7 +36082,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueMakeBoolean (ctx, bool);
-@@ -358,8 +358,8 @@
+@@ -358,8 +358,8 @@ public static final int /*long*/ JSValue
* @param ctx cast=(JSContextRef)
* @param number cast=(double)
*/
@@ -36079,7 +36093,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueMakeNumber (ctx, number);
-@@ -372,8 +372,8 @@
+@@ -372,8 +372,8 @@ public static final int /*long*/ JSValue
* @param ctx cast=(JSContextRef)
* @param string cast=(JSStringRef)
*/
@@ -36090,7 +36104,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueMakeString (ctx, string);
-@@ -385,8 +385,8 @@
+@@ -385,8 +385,8 @@ public static final int /*long*/ JSValue
/**
* @param ctx cast=(JSContextRef)
*/
@@ -36101,7 +36115,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueMakeUndefined (ctx);
-@@ -399,8 +399,8 @@
+@@ -399,8 +399,8 @@ public static final int /*long*/ JSValue
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
*/
@@ -36112,7 +36126,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueToBoolean (ctx, value);
-@@ -414,8 +414,8 @@
+@@ -414,8 +414,8 @@ public static final int JSValueToBoolean
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
@@ -36123,7 +36137,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueToNumber (ctx, value, exception);
-@@ -429,8 +429,8 @@
+@@ -429,8 +429,8 @@ public static final double JSValueToNumb
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
@@ -36134,7 +36148,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _JSValueToStringCopy (ctx, value, exception);
-@@ -446,8 +446,8 @@
+@@ -446,8 +446,8 @@ public static final int /*long*/ JSValue
* @param username cast=(const char *)
* @param password cast=(const char *)
*/
@@ -36145,7 +36159,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_auth_authenticate (auth, username, password);
-@@ -459,8 +459,8 @@
+@@ -459,8 +459,8 @@ public static final void soup_auth_authe
/**
* @param auth cast=(SoupAuth *)
*/
@@ -36156,7 +36170,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_auth_get_host (auth);
-@@ -472,8 +472,8 @@
+@@ -472,8 +472,8 @@ public static final int /*long*/ soup_au
/**
* @param auth cast=(SoupAuth *)
*/
@@ -36167,7 +36181,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_auth_get_scheme_name (auth);
-@@ -486,8 +486,8 @@
+@@ -486,8 +486,8 @@ public static final int /*long*/ soup_au
* @param jar cast=(SoupCookieJar *)
* @param cookie cast=(SoupCookie *)
*/
@@ -36178,7 +36192,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_cookie_jar_add_cookie (jar, cookie);
-@@ -499,8 +499,8 @@
+@@ -499,8 +499,8 @@ public static final void soup_cookie_jar
/**
* @param jar cast=(SoupCookieJar *)
*/
@@ -36189,7 +36203,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_cookie_jar_all_cookies (jar);
-@@ -513,8 +513,8 @@
+@@ -513,8 +513,8 @@ public static final int /*long*/ soup_co
* @param jar cast=(SoupCookieJar *)
* @param cookie cast=(SoupCookie *)
*/
@@ -36200,7 +36214,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_cookie_jar_delete_cookie (jar, cookie);
-@@ -527,8 +527,8 @@
+@@ -527,8 +527,8 @@ public static final void soup_cookie_jar
* @param jar cast=(SoupCookieJar *)
* @param uri cast=(SoupURI *)
*/
@@ -36211,7 +36225,18 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_cookie_jar_get_cookies (jar, uri, for_http);
-@@ -551,8 +551,8 @@
+@@ -537,8 +537,8 @@ public static final int /*long*/ soup_co
+ }
+ }
+
+-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 ();
+@@ -551,8 +551,8 @@ public static final int /*long*/ soup_co
* @param header cast=(const char *)
* @param origin cast=(SoupURI *)
*/
@@ -36222,7 +36247,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_cookie_parse (header, origin);
-@@ -565,8 +565,8 @@
+@@ -565,8 +565,8 @@ public static final int /*long*/ soup_co
* @method flags=getter
* @param cookie cast=(SoupCookie *)
*/
@@ -36233,7 +36258,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _SoupCookie_expires (cookie);
-@@ -575,8 +575,8 @@
+@@ -575,8 +575,8 @@ public static final int /*long*/ SoupCoo
}
}
@@ -36244,7 +36269,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _SOUP_IS_SESSION (object);
-@@ -590,8 +590,8 @@
+@@ -590,8 +590,8 @@ public static final boolean SOUP_IS_SESS
* @param message cast=(SoupMessage *)
* @param method cast=(const char *)
*/
@@ -36255,7 +36280,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_SoupMessage_method (message, method);
-@@ -604,8 +604,8 @@
+@@ -604,8 +604,8 @@ public static final void SoupMessage_met
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -36266,7 +36291,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _SoupMessage_request_body (message);
-@@ -618,8 +618,8 @@
+@@ -618,8 +618,8 @@ public static final int /*long*/ SoupMes
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -36277,7 +36302,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _SoupMessage_request_headers (message);
-@@ -634,8 +634,8 @@
+@@ -634,8 +634,8 @@ public static final int /*long*/ SoupMes
* @param data cast=(gconstpointer)
* @param length cast=(gsize)
*/
@@ -36288,7 +36313,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_message_body_append (body, use, data, length);
-@@ -647,8 +647,8 @@
+@@ -647,8 +647,8 @@ public static final void soup_message_bo
/**
* @param body cast=(SoupMessageBody *)
*/
@@ -36299,7 +36324,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_message_body_flatten (body);
-@@ -660,8 +660,8 @@
+@@ -660,8 +660,8 @@ public static final void soup_message_bo
/**
* @param msg cast=(SoupMessage *)
*/
@@ -36310,7 +36335,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_message_get_uri (msg);
-@@ -675,8 +675,8 @@
+@@ -675,8 +675,8 @@ public static final int /*long*/ soup_me
* @param name cast=(const char *)
* @param value cast=(const char *)
*/
@@ -36321,29 +36346,29 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_message_headers_append (headers, name, value);
-@@ -689,8 +689,8 @@
+@@ -689,8 +689,8 @@ public static final void soup_message_he
* @param session cast=(SoupSession *)
* @param type cast=(GType)
*/
--public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int type);
--public static final void soup_session_add_feature_by_type (int /*long*/ session, int type) {
-+public static final native void _soup_session_add_feature_by_type (long /*int*/ session, int type);
-+public static final void soup_session_add_feature_by_type (long /*int*/ session, int type) {
+-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);
-@@ -703,8 +703,8 @@
+@@ -703,8 +703,8 @@ public static final void soup_session_ad
* @param session cast=(SoupSession *)
* @param feature_type cast=(GType)
*/
--public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int feature_type);
--public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int feature_type) {
-+public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, int feature_type);
-+public static final long /*int*/ soup_session_get_feature (long /*int*/ session, int feature_type) {
+-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);
-@@ -717,8 +717,8 @@
+@@ -717,8 +717,8 @@ public static final int /*long*/ soup_se
* @param feature cast=(SoupSessionFeature *)
* @param session cast=(SoupSession *)
*/
@@ -36354,7 +36379,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_session_feature_attach (feature, session);
-@@ -731,8 +731,8 @@
+@@ -731,8 +731,8 @@ public static final void soup_session_fe
* @param feature cast=(SoupSessionFeature *)
* @param session cast=(SoupSession *)
*/
@@ -36365,7 +36390,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_session_feature_detach (feature, session);
-@@ -744,8 +744,8 @@
+@@ -744,8 +744,8 @@ public static final void soup_session_fe
/**
* @param uri cast=(SoupURI *)
*/
@@ -36376,7 +36401,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_soup_uri_free (uri);
-@@ -757,8 +757,8 @@
+@@ -757,8 +757,8 @@ public static final void soup_uri_free (
/**
* @param uri_string cast=(const char *)
*/
@@ -36387,7 +36412,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_uri_new (uri_string);
-@@ -770,8 +770,8 @@
+@@ -770,8 +770,8 @@ public static final int /*long*/ soup_ur
/**
* @param uri cast=(SoupURI *)
*/
@@ -36398,7 +36423,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _soup_uri_to_string (uri, just_path_and_query);
-@@ -785,8 +785,8 @@
+@@ -785,8 +785,8 @@ public static final int /*long*/ soup_ur
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36409,7 +36434,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_download_cancel (download);
-@@ -798,8 +798,8 @@
+@@ -798,8 +798,8 @@ public static final void webkit_download
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36420,7 +36445,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_download_get_current_size (download);
-@@ -811,8 +811,8 @@
+@@ -811,8 +811,8 @@ public static final long webkit_download
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36431,7 +36456,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_download_get_status (download);
-@@ -824,8 +824,8 @@
+@@ -824,8 +824,8 @@ public static final int webkit_download_
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36442,7 +36467,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_download_get_suggested_filename (download);
-@@ -837,8 +837,8 @@
+@@ -837,8 +837,8 @@ public static final int /*long*/ webkit_
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36453,7 +36478,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_download_get_total_size (download);
-@@ -850,8 +850,8 @@
+@@ -850,8 +850,8 @@ public static final long webkit_download
/**
* @param download cast=(WebKitDownload *)
*/
@@ -36464,7 +36489,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_download_get_uri (download);
-@@ -864,8 +864,8 @@
+@@ -864,8 +864,8 @@ public static final int /*long*/ webkit_
* @param download cast=(WebKitDownload *)
* @param destination_uri cast=(const gchar *)
*/
@@ -36475,7 +36500,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_download_set_destination_uri (download, destination_uri);
-@@ -874,8 +874,8 @@
+@@ -874,8 +874,8 @@ public static final void webkit_download
}
}
@@ -36486,7 +36511,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_get_default_session ();
-@@ -884,8 +884,8 @@
+@@ -884,8 +884,8 @@ public static final int /*long*/ webkit_
}
}
@@ -36497,7 +36522,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _WEBKIT_IS_WEB_FRAME (object);
-@@ -927,8 +927,8 @@
+@@ -927,8 +927,8 @@ public static final int webkit_minor_ver
/**
* @param request cast=(WebKitNetworkRequest *)
*/
@@ -36508,7 +36533,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_network_request_get_message (request);
-@@ -940,8 +940,8 @@
+@@ -940,8 +940,8 @@ public static final int /*long*/ webkit_
/**
* @param request cast=(WebKitNetworkRequest *)
*/
@@ -36519,7 +36544,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_network_request_get_uri (request);
-@@ -953,8 +953,8 @@
+@@ -953,8 +953,8 @@ public static final int /*long*/ webkit_
/**
* @param uri cast=(const gchar *)
*/
@@ -36530,7 +36555,18 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_network_request_new (uri);
-@@ -976,8 +976,8 @@
+@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_
+ }
+ }
+
+-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 ();
+@@ -976,8 +976,8 @@ public static final int /*long*/ webkit_
/**
* @param data_source cast=(WebKitWebDataSource *)
*/
@@ -36541,7 +36577,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_data_source_get_data (data_source);
-@@ -989,8 +989,8 @@
+@@ -989,8 +989,8 @@ public static final int /*long*/ webkit_
/**
* @param data_source cast=(WebKitWebDataSource *)
*/
@@ -36552,7 +36588,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_data_source_get_encoding (data_source);
-@@ -1002,8 +1002,8 @@
+@@ -1002,8 +1002,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36563,7 +36599,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_data_source (frame);
-@@ -1015,8 +1015,8 @@
+@@ -1015,8 +1015,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36574,7 +36610,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_global_context (frame);
-@@ -1028,8 +1028,8 @@
+@@ -1028,8 +1028,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36585,7 +36621,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_load_status (frame);
-@@ -1041,8 +1041,8 @@
+@@ -1041,8 +1041,8 @@ public static final int webkit_web_frame
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36596,7 +36632,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_parent (frame);
-@@ -1054,8 +1054,8 @@
+@@ -1054,8 +1054,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36607,7 +36643,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_title (frame);
-@@ -1067,8 +1067,8 @@
+@@ -1067,8 +1067,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36618,7 +36654,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_uri (frame);
-@@ -1080,8 +1080,8 @@
+@@ -1080,8 +1080,8 @@ public static final int /*long*/ webkit_
/**
* @param frame cast=(WebKitWebFrame *)
*/
@@ -36629,7 +36665,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_frame_get_web_view (frame);
-@@ -1093,8 +1093,8 @@
+@@ -1093,8 +1093,8 @@ public static final int /*long*/ webkit_
/**
* @param decision cast=(WebKitWebPolicyDecision *)
*/
@@ -36640,7 +36676,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_policy_decision_download (decision);
-@@ -1106,8 +1106,8 @@
+@@ -1106,8 +1106,8 @@ public static final void webkit_web_poli
/**
* @param decision cast=(WebKitWebPolicyDecision *)
*/
@@ -36651,7 +36687,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_policy_decision_ignore (decision);
-@@ -1119,8 +1119,8 @@
+@@ -1119,8 +1119,8 @@ public static final void webkit_web_poli
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36662,7 +36698,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_can_go_back (web_view);
-@@ -1132,8 +1132,8 @@
+@@ -1132,8 +1132,8 @@ public static final int webkit_web_view_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36673,7 +36709,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_can_go_forward (web_view);
-@@ -1146,8 +1146,8 @@
+@@ -1146,8 +1146,8 @@ public static final int webkit_web_view_
* @param web_view cast=(WebKitWebView *)
* @param mime_type cast=(const gchar *)
*/
@@ -36684,7 +36720,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_can_show_mime_type (web_view, mime_type);
-@@ -1160,8 +1160,8 @@
+@@ -1160,8 +1160,8 @@ public static final int webkit_web_view_
* @param web_view cast=(WebKitWebView *)
* @param script cast=(const gchar *)
*/
@@ -36695,7 +36731,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_execute_script (web_view, script);
-@@ -1173,8 +1173,8 @@
+@@ -1173,8 +1173,8 @@ public static final void webkit_web_view
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36706,7 +36742,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_load_status (web_view);
-@@ -1186,8 +1186,8 @@
+@@ -1186,8 +1186,8 @@ public static final int webkit_web_view_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36717,7 +36753,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_main_frame (web_view);
-@@ -1199,8 +1199,8 @@
+@@ -1199,8 +1199,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36728,7 +36764,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_progress (web_view);
-@@ -1212,8 +1212,8 @@
+@@ -1212,8 +1212,8 @@ public static final double webkit_web_vi
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36739,7 +36775,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_settings (web_view);
-@@ -1225,8 +1225,8 @@
+@@ -1225,8 +1225,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36750,7 +36786,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_title (web_view);
-@@ -1238,8 +1238,8 @@
+@@ -1238,8 +1238,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36761,7 +36797,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_uri (web_view);
-@@ -1251,8 +1251,8 @@
+@@ -1251,8 +1251,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36772,7 +36808,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_get_window_features (web_view);
-@@ -1264,8 +1264,8 @@
+@@ -1264,8 +1264,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36783,7 +36819,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_go_back (web_view);
-@@ -1277,8 +1277,8 @@
+@@ -1277,8 +1277,8 @@ public static final void webkit_web_view
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36794,7 +36830,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_go_forward (web_view);
-@@ -1294,8 +1294,8 @@
+@@ -1294,8 +1294,8 @@ public static final void webkit_web_view
* @param encoding cast=(const gchar *)
* @param base_uri cast=(const gchar *)
*/
@@ -36805,7 +36841,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri);
-@@ -1308,8 +1308,8 @@
+@@ -1308,8 +1308,8 @@ public static final void webkit_web_view
* @param web_view cast=(WebKitWebView *)
* @param uri cast=(const gchar *)
*/
@@ -36816,7 +36852,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_load_uri (web_view, uri);
-@@ -1318,8 +1318,8 @@
+@@ -1318,8 +1318,8 @@ public static final void webkit_web_view
}
}
@@ -36827,7 +36863,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
return _webkit_web_view_new ();
-@@ -1331,8 +1331,8 @@
+@@ -1331,8 +1331,8 @@ public static final int /*long*/ webkit_
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36838,7 +36874,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_reload (web_view);
-@@ -1344,8 +1344,8 @@
+@@ -1344,8 +1344,8 @@ public static final void webkit_web_view
/**
* @param web_view cast=(WebKitWebView *)
*/
@@ -36849,7 +36885,7 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
lock.lock();
try {
_webkit_web_view_stop_loading (web_view);
-@@ -1363,6 +1363,6 @@
+@@ -1363,6 +1363,6 @@ public static final native int JSClassDe
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -36857,10 +36893,10 @@ diff -urN x86/org/eclipse/swt/internal/webkit/WebKitGTK.java x86_64/org/eclipse/
+public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size);
}
-diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/GLCanvas.java
---- x86/org/eclipse/swt/opengl/GLCanvas.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/opengl/GLCanvas.java 2010-09-09 12:02:46.000000000 +0000
-@@ -27,9 +27,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/opengl/GLCanvas.java swt-gtk-3.6.2/org/eclipse/swt/opengl/GLCanvas.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/opengl/GLCanvas.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/opengl/GLCanvas.java 2011-03-21 11:34:23.215735487 +0000
+@@ -27,9 +27,9 @@ import org.eclipse.swt.internal.opengl.g
*/
public class GLCanvas extends Canvas {
@@ -36873,7 +36909,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
XVisualInfo vinfo;
static final int MAX_ATTRIBUTES = 32;
-@@ -104,9 +104,9 @@
+@@ -104,9 +104,9 @@ public GLCanvas (Composite parent, int s
}
glxAttrib [pos++] = 0;
OS.gtk_widget_realize (handle);
@@ -36886,7 +36922,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
if (infoPtr == 0) {
dispose ();
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
-@@ -114,9 +114,9 @@
+@@ -114,9 +114,9 @@ public GLCanvas (Composite parent, int s
vinfo = new XVisualInfo ();
GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);
OS.XFree (infoPtr);
@@ -36899,7 +36935,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
context = GLX.glXCreateContext (xDisplay, vinfo, share, true);
if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES);
GdkWindowAttr attrs = new GdkWindowAttr ();
-@@ -156,8 +156,8 @@
+@@ -156,8 +156,8 @@ public GLCanvas (Composite parent, int s
OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);
break;
case SWT.Dispose:
@@ -36910,7 +36946,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
if (context != 0) {
if (GLX.glXGetCurrentContext () == context) {
GLX.glXMakeCurrent (xDisplay, 0, 0);
-@@ -189,8 +189,8 @@
+@@ -189,8 +189,8 @@ public GLCanvas (Composite parent, int s
*/
public GLData getGLData () {
checkWidget ();
@@ -36921,7 +36957,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLData data = new GLData ();
int [] value = new int [1];
GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value);
-@@ -252,8 +252,8 @@
+@@ -252,8 +252,8 @@ public boolean isCurrent () {
public void setCurrent () {
checkWidget ();
if (GLX.glXGetCurrentContext () == context) return;
@@ -36932,7 +36968,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLX.glXMakeCurrent (xDisplay, xWindow, context);
}
-@@ -267,8 +267,8 @@
+@@ -267,8 +267,8 @@ public void setCurrent () {
*/
public void swapBuffers () {
checkWidget ();
@@ -36943,10 +36979,10 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLX.glXSwapBuffers (xDisplay, xWindow);
}
}
-diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/printing/PrintDialog.java
---- x86/org/eclipse/swt/printing/PrintDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/printing/PrintDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -34,7 +34,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/printing/PrintDialog.java swt-gtk-3.6.2/org/eclipse/swt/printing/PrintDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/printing/PrintDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/printing/PrintDialog.java 2011-03-21 11:34:23.715728423 +0000
+@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.*;
public class PrintDialog extends Dialog {
PrinterData printerData = new PrinterData();
@@ -36955,7 +36991,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int index;
byte [] settingsData;
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ public PrinterData open() {
return Printer.getDefaultPrinterData();
} else {
byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true);
@@ -36964,7 +37000,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {
topHandle = OS.gtk_widget_get_parent(topHandle);
}
-@@ -306,8 +306,8 @@
+@@ -306,8 +306,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. */
@@ -36975,7 +37011,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (printerData.otherData != null) {
Printer.restore(printerData.otherData, settings, page_setup);
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ public PrinterData open() {
OS.g_object_unref(settings);
OS.g_object_unref(page_setup);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
@@ -36984,7 +37020,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
OS.gtk_window_group_add_window (group, handle);
}
OS.gtk_window_set_modal(handle, true);
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ public PrinterData open() {
Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
int signalId = 0;
@@ -36993,7 +37029,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
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);
-@@ -385,7 +385,7 @@
+@@ -385,7 +385,7 @@ public PrinterData open() {
OS.g_signal_remove_emission_hook (signalId, hookId);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -37002,7 +37038,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (printer != 0) {
/* Get state from print dialog. */
settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref
-@@ -399,7 +399,7 @@
+@@ -399,7 +399,7 @@ public PrinterData open() {
case OS.GTK_PRINT_PAGES_RANGES:
data.scope = PrinterData.PAGE_RANGE;
int[] num_ranges = new int[1];
@@ -37011,7 +37047,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int [] pageRange = new int[2];
int length = num_ranges[0];
int min = Integer.MAX_VALUE, max = 0;
-@@ -421,7 +421,7 @@
+@@ -421,7 +421,7 @@ public PrinterData open() {
data.printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
if (data.printToFile) {
@@ -37020,7 +37056,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -434,7 +434,7 @@
+@@ -434,7 +434,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$
@@ -37029,7 +37065,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
index = 0;
settingsData = new byte[1024];
-@@ -450,7 +450,7 @@
+@@ -450,7 +450,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$
@@ -37038,7 +37074,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
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$
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ public PrinterData open() {
}
}
@@ -37047,7 +37083,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (key);
byte [] keyBuffer = new byte [length];
OS.memmove (keyBuffer, key, length);
-@@ -491,7 +491,7 @@
+@@ -491,7 +491,7 @@ void store(String key, boolean value) {
store(key, String.valueOf(value));
}
@@ -37056,10 +37092,10 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (value);
byte [] valueBuffer = new byte [length];
OS.memmove (valueBuffer, value, length);
-diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printing/Printer.java
---- x86/org/eclipse/swt/printing/Printer.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/printing/Printer.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,12 +46,12 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/printing/Printer.java swt-gtk-3.6.2/org/eclipse/swt/printing/Printer.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/printing/Printer.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/printing/Printer.java 2011-03-21 11:34:23.715728423 +0000
+@@ -46,12 +46,12 @@ public final class Printer extends Devic
static PrinterData [] printerList;
PrinterData data;
@@ -37078,7 +37114,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
/**
* whether or not a GC was created for this printer
-@@ -82,18 +82,18 @@
+@@ -82,18 +82,18 @@ public static PrinterData[] getPrinterLi
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -37100,7 +37136,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
int length = printerList.length;
PrinterData [] newList = new PrinterData [length + 1];
System.arraycopy (printerList, 0, newList, 0, length);
-@@ -129,18 +129,18 @@
+@@ -129,18 +129,18 @@ public static PrinterData getDefaultPrin
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -37122,7 +37158,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (OS.gtk_printer_is_default(printer)) {
printerList[0] = printerDataFromGtkPrinter(printer);
return 1;
-@@ -150,9 +150,9 @@
+@@ -150,9 +150,9 @@ static int /*long*/ GtkPrinterFunc_Defau
return 0;
}
@@ -37134,7 +37170,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
printer = 0;
OS.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ int /*long*/ gtkPrinterFromPrinterData()
return printer;
}
@@ -37143,7 +37179,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
PrinterData pd = printerDataFromGtkPrinter(printer);
if (pd.driver.equals(data.driver) && pd.name.equals(data.name)) {
this.printer = printer;
-@@ -172,9 +172,9 @@
+@@ -172,9 +172,9 @@ int /*long*/ GtkPrinterFunc_FindNamedPri
return 0;
}
@@ -37156,7 +37192,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ static PrinterData printerDataFromGtkPri
/*
* Restore printer settings and page_setup data from data.
*/
@@ -37165,7 +37201,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
settingsData = data;
start = end = 0;
while (end < settingsData.length && settingsData[end] != 0) {
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ static void restore(byte [] data, int /*
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$
@@ -37174,7 +37210,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (custom) {
if (ppd_name.length > 0) {
paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
-@@ -350,8 +350,8 @@
+@@ -350,8 +350,8 @@ static byte [] restoreBytes(String key,
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -37185,7 +37221,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -370,11 +370,11 @@
+@@ -370,11 +370,11 @@ public Font getSystemFont () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -37200,7 +37236,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
if (data != null) {
if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-@@ -412,7 +412,7 @@
+@@ -412,7 +412,7 @@ public int /*long*/ internal_new_GC(GCDa
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -37209,10 +37245,10 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (data != null) isGCCreated = false;
OS.g_object_unref (gdkGC);
if (data != null) {
-diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program/Program.java
---- x86/org/eclipse/swt/program/Program.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/program/Program.java 2010-09-09 12:02:46.000000000 +0000
-@@ -42,10 +42,10 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/program/Program.java swt-gtk-3.6.2/org/eclipse/swt/program/Program.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/program/Program.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/program/Program.java 2011-03-21 11:34:23.295734363 +0000
+@@ -42,10 +42,10 @@ public final class Program {
*/
boolean gnomeExpectUri;
@@ -37225,7 +37261,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
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 @@
+@@ -74,11 +74,11 @@ static int getDesktop(final Display disp
int desktop = DESKTOP_UNKNOWN;
/* Get the list of properties on the root window. */
@@ -37241,7 +37277,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (propList != 0) {
OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF));
OS.XFree(propList);
-@@ -97,10 +97,10 @@
+@@ -97,10 +97,10 @@ static int getDesktop(final Display disp
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);
@@ -37254,12 +37290,12 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
display.setData(ICON_THEME_DATA, new LONG(icon_theme));
display.addListener(SWT.Dispose, new Listener() {
public void handleEvent(Event event) {
-@@ -116,10 +116,10 @@
- });
- /* Check for the existence of libgio libraries */
- byte[] buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
-- int /*long*/ libgio = OS.dlopen(buffer, OS.RTLD_LAZY);
-+ long /*int*/ libgio = OS.dlopen(buffer, OS.RTLD_LAZY);
+@@ -125,10 +125,10 @@ static int getDesktop(final Display disp
+ } 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);
@@ -37267,7 +37303,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (g_app_info_launch_default_for_uri != 0) {
desktop = DESKTOP_GIO;
}
-@@ -127,10 +127,10 @@
+@@ -136,10 +136,10 @@ static int getDesktop(final Display disp
} else {
/* Check for libgnomevfs-2 version 2.4 */
buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
@@ -37280,7 +37316,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (gnome_vfs_url_show != 0) {
desktop = DESKTOP_GNOME_24;
}
-@@ -147,7 +147,7 @@
+@@ -156,7 +156,7 @@ static int getDesktop(final Display disp
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true);
@@ -37289,7 +37325,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
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;
-@@ -162,7 +162,7 @@
+@@ -171,7 +171,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);
@@ -37298,7 +37334,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
OS.memmove(ptr, fileArg, fileArg.length);
DtActionArg args = new DtActionArg();
args.argClass = CDE.DtACTION_FILE;
-@@ -192,7 +192,7 @@
+@@ -201,7 +201,7 @@ static String cde_getAttribute(String da
byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true);
byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true);
byte[] optNameBuf = null;
@@ -37307,7 +37343,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (attrValue == 0) return null;
int length = OS.strlen(attrValue);
byte[] attrValueBuf = new byte[length];
-@@ -205,11 +205,11 @@
+@@ -214,11 +214,11 @@ static String cde_getAttribute(String da
static Hashtable cde_getDataTypeInfo() {
Hashtable dataTypeInfo = new Hashtable();
int index;
@@ -37321,7 +37357,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
OS.memmove(dataType, dataTypeList + (index++ * 4), 4);
while (dataType[0] != 0) {
int length = OS.strlen(dataType[0]);
-@@ -293,13 +293,13 @@
+@@ -302,13 +302,13 @@ static boolean cde_init(Display display)
/* Use the character encoding for the default locale */
CDE.XtToolkitInitialize();
@@ -37339,7 +37375,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0);
CDE.XtSetMappedWhenManaged (cdeShell, false);
CDE.XtResizeWidget (cdeShell, 10, 10, 0);
-@@ -365,10 +365,10 @@
+@@ -374,10 +374,10 @@ static String[] parseCommand(String cmd)
*/
boolean gnome_24_execute(String fileName) {
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);
@@ -37353,7 +37389,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);
GNOME.gnome_vfs_mime_application_free(ptr);
GNOME.g_free(uri);
-@@ -381,7 +381,7 @@
+@@ -390,7 +390,7 @@ boolean gnome_24_execute(String fileName
*/
static boolean gnome_24_launch(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -37362,7 +37398,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int result = GNOME.gnome_vfs_url_show(uri);
GNOME.g_free(uri);
return (result == GNOME.GNOME_VFS_OK);
-@@ -394,7 +394,7 @@
+@@ -403,7 +403,7 @@ boolean gnome_execute(String fileName) {
if (gnomeExpectUri) {
/* Convert the given path into a URL */
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -37371,7 +37407,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (uri != 0) {
int length = OS.strlen(uri);
if (length > 0) {
-@@ -458,24 +458,24 @@
+@@ -467,24 +467,24 @@ ImageData gnome_getImageData() {
*/
static Hashtable gnome_getMimeInfo() {
Hashtable mimeInfo = new Hashtable();
@@ -37404,7 +37440,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int extensionLength = OS.strlen(extensionPtr);
byte[] extensionBuffer = new byte[extensionLength];
OS.memmove(extensionBuffer, extensionPtr, extensionLength);
-@@ -497,7 +497,7 @@
+@@ -506,7 +506,7 @@ static String gnome_getMimeType(String e
String mimeType = null;
String fileName = "swt" + extension;
byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -37413,7 +37449,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (typeName != 0) {
int length = OS.strlen(typeName);
if (length > 0) {
-@@ -512,7 +512,7 @@
+@@ -521,7 +521,7 @@ static String gnome_getMimeType(String e
static Program gnome_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);
@@ -37422,7 +37458,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (ptr != 0) {
program = new Program();
program.display = display;
-@@ -529,9 +529,9 @@
+@@ -538,9 +538,9 @@ static Program gnome_getProgram(Display
buffer = new byte[length + 1];
OS.memmove(buffer, application.id, length);
LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
@@ -37434,7 +37470,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
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);
-@@ -562,8 +562,8 @@
+@@ -571,8 +571,8 @@ static boolean gnome_isExecutable(String
if (!GNOME.gnome_vfs_is_executable_command_string(fileNameBuffer)) return false;
/* check if the mime type is executable */
@@ -37445,7 +37481,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
GNOME.g_free(uri);
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
-@@ -712,16 +712,16 @@
+@@ -721,16 +721,16 @@ static Program[] getPrograms(Display dis
ImageData gio_getImageData() {
if (iconPath == null) return null;
ImageData data = null;
@@ -37467,7 +37503,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
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);
-@@ -756,7 +756,7 @@
+@@ -765,7 +765,7 @@ ImageData gio_getImageData() {
}
static Hashtable gio_getMimeInfo() {
@@ -37476,7 +37512,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
/*
* The file 'globs' contain the file extensions
* associated to the mime-types. Each line that has
-@@ -766,10 +766,10 @@
+@@ -775,10 +775,10 @@ static Hashtable gio_getMimeInfo() {
*/
byte[] buffer = Converter.wcsToMbcs (null, "/usr/share/mime/globs", true);
mimeDatabase = OS.g_file_new_for_path (buffer);
@@ -37489,7 +37525,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
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);
-@@ -778,11 +778,11 @@
+@@ -787,11 +787,11 @@ static Hashtable gio_getMimeInfo() {
} else {
mimeTable = new Hashtable();
modTime = modTimestamp[0];
@@ -37503,7 +37539,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
while (linePtr != 0) {
byte[] lineBytes = new byte[length[0]];
OS.memmove(lineBytes, linePtr, length[0]);
-@@ -837,19 +837,19 @@
+@@ -846,19 +846,19 @@ static String gio_getMimeType(String ext
static Program gio_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs (null, mimeType, true);
@@ -37526,7 +37562,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (applicationName != 0) {
length = OS.strlen (applicationName);
if (length > 0) {
-@@ -858,7 +858,7 @@
+@@ -867,7 +867,7 @@ static Program gio_getProgram (Display d
program.name = new String (Converter.mbcsToWcs (null, buffer));
}
}
@@ -37535,7 +37571,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (applicationCommand != 0) {
length = OS.strlen (applicationCommand);
if (length > 0) {
-@@ -868,9 +868,9 @@
+@@ -877,9 +877,9 @@ static Program gio_getProgram (Display d
}
}
program.gnomeExpectUri = OS.g_app_info_supports_uris(application);
@@ -37547,7 +37583,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (icon_name != 0) {
length = OS.strlen(icon_name);
if (length > 0) {
-@@ -886,12 +886,12 @@
+@@ -895,12 +895,12 @@ static Program gio_getProgram (Display d
}
static Program[] gio_getPrograms(Display display) {
@@ -37563,7 +37599,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (application != 0) {
//TODO: Should the list be filtered or not?
// if (OS.g_app_info_should_show(application)) {
-@@ -913,13 +913,13 @@
+@@ -922,13 +922,13 @@ static boolean gio_isExecutable(String f
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;
@@ -37580,7 +37616,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (contentType != 0) {
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
result = OS.g_content_type_is_a(contentType, exeType);
-@@ -941,9 +941,9 @@
+@@ -950,9 +950,9 @@ static boolean gio_isExecutable(String f
static boolean gio_launch(String fileName) {
boolean result = false;
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
@@ -37592,7 +37628,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (uri != 0) {
result = OS.g_app_info_launch_default_for_uri (uri, 0, 0);
OS.g_free(uri);
-@@ -960,18 +960,18 @@
+@@ -969,18 +969,18 @@ boolean gio_execute(String fileName) {
boolean result = false;
byte[] commandBuffer = Converter.wcsToMbcs (null, command, true);
byte[] nameBuffer = Converter.wcsToMbcs (null, name, true);
@@ -37614,10 +37650,10 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
result = OS.g_app_info_launch (application, list, 0, 0);
OS.g_list_free (list);
OS.g_object_unref (file);
-diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/Button.java
---- x86/org/eclipse/swt/widgets/Button.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Button.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,7 +46,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Button.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Button.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Button.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Button.java 2011-03-21 11:34:23.825726858 +0000
+@@ -46,7 +46,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Button extends Control {
@@ -37626,7 +37662,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
boolean selected, grayed;
ImageList imageList;
Image image;
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ public Point computeSize (int wHint, int
}
if (wHint != SWT.DEFAULT || hHint != SWT.DEFAULT) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) != 0) {
@@ -37635,7 +37671,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
GtkBorder border = new GtkBorder ();
OS.gtk_widget_style_get (handle, OS.default_border, buffer, 0);
if (buffer[0] != 0) {
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ void deregister () {
if (arrowHandle != 0) display.removeWidget (arrowHandle);
}
@@ -37644,7 +37680,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if (labelHandle != 0) return labelHandle;
return super.fontHandle ();
}
-@@ -388,14 +388,14 @@
+@@ -388,14 +388,14 @@ public String getText () {
return text;
}
@@ -37662,7 +37698,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if ((style & SWT.RADIO) != 0) {
if ((parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) {
setSelection (!selected);
-@@ -417,8 +417,8 @@
+@@ -417,8 +417,8 @@ int /*long*/ gtk_clicked (int /*long*/ w
return 0;
}
@@ -37673,7 +37709,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -428,8 +428,8 @@
+@@ -428,8 +428,8 @@ int /*long*/ gtk_focus_in_event (int /*l
return result;
}
@@ -37684,7 +37720,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -441,8 +441,8 @@
+@@ -441,8 +441,8 @@ int /*long*/ gtk_focus_out_event (int /*
return result;
}
@@ -37695,7 +37731,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
if ((style & SWT.RADIO) != 0) selected = getSelection ();
return result;
-@@ -646,7 +646,7 @@
+@@ -646,7 +646,7 @@ void setBackgroundColor (GdkColor color)
if (imageHandle != 0) setBackgroundColor(imageHandle, color);
}
@@ -37704,7 +37740,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -721,7 +721,7 @@
+@@ -721,7 +721,7 @@ public void setImage (Image image) {
if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -37713,10 +37749,10 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/Canvas.java
---- x86/org/eclipse/swt/widgets/Canvas.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Canvas.java 2010-09-09 12:02:46.000000000 +0000
-@@ -144,46 +144,46 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Canvas.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Canvas.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Canvas.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Canvas.java 2011-03-21 11:34:23.735728129 +0000
+@@ -144,46 +144,46 @@ public IME getIME () {
return ime;
}
@@ -37775,7 +37811,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
}
return super.gtk_preedit_changed (imcontext);
-@@ -249,16 +249,16 @@
+@@ -249,16 +249,16 @@ public void scroll (int destX, int destY
if (!isVisible ()) return;
boolean isFocus = caret != null && caret.isFocusCaret ();
if (isFocus) caret.killFocus ();
@@ -37796,7 +37832,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
OS.gdk_region_subtract (invalidateRegion, visibleRegion);
OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);
GdkRectangle copyRect = new GdkRectangle();
-@@ -275,7 +275,7 @@
+@@ -275,7 +275,7 @@ public void scroll (int destX, int destY
// GC gc = new GC (this);
// gc.copyArea (x, y, width, height, destX, destY);
// gc.dispose ();
@@ -37805,7 +37841,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
OS.gdk_gc_set_exposures (gdkGC, true);
OS.gdk_draw_drawable (window, gdkGC, window, copyRect.x, copyRect.y, copyRect.x + deltaX, copyRect.y + deltaY, copyRect.width, copyRect.height);
OS.g_object_unref (gdkGC);
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,7 @@ public void setIME (IME ime) {
}
void updateCaret () {
@@ -37814,10 +37850,10 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
if (imHandle == 0) return;
GdkRectangle rect = new GdkRectangle ();
rect.x = caret.x;
-diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/Caret.java
---- x86/org/eclipse/swt/widgets/Caret.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Caret.java 2010-09-09 12:02:46.000000000 +0000
-@@ -97,13 +97,13 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Caret.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Caret.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Caret.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Caret.java 2011-03-21 11:34:23.815727004 +0000
+@@ -97,13 +97,13 @@ void createWidget (int index) {
boolean drawCaret () {
if (parent == null) return false;
if (parent.isDisposed ()) return false;
@@ -37834,10 +37870,10 @@ diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/
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 -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/widgets/ColorDialog.java
---- x86/org/eclipse/swt/widgets/ColorDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ColorDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -114,19 +114,19 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ColorDialog.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ColorDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ColorDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ColorDialog.java 2011-03-21 11:34:23.755727838 +0000
+@@ -114,19 +114,19 @@ public RGB getRGB () {
*/
public RGB open () {
byte [] buffer = Converter.wcsToMbcs (null, title, true);
@@ -37861,7 +37897,7 @@ diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wi
OS.gtk_window_group_add_window (group, handle);
}
OS.gtk_window_set_modal (handle, true);
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ public RGB open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -37870,10 +37906,10 @@ diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wi
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 -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/Combo.java
---- x86/org/eclipse/swt/widgets/Combo.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Combo.java 2010-09-09 12:02:46.000000000 +0000
-@@ -57,9 +57,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Combo.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Combo.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Combo.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Combo.java 2011-03-21 11:34:23.745727976 +0000
+@@ -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 {
@@ -37885,7 +37921,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int fixStart = -1, fixEnd = -1;
String [] items = new String [0];
boolean ignoreSelect, lockText, selectionAdded;
-@@ -182,13 +182,13 @@
+@@ -182,13 +182,13 @@ public void add (String string, int inde
* stopping the "delete" and "insert_text" signal emission.
*/
ignoreSelect = lockText = true;
@@ -37902,7 +37938,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_list_insert_items (listHandle, items, index);
ignoreSelect = lockText = false;
}
-@@ -343,9 +343,9 @@
+@@ -343,9 +343,9 @@ void clearText () {
if ((style & SWT.READ_ONLY) != 0) {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) {
@@ -37915,7 +37951,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -369,10 +369,10 @@
+@@ -369,10 +369,10 @@ public Point computeSize (int wHint, int
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (entryHandle);
@@ -37928,7 +37964,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
int [] property = new int [1];
-@@ -388,7 +388,7 @@
+@@ -388,7 +388,7 @@ public Point computeSize (int wHint, int
GtkRequisition arrowRequesition = new GtkRequisition ();
OS.gtk_widget_size_request (buttonHandle, arrowRequesition);
GtkRequisition listRequesition = new GtkRequisition ();
@@ -37937,7 +37973,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_size_request (listParent != 0 ? listParent : listHandle, listRequesition);
width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4;
-@@ -421,7 +421,7 @@
+@@ -421,7 +421,7 @@ void createHandle (int index) {
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -37946,7 +37982,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -486,14 +486,14 @@
+@@ -486,14 +486,14 @@ void createHandle (int index) {
listHandle = combo.list;
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
@@ -37964,7 +38000,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (modalGroup != 0) {
OS.gtk_window_group_add_window (modalGroup, popupHandle);
}
-@@ -506,11 +506,11 @@
+@@ -506,11 +506,11 @@ void createHandle (int index) {
* to hook events. The fix is to find the first child that is
* not the entry or list and assume this is the arrow handle.
*/
@@ -37978,7 +38014,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (childHandle != entryHandle && childHandle != listHandle) {
buttonHandle = childHandle;
break;
-@@ -553,15 +553,15 @@
+@@ -553,15 +553,15 @@ void deregister () {
if (listHandle != 0) display.removeWidget (listHandle);
if (popupHandle != 0) display.removeWidget (popupHandle);
if (menuHandle != 0) display.removeWidget (menuHandle);
@@ -37997,7 +38033,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -570,18 +570,18 @@
+@@ -570,18 +570,18 @@ boolean filterKey (int keyval, int /*lon
return false;
}
@@ -38023,7 +38059,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (newToplevel == oldToplevel) {
isFound = true;
break;
-@@ -610,9 +610,9 @@
+@@ -610,9 +610,9 @@ void findButtonHandle() {
*/
OS.gtk_container_forall (handle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -38035,7 +38071,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_BUTTON (widget)) {
buttonHandle = widget;
break;
-@@ -627,9 +627,9 @@
+@@ -627,9 +627,9 @@ void findButtonHandle() {
void findMenuHandle() {
OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -38047,7 +38083,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) {
menuHandle = widget;
break;
-@@ -641,7 +641,7 @@
+@@ -641,7 +641,7 @@ void findMenuHandle() {
}
}
@@ -38056,7 +38092,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (popupHandle != 0) {
if (group != 0) {
OS.gtk_window_group_add_window (group, popupHandle);
-@@ -663,7 +663,7 @@
+@@ -663,7 +663,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -38065,7 +38101,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -673,12 +673,12 @@
+@@ -673,12 +673,12 @@ void fixIM () {
gdkEventKey = 0;
}
@@ -38080,7 +38116,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
}
-@@ -708,9 +708,9 @@
+@@ -708,9 +708,9 @@ void hookEvents () {
}
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |
OS.GDK_BUTTON_RELEASE_MASK;
@@ -38092,7 +38128,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventHandle != 0) {
/* Connect the mouse signals */
OS.gtk_widget_add_events (eventHandle, eventMask);
-@@ -734,7 +734,7 @@
+@@ -734,7 +734,7 @@ void hookEvents () {
}
}
}
@@ -38101,7 +38137,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -745,7 +745,7 @@
+@@ -745,7 +745,7 @@ void hookEvents () {
if (menuHandle != 0) OS.g_signal_connect_closure(menuHandle, OS.selection_done, display.closures[SELECTION_DONE], true);
}
@@ -38110,7 +38146,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
}
-@@ -770,8 +770,8 @@
+@@ -770,8 +770,8 @@ public void deselect (int index) {
}
} else {
ignoreSelect = true;
@@ -38121,7 +38157,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
if (selected) {
OS.gtk_list_unselect_all (listHandle);
-@@ -812,9 +812,9 @@
+@@ -812,9 +812,9 @@ boolean dragDetect(int x, int y, boolean
if (filter && entryHandle != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -38133,7 +38169,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
Point selection = getSelection ();
if (selection.x <= position && position < selection.y) {
-@@ -828,11 +828,11 @@
+@@ -828,11 +828,11 @@ boolean dragDetect(int x, int y, boolean
return super.dragDetect (x, y, filter, consume);
}
@@ -38147,7 +38183,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return paintWindow ();
}
-@@ -997,7 +997,7 @@
+@@ -997,7 +997,7 @@ public Point getSelection () {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) length = getItem (index).length ();
} else {
@@ -38156,7 +38192,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (str != 0) length = (int)/*64*/OS.g_utf8_strlen (str, -1);
}
return new Point (0, length);
-@@ -1027,10 +1027,10 @@
+@@ -1027,10 +1027,10 @@ public int getSelectionIndex () {
return OS.gtk_combo_box_get_active (handle);
}
int index = 0, result = -1;
@@ -38170,7 +38206,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED) {
result = index;
break;
-@@ -1057,7 +1057,7 @@
+@@ -1057,7 +1057,7 @@ public int getSelectionIndex () {
public String getText () {
checkWidget();
if (entryHandle != 0) {
@@ -38179,7 +38215,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -1138,12 +1138,12 @@
+@@ -1138,12 +1138,12 @@ public int getVisibleItemCount () {
return visibleCount;
}
@@ -38194,7 +38230,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1159,7 +1159,7 @@
+@@ -1159,7 +1159,7 @@ int /*long*/ gtk_button_press_event (int
return super.gtk_button_press_event (widget, event);
}
@@ -38203,7 +38239,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (widget == handle) {
if (entryHandle == 0) {
-@@ -1184,7 +1184,7 @@
+@@ -1184,7 +1184,7 @@ int /*long*/ gtk_changed (int /*long*/ w
}
} else {
if (!ignoreSelect) {
@@ -38212,7 +38248,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
OS.memmove (buffer, ptr, length);
-@@ -1205,7 +1205,7 @@
+@@ -1205,7 +1205,7 @@ int /*long*/ gtk_changed (int /*long*/ w
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -38221,7 +38257,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1224,7 +1224,7 @@
+@@ -1224,7 +1224,7 @@ int /*long*/ gtk_changed (int /*long*/ w
return 0;
}
@@ -38230,7 +38266,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (entryHandle)) return 0;
int length = OS.strlen (text);
-@@ -1262,7 +1262,7 @@
+@@ -1262,7 +1262,7 @@ int /*long*/ gtk_commit (int /*long*/ im
return 0;
}
@@ -38239,7 +38275,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text);
-@@ -1289,7 +1289,7 @@
+@@ -1289,7 +1289,7 @@ int /*long*/ gtk_delete_text (int /*long
return 0;
}
@@ -38248,7 +38284,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1309,7 +1309,7 @@
+@@ -1309,7 +1309,7 @@ int /*long*/ gtk_event_after (int /*long
switch (event.type) {
case OS.GDK_BUTTON_PRESS: {
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0) && !selectionAdded) {
@@ -38257,7 +38293,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
menuHandle = grabHandle;
-@@ -1354,12 +1354,12 @@
+@@ -1354,12 +1354,12 @@ int /*long*/ gtk_event_after (int /*long
return super.gtk_event_after(widget, gdkEvent);
}
@@ -38272,7 +38308,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text);
-@@ -1373,7 +1373,7 @@
+@@ -1373,7 +1373,7 @@ int /*long*/ gtk_insert_text (int /*long
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -38281,7 +38317,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -1405,8 +1405,8 @@
+@@ -1405,8 +1405,8 @@ int /*long*/ gtk_insert_text (int /*long
return 0;
}
@@ -38292,7 +38328,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (result != 0) {
gdkEventKey = 0;
fixIM ();
-@@ -1456,7 +1456,7 @@
+@@ -1456,7 +1456,7 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -38301,7 +38337,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1464,7 +1464,7 @@
+@@ -1464,7 +1464,7 @@ int /*long*/ gtk_populate_popup (int /*l
return 0;
}
@@ -38310,7 +38346,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int index = OS.gtk_combo_box_get_active (handle);
if (indexSelected == -1){
indexSelected = index;
-@@ -1533,14 +1533,14 @@
+@@ -1533,14 +1533,14 @@ boolean isFocusHandle(int widget) {
return super.isFocusHandle (widget);
}
@@ -38329,7 +38365,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1565,7 +1565,7 @@
+@@ -1565,7 +1565,7 @@ public void paste () {
if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);
}
@@ -38338,7 +38374,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -1576,7 +1576,7 @@
+@@ -1576,7 +1576,7 @@ void register () {
if (listHandle != 0) display.addWidget (listHandle, this);
if (popupHandle != 0) display.addWidget (popupHandle, this);
if (menuHandle != 0) display.addWidget (menuHandle, this);
@@ -38347,7 +38383,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1620,10 +1620,10 @@
+@@ -1620,10 +1620,10 @@ public void remove (int index) {
OS.gtk_combo_box_remove_text (handle, index);
} else {
ignoreSelect = true;
@@ -38361,7 +38397,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_list_remove_items (listHandle, items);
OS.g_list_free (items);
OS.g_list_free (children);
-@@ -1670,10 +1670,10 @@
+@@ -1670,10 +1670,10 @@ public void remove (int start, int end)
} else {
boolean selected = false;
ignoreSelect = true;
@@ -38375,7 +38411,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
selected |= OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
items = OS.g_list_append (items, item);
}
-@@ -1864,7 +1864,7 @@
+@@ -1864,7 +1864,7 @@ int setBounds (int x, int y, int width,
return super.setBounds (x, y, width, newHeight, move, resize);
}
@@ -38384,7 +38420,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
-@@ -1885,11 +1885,11 @@
+@@ -1885,11 +1885,11 @@ void setFontDescription (int /*long*/ fo
OS.gtk_widget_modify_font (entryHandle, font);
if (listHandle != 0) {
OS.gtk_widget_modify_font (listHandle, font);
@@ -38398,7 +38434,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_modify_font (widget, font);
}
OS.g_list_free (itemsList);
-@@ -1907,11 +1907,11 @@
+@@ -1907,11 +1907,11 @@ void setForegroundColor (GdkColor color)
setForegroundColor (entryHandle, color);
if (listHandle != 0) {
setForegroundColor (listHandle, color);
@@ -38412,7 +38448,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
setForegroundColor (widget, color);
}
OS.g_list_free (itemsList);
-@@ -1952,9 +1952,9 @@
+@@ -1952,9 +1952,9 @@ public void setItem (int index, String s
}
} else {
ignoreSelect = true;
@@ -38425,7 +38461,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_label_set_text (label, buffer);
OS.g_list_free (children);
ignoreSelect = false;
-@@ -2000,15 +2000,15 @@
+@@ -2000,15 +2000,15 @@ public void setItems (String [] items) {
} else {
lockText = ignoreSelect = true;
OS.gtk_list_clear_items (listHandle, 0, -1);
@@ -38444,7 +38480,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
setForegroundColor (label, color);
OS.gtk_widget_modify_font (label, font);
OS.gtk_widget_set_direction (label, direction);
-@@ -2086,11 +2086,11 @@
+@@ -2086,11 +2086,11 @@ public void setOrientation (int orientat
if (entryHandle != 0) OS.gtk_widget_set_direction (entryHandle, dir);
if (listHandle != 0) {
OS.gtk_widget_set_direction (listHandle, dir);
@@ -38458,7 +38494,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_set_direction (widget, dir);
}
OS.g_list_free (itemsList);
-@@ -2177,7 +2177,7 @@
+@@ -2177,7 +2177,7 @@ public void setText (String string) {
* fix is to block the firing of these events and fire them ourselves in a consistent manner.
*/
if (hooks (SWT.Verify) || filters (SWT.Verify)) {
@@ -38467,7 +38503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
string = verifyText (string, 0, (int)/*64*/OS.g_utf8_strlen (ptr, -1));
if (string == null) return;
}
-@@ -2261,9 +2261,9 @@
+@@ -2261,9 +2261,9 @@ boolean translateTraversal (GdkEventKey
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -38479,7 +38515,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2282,7 +2282,7 @@
+@@ -2282,7 +2282,7 @@ String verifyText (String string, int st
event.text = string;
event.start = start;
event.end = end;
@@ -38488,10 +38524,10 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widgets/Composite.java
---- x86/org/eclipse/swt/widgets/Composite.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Composite.java 2010-09-09 12:02:46.000000000 +0000
-@@ -47,8 +47,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Composite.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Composite.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Composite.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Composite.java 2011-03-21 11:34:23.895725860 +0000
+@@ -47,8 +47,8 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Composite extends Scrollable {
@@ -38502,7 +38538,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Layout layout;
Control[] tabList;
int layoutCount, backgroundMode;
-@@ -101,15 +101,15 @@
+@@ -101,15 +101,15 @@ static int checkStyle (int style) {
}
Control [] _getChildren () {
@@ -38522,7 +38558,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ protected void checkSubclass () {
/* Do nothing - Subclassing is allowed */
}
@@ -38531,7 +38567,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (scrolledHandle != 0) return 0;
return super.childStyle ();
}
-@@ -264,9 +264,9 @@
+@@ -264,9 +264,9 @@ void createHandle (int index, boolean fi
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
}
@@ -38543,7 +38579,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
if (scrolledHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
-@@ -364,7 +364,7 @@
+@@ -364,7 +364,7 @@ public void drawBackground (GC gc, int x
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
@@ -38552,7 +38588,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
-@@ -372,15 +372,15 @@
+@@ -372,15 +372,15 @@ public void drawBackground (GC gc, int x
Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY);
x += pt.x + offsetX;
y += pt.y + offsetY;
@@ -38574,7 +38610,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((data.style & SWT.MIRRORED) != 0) {
-@@ -398,7 +398,7 @@
+@@ -398,7 +398,7 @@ public void drawBackground (GC gc, int x
Cairo.cairo_fill (cairo);
Cairo.cairo_restore (cairo);
} else {
@@ -38583,7 +38619,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
GdkGCValues values = new GdkGCValues ();
OS.gdk_gc_get_values (gdkGC, values);
if (control.backgroundImage != null) {
-@@ -456,7 +456,7 @@
+@@ -456,7 +456,7 @@ void fixChildren (Shell newShell, Shell
}
}
@@ -38592,7 +38628,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Control[] controls = _getChildren ();
for (int i = 0; i < controls.length; i++) {
controls[i].fixModal (group, modalGroup);
-@@ -495,15 +495,15 @@
+@@ -495,15 +495,15 @@ void fixTabList (Control control) {
void fixZOrder () {
if ((state & CANVAS) != 0) return;
@@ -38614,7 +38650,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != redrawWindow) {
OS.gdk_window_get_user_data (window, userData);
if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {
-@@ -516,12 +516,12 @@
+@@ -516,12 +516,12 @@ void fixZOrder () {
}
}
@@ -38629,7 +38665,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -582,7 +582,7 @@
+@@ -582,7 +582,7 @@ int getChildrenCount () {
* NOTE: The current implementation will count
* non-registered children.
*/
@@ -38638,7 +38674,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -596,7 +596,7 @@
+@@ -596,7 +596,7 @@ public Rectangle getClientArea () {
return new Rectangle (0, 0, 0, 0);
}
forceResize ();
@@ -38647,7 +38683,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (0, 0, width, height);
-@@ -677,8 +677,8 @@
+@@ -677,8 +677,8 @@ public Control [] getTabList () {
return tabList;
}
@@ -38658,7 +38694,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
-@@ -692,7 +692,7 @@
+@@ -692,7 +692,7 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -38667,7 +38703,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if ((state & OBSCURED) != 0) return 0;
if ((state & CANVAS) == 0) {
return super.gtk_expose_event (widget, eventPtr);
-@@ -703,7 +703,7 @@
+@@ -703,7 +703,7 @@ int /*long*/ gtk_expose_event (int /*lon
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
@@ -38676,7 +38712,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
int [] n_rectangles = new int [1];
OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);
GdkRectangle rect = new GdkRectangle ();
-@@ -715,7 +715,7 @@
+@@ -715,7 +715,7 @@ int /*long*/ gtk_expose_event (int /*lon
event.width = rect.width;
event.height = rect.height;
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
@@ -38685,7 +38721,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
OS.gdk_region_union_with_rect (damageRgn, rect);
GCData data = new GCData ();
data.damageRgn = damageRgn;
-@@ -730,8 +730,8 @@
+@@ -730,8 +730,8 @@ int /*long*/ gtk_expose_event (int /*lon
return 0;
}
@@ -38696,7 +38732,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
/*
* Feature in GTK. The default behavior when the return key
-@@ -751,30 +751,30 @@
+@@ -751,30 +751,30 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -38736,7 +38772,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
if (socketHandle != 0) {
-@@ -783,16 +783,16 @@
+@@ -783,16 +783,16 @@ int /*long*/ gtk_realize (int /*long*/ w
return result;
}
@@ -38757,7 +38793,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
return result;
-@@ -816,7 +816,7 @@
+@@ -816,7 +816,7 @@ boolean hooksKeys () {
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
}
@@ -38766,7 +38802,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
return imHandle;
}
-@@ -1111,16 +1111,16 @@
+@@ -1111,16 +1111,16 @@ void markLayout (boolean changed, boolea
}
}
@@ -38789,7 +38825,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1148,20 +1148,20 @@
+@@ -1148,20 +1148,20 @@ void moveAbove (int /*long*/ child, int
OS.memmove (parentHandle, fixed);
}
@@ -38816,7 +38852,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1193,7 +1193,7 @@
+@@ -1193,7 +1193,7 @@ void moveChildren(int oldWidth) {
Control[] children = _getChildren ();
for (int i = 0; i < children.length; i++) {
Control child = children[i];
@@ -38825,7 +38861,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
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);
-@@ -1235,12 +1235,12 @@
+@@ -1235,12 +1235,12 @@ Point minimumSize (int wHint, int hHint,
return new Point (width, height);
}
@@ -38840,10 +38876,10 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Region oldClip = new Region (gc.getDevice ());
Region newClip = new Region (gc.getDevice ());
gc.getClipping (oldClip);
-diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets/Control.java
---- x86/org/eclipse/swt/widgets/Control.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Control.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,8 +44,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Control.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Control.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Control.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Control.java 2011-03-21 11:34:23.795727276 +0000
+@@ -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 {
@@ -38854,7 +38890,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int drawCount;
Composite parent;
Cursor cursor;
-@@ -104,12 +104,12 @@
+@@ -104,12 +104,12 @@ Font defaultFont () {
void deregister () {
super.deregister ();
if (fixedHandle != 0) display.removeWidget (fixedHandle);
@@ -38870,7 +38906,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (region != 0) OS.gdk_gc_set_clip_region (gdkGC, region);
if (control.backgroundImage != null) {
Point pt = display.map (this, control, 0, 0);
-@@ -126,8 +126,8 @@
+@@ -126,8 +126,8 @@ void drawBackground (Control control, in
}
boolean drawGripper (int x, int y, int width, int height, boolean vertical) {
@@ -38881,7 +38917,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window == 0) return false;
int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
-@@ -139,16 +139,16 @@
+@@ -139,16 +139,16 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (handle, enabled);
}
@@ -38902,7 +38938,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (eventHandle);
return OS.GTK_WIDGET_WINDOW (eventHandle);
}
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ void fixFocus (Control focusControl) {
if (control.setFocus ()) return;
}
shell.setSavedFocus (focusControl);
@@ -38911,7 +38947,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
OS.gtk_widget_grab_focus (focusHandle);
OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ void fixStyle () {
if (fixedHandle != 0) fixStyle (fixedHandle);
}
@@ -38920,7 +38956,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* Feature in GTK. Some GTK themes apply a different background to
* the contents of a GtkNotebook. However, in an SWT TabFolder, the
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ void fixStyle (int /*long*/ handle) {
*/
if ((state & BACKGROUND) != 0) return;
if ((state & THEME_BACKGROUND) == 0) return;
@@ -38929,7 +38965,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (childStyle != 0) {
GdkColor color = new GdkColor();
OS.gtk_style_get_bg (childStyle, 0, color);
-@@ -192,11 +192,11 @@
+@@ -192,11 +192,11 @@ void fixStyle (int /*long*/ handle) {
}
}
@@ -38943,7 +38979,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return handle;
}
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ boolean hasFocus () {
void hookEvents () {
/* Connect the keyboard signals */
@@ -38952,7 +38988,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -218,7 +218,7 @@
+@@ -218,7 +218,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 */
@@ -38961,7 +38997,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,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 */
@@ -38970,7 +39006,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -243,7 +243,7 @@
+@@ -243,7 +243,7 @@ void hookEvents () {
* The signal is hooked to the fixedHandle to catch events sent to
* lightweight widgets.
*/
@@ -38979,7 +39015,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ void hookEvents () {
}
/* Connect the paint signal */
@@ -38988,7 +39024,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -265,7 +265,7 @@
+@@ -265,7 +265,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);
@@ -38997,7 +39033,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -273,11 +273,11 @@
+@@ -273,11 +273,11 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);
@@ -39011,7 +39047,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/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]);
-@@ -285,14 +285,14 @@
+@@ -285,14 +285,14 @@ int /*long*/ hoverProc (int /*long*/ wid
return 0;
}
@@ -39030,7 +39066,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
while (paintHandle != topHandle) {
if ((OS.GTK_WIDGET_FLAGS (paintHandle) & OS.GTK_NO_WINDOW) == 0) break;
paintHandle = OS.gtk_widget_get_parent (paintHandle);
-@@ -300,8 +300,8 @@
+@@ -300,8 +300,8 @@ int /*long*/ paintHandle () {
return paintHandle;
}
@@ -39041,7 +39077,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (paintHandle);
return OS.GTK_WIDGET_WINDOW (paintHandle);
}
-@@ -327,25 +327,25 @@
+@@ -327,25 +327,25 @@ public boolean print (GC gc) {
checkWidget ();
if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -39073,7 +39109,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.gdk_drawable_get_depth (window) != depth) return;
GdkRectangle rect = new GdkRectangle ();
int [] width = new int [1], height = new int [1];
-@@ -353,13 +353,13 @@
+@@ -353,13 +353,13 @@ void printWindow (boolean first, Control
rect.width = width [0];
rect.height = height [0];
OS.gdk_window_begin_paint_rect (window, rect);
@@ -39090,7 +39126,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventExpose event = new GdkEventExpose ();
event.type = OS.GDK_EXPOSE;
event.window = OS.g_object_ref (window);
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ void printWindow (boolean first, Control
if (!first) {
int [] cX = new int [1], cY = new int [1];
OS.gdk_window_get_position (window, cX, cY);
@@ -39099,7 +39135,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] pW = new int [1], pH = new int [1];
OS.gdk_drawable_get_size (parentWindow, pW, pH);
srcX = x_offset [0] - cX [0];
-@@ -386,18 +386,18 @@
+@@ -386,18 +386,18 @@ void printWindow (boolean first, Control
destHeight = Math.min (cY [0] + height [0], pH [0]);
}
GCData gcData = gc.getGCData();
@@ -39124,7 +39160,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
Cairo.cairo_set_source(cairo, pattern);
-@@ -413,13 +413,13 @@
+@@ -413,13 +413,13 @@ void printWindow (boolean first, Control
OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
}
OS.gdk_window_end_paint (window);
@@ -39142,7 +39178,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gdk_window_get_user_data (child, data);
if (data [0] != 0) {
Widget widget = display.findWidget (data [0]);
-@@ -533,7 +533,7 @@
+@@ -533,7 +533,7 @@ void checkMirrored () {
if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED;
}
@@ -39151,7 +39187,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return parent.childStyle ();
}
-@@ -593,7 +593,7 @@
+@@ -593,7 +593,7 @@ public Point computeSize (int wHint, int
return computeNativeSize (handle, wHint, hHint, changed);
}
@@ -39160,7 +39196,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int width = wHint, height = hHint;
if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
GtkRequisition requisition = new GtkRequisition ();
-@@ -619,7 +619,7 @@
+@@ -619,7 +619,7 @@ void forceResize () {
* topHandle. Note that all calls to gtk_widget_size_allocate()
* must be preceded by a call to gtk_widget_size_request().
*/
@@ -39169,7 +39205,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GtkRequisition requisition = new GtkRequisition ();
gtk_widget_size_request (topHandle, requisition);
GtkAllocation allocation = new GtkAllocation ();
-@@ -674,7 +674,7 @@
+@@ -674,7 +674,7 @@ Accessible _getAccessible () {
*/
public Rectangle getBounds () {
checkWidget();
@@ -39178,7 +39214,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -739,7 +739,7 @@
+@@ -739,7 +739,7 @@ void markLayout (boolean changed, boolea
/* Do nothing */
}
@@ -39187,7 +39223,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
super.modifyStyle(handle, style);
/*
* Bug in GTK. When changing the style of a control that
-@@ -750,8 +750,8 @@
+@@ -750,8 +750,8 @@ void modifyStyle (int /*long*/ handle, i
}
void moveHandle (int x, int y) {
@@ -39198,7 +39234,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* Feature in GTK. Calling gtk_fixed_move() to move a child causes
* the whole parent to redraw. This is a performance problem. The
-@@ -769,13 +769,13 @@
+@@ -769,13 +769,13 @@ void moveHandle (int x, int y) {
}
void resizeHandle (int width, int height) {
@@ -39214,7 +39250,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
boolean sendMove = move;
if ((parent.style & SWT.MIRRORED) != 0) {
int clientWidth = parent.getClientWidth ();
-@@ -899,7 +899,7 @@
+@@ -899,7 +899,7 @@ int setBounds (int x, int y, int width,
*/
public Point getLocation () {
checkWidget();
@@ -39223,7 +39259,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) {
-@@ -964,7 +964,7 @@
+@@ -964,7 +964,7 @@ public void setLocation(int x, int y) {
*/
public Point getSize () {
checkWidget();
@@ -39232,7 +39268,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -1014,15 +1014,15 @@
+@@ -1014,15 +1014,15 @@ public void setSize (Point size) {
public void setRegion (Region region) {
checkWidget ();
if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -39252,7 +39288,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (list == 0) return;
int count = OS.g_list_length (list);
if (count > 1) {
-@@ -1030,7 +1030,7 @@
+@@ -1030,7 +1030,7 @@ void setRelations () {
* the receiver is the last item in the list, so its predecessor will
* be the second-last item in the list
*/
@@ -39261,7 +39297,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -1078,7 +1078,7 @@
+@@ -1078,7 +1078,7 @@ boolean isDescribedByLabel () {
return true;
}
@@ -39270,7 +39306,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return widget == focusHandle ();
}
-@@ -1219,7 +1219,7 @@
+@@ -1219,7 +1219,7 @@ public void setLayoutData (Object layout
*/
public Point toControl (int x, int y) {
checkWidget ();
@@ -39279,7 +39315,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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];
-@@ -1268,7 +1268,7 @@
+@@ -1268,7 +1268,7 @@ public Point toControl (Point point) {
*/
public Point toDisplay (int x, int y) {
checkWidget();
@@ -39288,7 +39324,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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;
-@@ -2039,7 +2039,7 @@
+@@ -2039,7 +2039,7 @@ boolean dragDetect (int button, int coun
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean quit = false, dragging = false;
while (!quit) {
@@ -39297,7 +39333,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* There should be an event on the queue already, but
* in cases where there isn't one, stop trying after
-@@ -2094,8 +2094,8 @@
+@@ -2094,8 +2094,8 @@ boolean dragDetect (int x, int y, boolea
return dragging;
}
@@ -39308,7 +39344,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
return OS.gtk_im_context_filter_keypress (imHandle, event);
}
-@@ -2117,13 +2117,13 @@
+@@ -2117,13 +2117,13 @@ void fixChildren (Shell newShell, Shell
oldDecorations.fixDecorations (newDecorations, this, menus);
}
@@ -39326,7 +39362,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.GTK_WIDGET_VISIBLE (child) && OS.gtk_widget_get_child_visible (child) && !OS.GTK_WIDGET_MAPPED (child)) {
OS.gtk_widget_map (child);
}
-@@ -2137,7 +2137,7 @@
+@@ -2137,7 +2137,7 @@ int /*long*/ fixedMapProc (int /*long*/
return 0;
}
@@ -39335,7 +39371,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
}
/**
-@@ -2163,14 +2163,14 @@
+@@ -2163,14 +2163,14 @@ public boolean forceFocus () {
return forceFocus (focusHandle ());
}
@@ -39353,7 +39389,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
while (handle != 0) {
if (handle == focusHandle) {
/* Cancel any previous ignoreFocus requests */
-@@ -2231,7 +2231,7 @@
+@@ -2231,7 +2231,7 @@ public Image getBackgroundImage () {
}
GdkColor getBgColor () {
@@ -39362,7 +39398,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -2239,7 +2239,7 @@
+@@ -2239,7 +2239,7 @@ GdkColor getBgColor () {
}
GdkColor getBaseColor () {
@@ -39371,7 +39407,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -2339,8 +2339,8 @@
+@@ -2339,8 +2339,8 @@ public Font getFont () {
return font != null ? font : defaultFont ();
}
@@ -39382,7 +39418,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
}
-@@ -2365,7 +2365,7 @@
+@@ -2365,7 +2365,7 @@ GdkColor getForegroundColor () {
}
GdkColor getFgColor () {
@@ -39391,7 +39427,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -2377,7 +2377,7 @@
+@@ -2377,7 +2377,7 @@ Point getIMCaretPos () {
}
GdkColor getTextColor () {
@@ -39400,7 +39436,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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);
-@@ -2434,7 +2434,7 @@
+@@ -2434,7 +2434,7 @@ public Menu getMenu () {
public Monitor getMonitor () {
checkWidget();
Monitor monitor = null;
@@ -39409,7 +39445,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
GdkRectangle dest = new GdkRectangle ();
-@@ -2577,11 +2577,11 @@
+@@ -2577,11 +2577,11 @@ public boolean getVisible () {
return (state & HIDDEN) == 0;
}
@@ -39423,7 +39459,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -2596,10 +2596,10 @@
+@@ -2596,10 +2596,10 @@ int /*long*/ gtk_button_press_event (int
if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) {
shell.forceActive();
}
@@ -39436,7 +39472,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (nextEvent != 0) {
int eventType = OS.GDK_EVENT_TYPE (nextEvent);
if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2;
-@@ -2646,13 +2646,13 @@
+@@ -2646,13 +2646,13 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -39452,7 +39488,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (text == 0) return 0;
int length = OS.strlen (text);
if (length == 0) return 0;
-@@ -2663,7 +2663,7 @@
+@@ -2663,7 +2663,7 @@ int /*long*/ gtk_commit (int /*long*/ im
return 0;
}
@@ -39461,7 +39497,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
/*
* Feature in GTK. Children of a shell will inherit and display the shell's
-@@ -2676,7 +2676,7 @@
+@@ -2676,7 +2676,7 @@ int /*long*/ gtk_enter_notify_event (int
char [] chars = fixMnemonic (toolTipText, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
@@ -39470,7 +39506,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_set_tooltip_text (toolHandle, buffer);
}
if (display.currentControl == this) return 0;
-@@ -2706,7 +2706,7 @@
+@@ -2706,7 +2706,7 @@ boolean checkSubwindow () {
return false;
}
@@ -39479,7 +39515,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -2748,7 +2748,7 @@
+@@ -2748,7 +2748,7 @@ int /*long*/ gtk_event_after (int /*long
}
} else {
display.ignoreFocus = false;
@@ -39488,7 +39524,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
display.ignoreFocus = true;
-@@ -2764,7 +2764,7 @@
+@@ -2764,7 +2764,7 @@ int /*long*/ gtk_event_after (int /*long
return 0;
}
@@ -39497,7 +39533,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if ((state & OBSCURED) != 0) return 0;
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
-@@ -2786,34 +2786,34 @@
+@@ -2786,34 +2786,34 @@ int /*long*/ gtk_expose_event (int /*lon
return 0;
}
@@ -39538,7 +39574,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
OS.gtk_im_context_focus_out (imHandle);
}
-@@ -2822,7 +2822,7 @@
+@@ -2822,7 +2822,7 @@ int /*long*/ gtk_focus_out_event (int /*
return 0;
}
@@ -39547,7 +39583,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (!hasFocus ()) return 0;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
-@@ -2841,16 +2841,16 @@
+@@ -2841,16 +2841,16 @@ int /*long*/ gtk_key_press_event (int /*
return super.gtk_key_press_event (widget, event);
}
@@ -39567,7 +39603,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (display.currentControl != this) return 0;
display.removeMouseHoverTimeout (handle);
int result = 0;
-@@ -2865,15 +2865,15 @@
+@@ -2865,15 +2865,15 @@ int /*long*/ gtk_leave_notify_event (int
return result;
}
@@ -39586,7 +39622,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (focusHandle != 0) {
display.mnemonicControl = this;
OS.gtk_widget_event (focusHandle, eventPtr);
-@@ -2886,7 +2886,7 @@
+@@ -2886,7 +2886,7 @@ int /*long*/ gtk_mnemonic_activate (int
return result;
}
@@ -39595,7 +39631,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
-@@ -2896,7 +2896,7 @@
+@@ -2896,7 +2896,7 @@ int /*long*/ gtk_motion_notify_event (in
int state = gdkEvent.state;
if (gdkEvent.is_hint != 0) {
int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1];
@@ -39604,7 +39640,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask);
x = pointer_x [0];
y = pointer_y [0];
-@@ -2906,22 +2906,22 @@
+@@ -2906,22 +2906,22 @@ int /*long*/ gtk_motion_notify_event (in
return result;
}
@@ -39632,7 +39668,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_im_context_set_client_window (imHandle, window);
}
if (backgroundImage != null) {
-@@ -2930,7 +2930,7 @@
+@@ -2930,7 +2930,7 @@ int /*long*/ gtk_realize (int /*long*/ w
return 0;
}
@@ -39641,7 +39677,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventScroll gdkEvent = new GdkEventScroll ();
OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
switch (gdkEvent.direction) {
-@@ -2946,29 +2946,29 @@
+@@ -2946,29 +2946,29 @@ int /*long*/ gtk_scroll_event (int /*lon
return 0;
}
@@ -39678,7 +39714,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window == paintWindow) {
if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {
state |= OBSCURED;
-@@ -2987,7 +2987,7 @@
+@@ -2987,7 +2987,7 @@ int /*long*/ gtk_visibility_notify_event
return 0;
}
@@ -39687,7 +39723,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_size_request (widget, requisition);
}
-@@ -3006,11 +3006,11 @@
+@@ -3006,11 +3006,11 @@ void gtk_widget_size_request (int /*long
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -39702,7 +39738,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (gdkGC == 0) error (SWT.ERROR_NO_HANDLES);
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
-@@ -3032,7 +3032,7 @@
+@@ -3032,7 +3032,7 @@ public int /*long*/ internal_new_GC (GCD
return gdkGC;
}
@@ -39711,7 +39747,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return 0;
}
-@@ -3051,7 +3051,7 @@
+@@ -3051,7 +3051,7 @@ int /*long*/ imHandle () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -39720,7 +39756,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
checkWidget ();
OS.g_object_unref (gdkGC);
}
-@@ -3191,7 +3191,7 @@
+@@ -3191,7 +3191,7 @@ boolean mnemonicMatch (char key) {
void register () {
super.register ();
if (fixedHandle != 0) display.addWidget (fixedHandle, this);
@@ -39729,7 +39765,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) display.addWidget (imHandle, this);
}
-@@ -3267,7 +3267,7 @@
+@@ -3267,7 +3267,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;
@@ -39738,7 +39774,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
int [] w = new int [1], h = new int [1];
-@@ -3321,7 +3321,7 @@
+@@ -3321,7 +3321,7 @@ void releaseWidget () {
super.releaseWidget ();
if (display.currentControl == this) display.currentControl = null;
display.removeMouseHoverTimeout (handle);
@@ -39747,7 +39783,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
OS.gtk_im_context_reset (imHandle);
OS.gtk_im_context_set_client_window (imHandle, 0);
-@@ -3343,7 +3343,7 @@
+@@ -3343,7 +3343,7 @@ void releaseWidget () {
region = null;
}
@@ -39756,7 +39792,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
OS.gdk_window_restack (window, sibling, above);
} else {
-@@ -3356,8 +3356,8 @@
+@@ -3356,8 +3356,8 @@ void restackWindow (int /*long*/ window,
* When the receiver is not a top level shell, XReconfigureWMWindow ()
* behaves the same as XConfigureWindow ().
*/
@@ -39767,7 +39803,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
XWindowChanges changes = new XWindowChanges ();
-@@ -3411,7 +3411,7 @@
+@@ -3411,7 +3411,7 @@ void sendFocusEvent (int type) {
}
}
@@ -39776,7 +39812,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
Control control = this;
while (control != null) {
if (control.hooks (SWT.Help)) {
-@@ -3442,7 +3442,7 @@
+@@ -3442,7 +3442,7 @@ boolean sendMouseEvent (int type, int bu
event.x = (int)x;
event.y = (int)y;
} else {
@@ -39785,7 +39821,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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];
-@@ -3498,7 +3498,7 @@
+@@ -3498,7 +3498,7 @@ public void setBackground (Color color)
}
boolean set = false;
if (gdkColor == null) {
@@ -39794,7 +39830,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;
} else {
GdkColor oldColor = getBackgroundColor ();
-@@ -3515,10 +3515,10 @@
+@@ -3515,10 +3515,10 @@ public void setBackground (Color color)
}
}
@@ -39808,7 +39844,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (ptr != 0) OS.g_free (ptr);
ptr = 0;
-@@ -3585,8 +3585,8 @@
+@@ -3585,8 +3585,8 @@ public void setBackgroundImage (Image im
redrawChildren ();
}
@@ -39819,7 +39855,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window != 0) OS.gdk_window_set_back_pixmap (window, pixmap, false);
}
-@@ -3640,14 +3640,14 @@
+@@ -3640,14 +3640,14 @@ public void setCursor (Cursor cursor) {
setCursor (cursor != null ? cursor.handle : 0);
}
@@ -39837,7 +39873,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.XFlush (xDisplay);
}
}
-@@ -3715,9 +3715,9 @@
+@@ -3715,9 +3715,9 @@ public void setEnabled (boolean enabled)
}
} else {
OS.gtk_widget_realize (handle);
@@ -39850,7 +39886,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.x = OS.GTK_WIDGET_X (topHandle);
attributes.y = OS.GTK_WIDGET_Y (topHandle);
-@@ -3779,7 +3779,7 @@
+@@ -3779,7 +3779,7 @@ public void setFont (Font font) {
checkWidget();
if (((state & FONT) == 0) && font == null) return;
this.font = font;
@@ -39859,7 +39895,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (font == null) {
fontDesc = defaultFont ().handle;
} else {
-@@ -3794,7 +3794,7 @@
+@@ -3794,7 +3794,7 @@ public void setFont (Font font) {
setFontDescription (fontDesc);
}
@@ -39868,7 +39904,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_modify_font (handle, font);
}
-@@ -3825,7 +3825,7 @@
+@@ -3825,7 +3825,7 @@ public void setForeground (Color color)
}
boolean set = false;
if (gdkColor == null) {
@@ -39877,7 +39913,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;
} else {
GdkColor oldColor = getForegroundColor ();
-@@ -3853,7 +3853,7 @@
+@@ -3853,7 +3853,7 @@ void setInitialBounds () {
* first sized. The fix is to set the value to (0, 0) as
* expected by SWT.
*/
@@ -39886,7 +39922,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if ((parent.style & SWT.MIRRORED) != 0) {
OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ());
} else {
-@@ -3935,7 +3935,7 @@
+@@ -3935,7 +3935,7 @@ public boolean setParent (Composite pare
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
OS.gtk_widget_realize (parent.handle);
@@ -39895,7 +39931,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int x = OS.GTK_WIDGET_X (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
if ((this.parent.style & SWT.MIRRORED) != 0) {
-@@ -3954,7 +3954,7 @@
+@@ -3954,7 +3954,7 @@ public boolean setParent (Composite pare
newDecorations.fixAccelGroup ();
oldDecorations.fixAccelGroup ();
}
@@ -39904,7 +39940,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_reparent (topHandle, newParent);
OS.gtk_fixed_move (newParent, topHandle, x, y);
this.parent = parent;
-@@ -3968,7 +3968,7 @@
+@@ -3968,7 +3968,7 @@ void setParentBackground () {
if (fixedHandle != 0) setBackgroundColor (fixedHandle, null);
}
@@ -39913,7 +39949,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
}
boolean setRadioSelection (boolean value) {
-@@ -4003,7 +4003,7 @@
+@@ -4003,7 +4003,7 @@ public void setRedraw (boolean redraw) {
if (redraw) {
if (--drawCount == 0) {
if (redrawWindow != 0) {
@@ -39922,7 +39958,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* Bug in GTK. For some reason, the window does not
* redraw in versions of GTK greater than 2.18. The fix
-@@ -4022,7 +4022,7 @@
+@@ -4022,7 +4022,7 @@ public void setRedraw (boolean redraw) {
} else {
if (drawCount++ == 0) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) != 0) {
@@ -39931,7 +39967,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -4120,7 +4120,7 @@
+@@ -4120,7 +4120,7 @@ void setToolTipText (Shell shell, String
public void setVisible (boolean visible) {
checkWidget();
if (((state & HIDDEN) == 0) == visible) return;
@@ -39940,7 +39976,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (visible) {
/*
* It is possible (but unlikely), that application
-@@ -4201,11 +4201,11 @@
+@@ -4201,11 +4201,11 @@ void setZOrder (Control sibling, boolean
}
}
@@ -39956,7 +39992,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (sibling != null) {
if (above && sibling.enableWindow != 0) {
siblingWindow = enableWindow;
-@@ -4213,7 +4213,7 @@
+@@ -4213,7 +4213,7 @@ void setZOrder (Control sibling, boolean
siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle);
}
}
@@ -39965,7 +40001,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) {
if (above) {
OS.gdk_window_raise (window);
-@@ -4224,7 +4224,7 @@
+@@ -4224,7 +4224,7 @@ void setZOrder (Control sibling, boolean
OS.gdk_window_lower (window);
}
} else {
@@ -39974,7 +40010,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
boolean stack_mode = above;
if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
restackWindow (window, siblingW, stack_mode);
-@@ -4307,8 +4307,8 @@
+@@ -4307,8 +4307,8 @@ boolean showMenu (int x, int y) {
void showWidget () {
// Comment this line to disable zero-sized widgets
state |= ZERO_WIDTH | ZERO_HEIGHT;
@@ -39985,7 +40021,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
parent.setParentWindow (topHandle);
OS.gtk_container_add (parentHandle, topHandle);
if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);
-@@ -4750,7 +4750,7 @@
+@@ -4750,7 +4750,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;
@@ -39994,7 +40030,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (flush) display.flushExposes (window, all);
OS.gdk_window_process_updates (window, all);
OS.gdk_flush ();
-@@ -4768,7 +4768,7 @@
+@@ -4768,7 +4768,7 @@ void updateLayout (boolean all) {
/* Do nothing */
}
@@ -40003,7 +40039,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
if ((OS.GTK_VERSION < OS.VERSION (2, 8, 0)) && ((state & OBSCURED) == 0)) {
-@@ -4776,10 +4776,10 @@
+@@ -4776,10 +4776,10 @@ int /*long*/ windowProc (int /*long*/ ha
if (control != null && control.backgroundImage != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -40017,10 +40053,10 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
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 -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widgets/DateTime.java
---- x86/org/eclipse/swt/widgets/DateTime.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/DateTime.java 2010-09-09 12:02:46.000000000 +0000
-@@ -483,17 +483,17 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/DateTime.java swt-gtk-3.6.2/org/eclipse/swt/widgets/DateTime.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/DateTime.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/DateTime.java 2011-03-21 11:34:23.765727712 +0000
+@@ -483,17 +483,17 @@ public int getYear () {
}
}
@@ -40041,10 +40077,10 @@ diff -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widge
sendSelectionEvent ();
return 0;
}
-diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/widgets/Decorations.java
---- x86/org/eclipse/swt/widgets/Decorations.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Decorations.java 2010-09-09 12:02:46.000000000 +0000
-@@ -102,7 +102,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Decorations.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Decorations.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Decorations.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Decorations.java 2011-03-21 11:34:23.835726712 +0000
+@@ -102,7 +102,7 @@ public class Decorations extends Canvas
Menu [] menus;
Control savedFocus;
Button defaultButton, saveDefault;
@@ -40053,7 +40089,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
Decorations () {
/* Do nothing */
-@@ -171,17 +171,17 @@
+@@ -171,17 +171,17 @@ void _setImages (Image [] images) {
sort (bestImages);
images = bestImages;
}
@@ -40075,7 +40111,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.g_object_unref (data [0]);
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ void createAccelGroup () {
accelGroup = OS.gtk_accel_group_new ();
if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);
//FIXME - what should we do for Decorations
@@ -40084,7 +40120,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
OS.gtk_window_add_accel_group (shellHandle, accelGroup);
}
-@@ -243,7 +243,7 @@
+@@ -243,7 +243,7 @@ void createWidget (int index) {
void destroyAccelGroup () {
if (accelGroup == 0) return;
@@ -40093,7 +40129,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
//TEMPORARY CODE
// OS.g_object_unref (accelGroup);
-@@ -546,7 +546,7 @@
+@@ -546,7 +546,7 @@ boolean restoreFocus () {
*/
public void setDefaultButton (Button button) {
checkWidget();
@@ -40102,7 +40138,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
if (button != null) {
if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT);
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@ boolean traverseReturn () {
* key.
*/
if (!button.isVisible () || !button.isEnabled ()) return true;
@@ -40111,10 +40147,10 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
return OS.gtk_window_activate_default (shellHandle);
}
-diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt/widgets/DirectoryDialog.java
---- x86/org/eclipse/swt/widgets/DirectoryDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/DirectoryDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -125,20 +125,20 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/DirectoryDialog.java swt-gtk-3.6.2/org/eclipse/swt/widgets/DirectoryDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/DirectoryDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/DirectoryDialog.java 2011-03-21 11:34:23.755727838 +0000
+@@ -125,20 +125,20 @@ public String open () {
}
String openChooserDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
@@ -40139,7 +40175,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ String openChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -40148,7 +40184,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (ptr != 0) {
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
-@@ -164,9 +164,9 @@
+@@ -164,9 +164,9 @@ String openChooserDialog () {
}
if (message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
@@ -40160,7 +40196,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (label == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (box, label);
OS.gtk_widget_show (label);
-@@ -182,7 +182,7 @@
+@@ -182,7 +182,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -40169,7 +40205,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
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);
-@@ -195,13 +195,13 @@
+@@ -195,13 +195,13 @@ String openChooserDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -40187,7 +40223,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -220,11 +220,11 @@
+@@ -220,11 +220,11 @@ String openChooserDialog () {
}
String openClassicDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
@@ -40202,7 +40238,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -240,8 +240,8 @@
+@@ -240,8 +240,8 @@ String openClassicDialog () {
int length = path.length ();
char [] buffer = new char [length + 1];
path.getChars (0, length, buffer, 0);
@@ -40213,7 +40249,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-@@ -249,12 +249,12 @@
+@@ -249,12 +249,12 @@ String openClassicDialog () {
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
OS.gtk_file_selection_hide_fileop_buttons (handle);
@@ -40228,7 +40264,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.gtk_label_set_line_wrap (labelHandle, true);
OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
OS.gtk_container_add (selection.main_vbox, labelHandle);
-@@ -270,7 +270,7 @@
+@@ -270,7 +270,7 @@ String openClassicDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -40237,7 +40273,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
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);
-@@ -283,11 +283,11 @@
+@@ -283,11 +283,11 @@ String openClassicDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -40253,10 +40289,10 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (utf16Ptr != 0) {
int length = (int)/*64*/items_written [0];
char [] buffer = new char [length];
-diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets/Display.java
---- x86/org/eclipse/swt/widgets/Display.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Display.java 2010-09-09 12:02:46.000000000 +0000
-@@ -98,30 +98,30 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Display.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Display.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Display.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Display.java 2011-03-21 11:34:23.735728129 +0000
+@@ -98,30 +98,30 @@ public class Display extends Device {
/* Events Dispatching and Callback */
int gdkEventCount;
@@ -40293,7 +40329,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget lastWidget;
Widget [] widgetTable;
final static int GROW_SIZE = 1024;
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ public class Display extends Device {
/* Input method resources */
Control imControl;
@@ -40302,7 +40338,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* Sync/Async Widget Communication */
Synchronizer synchronizer = new Synchronizer (this);
-@@ -172,40 +172,40 @@
+@@ -172,40 +172,40 @@ public class Display extends Device {
int [] timerIds;
Runnable [] timerList;
Callback timerCallback;
@@ -40352,7 +40388,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int idleHandle;
Callback idleCallback;
static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$
-@@ -216,29 +216,29 @@
+@@ -216,29 +216,29 @@ public class Display extends Device {
/* GtkTreeView callbacks */
int[] treeSelection;
int treeSelectionLength;
@@ -40389,7 +40425,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean settingsChanged, runSettings;
static final int STYLE_SET = 1;
static final int PROPERTY_NOTIFY = 2;
-@@ -250,14 +250,14 @@
+@@ -250,14 +250,14 @@ public class Display extends Device {
Control currentControl;
/* Flush exposes */
@@ -40407,7 +40443,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* System Resources */
Font systemFont;
-@@ -287,7 +287,7 @@
+@@ -287,7 +287,7 @@ public class Display extends Device {
int lastEventTime, lastUserEventTime;
/* Pango layout constructor */
@@ -40416,7 +40452,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* Custom Resize */
double resizeLocationX, resizeLocationY;
-@@ -295,16 +295,16 @@
+@@ -295,16 +295,16 @@ public class Display extends Device {
int resizeMode;
/* Fixed Subclass */
@@ -40439,7 +40475,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* Key Mappings */
static final int [] [] KeyTable = {
-@@ -552,16 +552,16 @@
+@@ -552,16 +552,16 @@ void addLayoutDeferred (Composite comp)
layoutDeferred[layoutDeferredCount++] = comp;
}
@@ -40459,7 +40495,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);
gdkEvents = newEvents;
Widget [] newWidgets = new Widget [length];
-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ void addGdkEvent (int /*long*/ event) {
gdkEventWidgets = newWidgets;
}
Widget widget = null;
@@ -40468,7 +40504,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle != 0) {
do {
widget = getWidget (handle);
-@@ -620,7 +620,7 @@
+@@ -620,7 +620,7 @@ public void addListener (int eventType,
eventTable.hook (eventType, listener);
}
@@ -40477,7 +40513,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
allChildren = OS.g_list_append (allChildren, widget);
if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
OS.gtk_container_forall (widget, allChildrenProc, recurse);
-@@ -628,7 +628,7 @@
+@@ -628,7 +628,7 @@ int /*long*/ allChildrenProc (int /*long
return 0;
}
@@ -40486,7 +40522,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = OS.gtk_timeout_add (400, mouseHoverProc, handle);
mouseHoverHandle = handle;
-@@ -662,7 +662,7 @@
+@@ -662,7 +662,7 @@ void addSkinnableWidget (Widget widget)
skinList [skinCount++] = widget;
}
@@ -40495,7 +40531,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return;
if (freeSlot == -1) {
int length = (freeSlot = indexTable.length) + GROW_SIZE;
-@@ -735,12 +735,12 @@
+@@ -735,12 +735,12 @@ public void beep () {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -40510,7 +40546,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.cellDataProc (tree_column, cell, tree_model, iter, data);
-@@ -763,7 +763,7 @@
+@@ -763,7 +763,7 @@ static void checkDisplay (Thread thread,
}
}
@@ -40519,7 +40555,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int type = OS.X_EVENT_TYPE (xEvent);
switch (type) {
case OS.VisibilityNotify:
-@@ -773,11 +773,11 @@
+@@ -773,11 +773,11 @@ int /*long*/ checkIfEventProc (int /*lon
default:
return 0;
}
@@ -40533,7 +40569,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
do {
if (tempWindow == flushWindow) break;
} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);
-@@ -802,7 +802,7 @@
+@@ -802,7 +802,7 @@ int /*long*/ checkIfEventProc (int /*lon
case OS.VisibilityNotify: {
OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);
OS.gdk_window_get_user_data (window, flushData);
@@ -40542,7 +40578,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = handle != 0 ? getWidget (handle) : null;
if (widget != null && widget instanceof Control) {
Control control = (Control) widget;
-@@ -898,11 +898,11 @@
+@@ -898,11 +898,11 @@ void createDisplay (DeviceData data) {
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -40556,7 +40592,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (ptr != 0) {
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
-@@ -1001,9 +1001,9 @@
+@@ -1001,9 +1001,9 @@ void createDisplay (DeviceData data) {
OS.gdk_window_add_filter (0, filterProc, 0);
if (OS.GDK_WINDOWING_X11 ()) {
@@ -40568,7 +40604,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XSetSelectionOwner (OS.GDK_DISPLAY (), atom, xWindow, OS.CurrentTime);
OS.XGetSelectionOwner (OS.GDK_DISPLAY (), atom);
}
-@@ -1016,9 +1016,9 @@
+@@ -1016,9 +1016,9 @@ void createDisplay (DeviceData data) {
}
Image createImage (String name) {
@@ -40580,7 +40616,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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;
-@@ -1026,7 +1026,7 @@
+@@ -1026,7 +1026,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);
@@ -40589,7 +40625,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
byte [] data = new byte [stride * height];
OS.memmove (data, pixels, data.length);
OS.g_object_unref (pixbuf);
-@@ -1051,29 +1051,29 @@
+@@ -1051,29 +1051,29 @@ Image createImage (String name) {
return new Image (this, imageData);
}
@@ -40627,7 +40663,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -1092,10 +1092,10 @@
+@@ -1092,10 +1092,10 @@ static int /*long*/ createPixbuf(Image i
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -40640,7 +40676,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-@@ -1134,7 +1134,7 @@
+@@ -1134,7 +1134,7 @@ protected void destroy () {
void destroyDisplay () {
}
@@ -40649,7 +40685,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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);
}
-@@ -1203,7 +1203,7 @@
+@@ -1203,7 +1203,7 @@ void error (int code) {
SWT.error (code);
}
@@ -40658,7 +40694,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/*
* Use gdk_event_get_time() rather than event.time or
* gtk_get_current_event_time(). If the event does not
-@@ -1260,7 +1260,7 @@
+@@ -1260,7 +1260,7 @@ int /*long*/ eventProc (int /*long*/ eve
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -40667,7 +40703,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
checkDevice ();
return getWidget (handle);
}
-@@ -1289,7 +1289,7 @@
+@@ -1289,7 +1289,7 @@ public Widget findWidget (int /*long*/ h
*
* @since 3.1
*/
@@ -40676,7 +40712,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
checkDevice ();
return null;
}
-@@ -1311,12 +1311,12 @@
+@@ -1311,12 +1311,12 @@ public Widget findWidget (int /*long*/ h
*
* @since 3.3
*/
@@ -40691,7 +40727,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
GtkWidgetClass klass = new GtkWidgetClass ();
OS.memmove (klass, g_class);
klass.map = fixedMapProc;
-@@ -1326,21 +1326,21 @@
+@@ -1326,21 +1326,21 @@ static int /*long*/ fixedClassInitProc (
return 0;
}
@@ -40716,7 +40752,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
klass.render = rendererRenderProc;
-@@ -1349,28 +1349,28 @@
+@@ -1349,28 +1349,28 @@ static int /*long*/ rendererClassInitPro
return 0;
}
@@ -40750,7 +40786,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);
OS.g_free (xEvent);
this.flushWindow = 0;
-@@ -1423,7 +1423,7 @@
+@@ -1423,7 +1423,7 @@ public static Display getCurrent () {
int getCaretBlinkTime () {
// checkDevice ();
@@ -40759,7 +40795,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (settings == 0) return 500;
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
-@@ -1453,9 +1453,9 @@
+@@ -1453,9 +1453,9 @@ int getCaretBlinkTime () {
public Control getCursorControl () {
checkDevice();
int[] x = new int[1], y = new int[1];
@@ -40772,7 +40808,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (window != 0) {
OS.gdk_window_get_user_data (window, user_data);
handle = user_data [0];
-@@ -1468,8 +1468,8 @@
+@@ -1468,8 +1468,8 @@ public Control getCursorControl () {
if (!OS.GDK_WINDOWING_X11 ()) return null;
OS.gdk_error_trap_push ();
int[] unusedInt = new int[1];
@@ -40783,7 +40819,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
do {
if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
handle = 0;
-@@ -1477,7 +1477,7 @@
+@@ -1477,7 +1477,7 @@ public Control getCursorControl () {
}
if ((xWindow = buffer [0]) != 0) {
xParent = xWindow;
@@ -40792,7 +40828,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (gdkWindow != 0) {
OS.gdk_window_get_user_data (gdkWindow, user_data);
if (user_data[0] != 0) handle = user_data[0];
-@@ -1497,15 +1497,15 @@
+@@ -1497,15 +1497,15 @@ public Control getCursorControl () {
return null;
}
@@ -40811,7 +40847,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
if (borderPtr[0] != 0) {
OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
-@@ -1530,7 +1530,7 @@
+@@ -1530,7 +1530,7 @@ boolean filters (int eventType) {
return filterTable.hooks (eventType);
}
@@ -40820,7 +40856,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.filterProc (xEvent, gdkEvent, data);
-@@ -1665,19 +1665,19 @@
+@@ -1665,19 +1665,19 @@ public Point getDPI () {
return new Point (dpi, dpi);
}
@@ -40844,7 +40880,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
return toggle_renderer_type;
}
-@@ -1722,7 +1722,7 @@
+@@ -1722,7 +1722,7 @@ public int getDismissalAlignment () {
checkDevice ();
int [] buffer = new int [1];
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
@@ -40853,7 +40889,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
}
return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
-@@ -1742,7 +1742,7 @@
+@@ -1742,7 +1742,7 @@ public int getDismissalAlignment () {
*/
public int getDoubleClickTime () {
checkDevice ();
@@ -40862,7 +40898,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
return buffer [0];
-@@ -1767,8 +1767,8 @@
+@@ -1767,8 +1767,8 @@ public Control getFocusControl () {
return focusControl;
}
if (activeShell == null) return null;
@@ -40873,7 +40909,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return null;
do {
Widget widget = getWidget (handle);
-@@ -1865,12 +1865,12 @@
+@@ -1865,12 +1865,12 @@ Dialog getModalDialog () {
*/
Rectangle getWorkArea() {
byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$
@@ -40889,7 +40925,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (!OS.gdk_property_get (OS.GDK_ROOT_PARENT (), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
return null;
}
-@@ -1901,7 +1901,7 @@
+@@ -1901,7 +1901,7 @@ public Monitor [] getMonitors () {
checkDevice ();
Monitor [] monitors = null;
Rectangle workArea = getWorkArea();
@@ -40898,7 +40934,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (screen != 0) {
int monitorCount = OS.gdk_screen_get_n_monitors (screen);
if (monitorCount > 0) {
-@@ -2203,12 +2203,12 @@
+@@ -2203,12 +2203,12 @@ void initializeSystemColors () {
GdkColor gdkColor;
/* Get Tooltip resources */
@@ -40913,7 +40949,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
gdkColor = new GdkColor();
OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
COLOR_INFO_FOREGROUND = gdkColor;
-@@ -2218,7 +2218,7 @@
+@@ -2218,7 +2218,7 @@ void initializeSystemColors () {
OS.gtk_widget_destroy (tooltipShellHandle);
/* Get Shell resources */
@@ -40922,7 +40958,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
gdkColor = new GdkColor();
OS.gtk_style_get_black (style, gdkColor);
COLOR_WIDGET_DARK_SHADOW = gdkColor;
-@@ -2299,8 +2299,8 @@
+@@ -2299,8 +2299,8 @@ void initializeSystemColors () {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -40933,7 +40969,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -2355,10 +2355,10 @@
+@@ -2355,10 +2355,10 @@ public Thread getThread () {
}
}
@@ -40946,7 +40982,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (0 <= index && index < widgetTable.length) {
lastHandle = handle;
return lastWidget = widgetTable [(int)/*64*/index];
-@@ -2366,7 +2366,7 @@
+@@ -2366,7 +2366,7 @@ Widget getWidget (int /*long*/ handle) {
return null;
}
@@ -40955,7 +40991,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean result = runAsyncMessages (false);
if (!result) {
synchronized (idleLock) {
-@@ -2396,7 +2396,7 @@
+@@ -2396,7 +2396,7 @@ protected void init () {
}
void initializeCallbacks () {
@@ -40964,7 +41000,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
-@@ -2592,8 +2592,8 @@
+@@ -2592,8 +2592,8 @@ void initializeCallbacks () {
void initializeSubclasses () {
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -40975,7 +41011,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
OS.g_type_class_unref (pangoLayoutClass);
-@@ -2612,10 +2612,10 @@
+@@ -2612,10 +2612,10 @@ void initializeSystemSettings () {
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
@@ -40988,7 +41024,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
-@@ -2631,9 +2631,9 @@
+@@ -2631,9 +2631,9 @@ void initializeWindowManager () {
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) {
@@ -41000,7 +41036,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
-@@ -2661,7 +2661,7 @@
+@@ -2661,7 +2661,7 @@ void initializeWindowManager () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -41009,7 +41045,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_unref (gdkGC);
}
-@@ -2687,10 +2687,10 @@
+@@ -2687,10 +2687,10 @@ public void internal_dispose_GC (int /*l
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -41023,7 +41059,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS);
if (data != null) {
-@@ -2796,7 +2796,7 @@
+@@ -2796,7 +2796,7 @@ public Point map (Control from, Control
Point point = new Point (x, y);
if (from == to) return point;
if (from != null) {
@@ -41032,7 +41068,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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;
-@@ -2804,7 +2804,7 @@
+@@ -2804,7 +2804,7 @@ public Point map (Control from, Control
point.y += origin_y [0];
}
if (to != null) {
@@ -41041,7 +41077,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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];
-@@ -2873,7 +2873,7 @@
+@@ -2873,7 +2873,7 @@ static char mbcsToWcs (char ch) {
return result [0];
}
@@ -41050,7 +41086,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
-@@ -2925,7 +2925,7 @@
+@@ -2925,7 +2925,7 @@ public Rectangle map (Control from, Cont
if (from == to) return rect;
boolean fromRTL = false, toRTL = false;
if (from != null) {
@@ -41059,7 +41095,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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;
-@@ -2933,7 +2933,7 @@
+@@ -2933,7 +2933,7 @@ public Rectangle map (Control from, Cont
rect.y += origin_y [0];
}
if (to != null) {
@@ -41068,7 +41104,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
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];
-@@ -2944,7 +2944,7 @@
+@@ -2944,7 +2944,7 @@ public Rectangle map (Control from, Cont
return rect;
}
@@ -41077,7 +41113,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.hoverProc (handle);
-@@ -3024,13 +3024,13 @@
+@@ -3024,13 +3024,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;
@@ -41093,7 +41129,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
if (keyCode == 0) {
char key = event.character;
-@@ -3112,7 +3112,7 @@
+@@ -3112,7 +3112,7 @@ void postEvent (Event event) {
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
@@ -41102,7 +41138,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
-@@ -3367,8 +3367,8 @@
+@@ -3367,8 +3367,8 @@ void releaseDisplay () {
/* Dispose subclass */
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -41113,7 +41149,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
OS.g_type_class_unref (pangoLayoutClass);
pangoLayoutNewProc = 0;
-@@ -3428,9 +3428,9 @@
+@@ -3428,9 +3428,9 @@ public void removeFilter (int eventType,
if (filterTable.size () == 0) filterTable = null;
}
@@ -41125,7 +41161,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
-@@ -3479,7 +3479,7 @@
+@@ -3479,7 +3479,7 @@ public void removeListener (int eventTyp
eventTable.unhook (eventType, listener);
}
@@ -41134,7 +41170,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = 0;
-@@ -3496,7 +3496,7 @@
+@@ -3496,7 +3496,7 @@ void removePopup (Menu menu) {
}
}
@@ -41143,7 +41179,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
-@@ -3699,8 +3699,8 @@
+@@ -3699,8 +3699,8 @@ public static void setAppVersion (String
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
@@ -41154,7 +41190,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
-@@ -3768,7 +3768,7 @@
+@@ -3768,7 +3768,7 @@ public void setData (String key, Object
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
@@ -41163,7 +41199,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
-@@ -3857,10 +3857,10 @@
+@@ -3857,10 +3857,10 @@ public void setData (Object data) {
this.data = data;
}
@@ -41176,7 +41212,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
-@@ -3935,9 +3935,9 @@
+@@ -3935,9 +3935,9 @@ void showIMWindow (Control control) {
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
@@ -41189,7 +41225,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {
Control widget = control.findBackgroundControl ();
-@@ -3991,7 +3991,7 @@
+@@ -3991,7 +3991,7 @@ public boolean sleep () {
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
@@ -41198,7 +41234,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
-@@ -4002,7 +4002,7 @@
+@@ -4002,7 +4002,7 @@ public boolean sleep () {
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
@@ -41207,7 +41243,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
-@@ -4096,7 +4096,7 @@
+@@ -4096,7 +4096,7 @@ public void timerExec (int milliseconds,
}
}
@@ -41216,7 +41252,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
-@@ -4108,7 +4108,7 @@
+@@ -4108,7 +4108,7 @@ int /*long*/ timerProc (int /*long*/ i)
return 0;
}
@@ -41225,7 +41261,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
caretId = 0;
if (currentCaret == null) {
return 0;
-@@ -4123,19 +4123,19 @@
+@@ -4123,19 +4123,19 @@ int /*long*/ caretProc (int /*long*/ cli
return 0;
}
@@ -41248,7 +41284,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.treeSelectionProc (model, path, iter, treeSelection, treeSelectionLength++);
-@@ -4193,13 +4193,13 @@
+@@ -4193,13 +4193,13 @@ void setCurrentCaret (Caret caret) {
caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0);
}
@@ -41264,7 +41300,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
switch((int)/*64*/user_data) {
case STYLE_SET:
settingsChanged = true;
-@@ -4209,14 +4209,14 @@
+@@ -4209,14 +4209,14 @@ int /*long*/ signalProc (int /*long*/ go
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$
@@ -41283,7 +41319,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XGetWindowProperty (OS.GDK_DISPLAY (), xWindow, atom, 0, -1, true, OS.AnyPropertyType,
type, format, nitems, bytes_after, data);
-@@ -4348,31 +4348,31 @@
+@@ -4348,31 +4348,31 @@ static char wcsToMbcs (char ch) {
return 0;
}
@@ -41320,10 +41356,10 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.timerProc (handle);
-diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widgets/ExpandBar.java
---- x86/org/eclipse/swt/widgets/ExpandBar.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ExpandBar.java 2010-09-09 12:02:46.000000000 +0000
-@@ -160,14 +160,14 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ExpandBar.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ExpandBar.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ExpandBar.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ExpandBar.java 2011-03-21 11:34:23.905725730 +0000
+@@ -160,14 +160,14 @@ 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);
@@ -41340,7 +41376,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (topHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (topHandle, true);
if ((style & SWT.V_SCROLL) != 0) {
-@@ -241,11 +241,11 @@
+@@ -241,11 +241,11 @@ void destroyItem (ExpandItem item) {
layoutItems (index, true);
}
@@ -41354,7 +41390,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (lastFocus != null && lastFocus.setFocus ()) return true;
for (int i = 0; i < itemCount; i++) {
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ public int getSpacing () {
return spacing;
}
@@ -41363,7 +41399,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ int /*long*/ gtk_button_press_event (int
return super.gtk_button_press_event (widget, event);
}
@@ -41372,7 +41408,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
if (lastFocus != null) {
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -407,7 +407,7 @@
+@@ -407,7 +407,7 @@ int /*long*/ gtk_button_release_event (i
return super.gtk_button_release_event (widget, event);
}
@@ -41381,7 +41417,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if ((state & OBSCURED) != 0) return 0;
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
-@@ -426,24 +426,24 @@
+@@ -426,24 +426,24 @@ int /*long*/ gtk_expose_event (int /*lon
return super.gtk_expose_event (widget, eventPtr);
}
@@ -41410,7 +41446,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
int index = 0;
while (index < itemCount) {
-@@ -557,13 +557,13 @@
+@@ -557,13 +557,13 @@ void layoutItems (int index, boolean set
}
}
@@ -41427,7 +41463,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;
}
-@@ -632,7 +632,7 @@
+@@ -632,7 +632,7 @@ int setBounds (int x, int y, int width,
return result;
}
@@ -41436,7 +41472,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
for (int i = 0; i < itemCount; i++) {
-@@ -658,7 +658,7 @@
+@@ -658,7 +658,7 @@ void setScrollbar () {
ExpandItem item = items [itemCount - 1];
int maxHeight = item.y + getBandHeight () + spacing;
if (item.expanded) maxHeight += item.height;
@@ -41445,7 +41481,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, adjustmentHandle);
yCurrentScroll = (int)adjustment.value;
-@@ -678,7 +678,7 @@
+@@ -678,7 +678,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) {
@@ -41454,10 +41490,10 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
GtkRequisition requisition = new GtkRequisition ();
OS.gtk_widget_size_request (vHandle, requisition);
width -= requisition.width;
-diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widgets/ExpandItem.java
---- x86/org/eclipse/swt/widgets/ExpandItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ExpandItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -39,7 +39,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ExpandItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ExpandItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ExpandItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ExpandItem.java 2011-03-21 11:34:23.835726712 +0000
+@@ -39,7 +39,7 @@ public class ExpandItem extends Item {
ExpandBar parent;
Control control;
ImageList imageList;
@@ -41466,7 +41502,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
boolean expanded;
int x, y, width, height;
int imageHeight, imageWidth;
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ int getPreferredWidth (GC gc) {
return width;
}
@@ -41475,7 +41511,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
Event event = new Event ();
event.item = this;
int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
-@@ -324,23 +324,23 @@
+@@ -324,23 +324,23 @@ int /*long*/ gtk_activate (int /*long*/
return 0;
}
@@ -41503,7 +41539,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
parent.gtk_enter_notify_event(widget, event);
return 0;
}
-@@ -518,7 +518,7 @@
+@@ -518,7 +518,7 @@ boolean setFocus () {
return result;
}
@@ -41512,7 +41548,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
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);
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ public void setImage (Image image) {
if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -41521,7 +41557,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-@@ -618,7 +618,7 @@
+@@ -618,7 +618,7 @@ void showWidget (int index) {
}
}
@@ -41530,10 +41566,10 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
switch ((int)/*64*/user_data) {
case ACTIVATE_INVERSE: {
expanded = OS.gtk_expander_get_expanded (handle);
-diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widgets/FileDialog.java
---- x86/org/eclipse/swt/widgets/FileDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/FileDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -46,7 +46,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/FileDialog.java swt-gtk-3.6.2/org/eclipse/swt/widgets/FileDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/FileDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/FileDialog.java 2011-03-21 11:34:23.875726151 +0000
+@@ -46,7 +46,7 @@ public class FileDialog extends Dialog {
int filterIndex = -1;
boolean overwrite = false;
boolean uriMode;
@@ -41542,7 +41578,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
static final char EXTENSION_SEPARATOR = ';';
static final char FILE_EXTENSION_SEPARATOR = '.';
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ String computeResultChooserDialog () {
/* MULTI is only valid if the native dialog's action is Open */
fullPath = null;
if ((style & SWT.MULTI) != 0) {
@@ -41551,7 +41587,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (uriMode) {
list = OS.gtk_file_chooser_get_uris (handle);
} else {
-@@ -111,11 +111,11 @@
+@@ -111,11 +111,11 @@ String computeResultChooserDialog () {
}
int listLength = OS.g_slist_length (list);
fileNames = new String [listLength];
@@ -41566,7 +41602,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (uriMode) {
utf8Ptr = name;
} else {
-@@ -123,8 +123,8 @@
+@@ -123,8 +123,8 @@ String computeResultChooserDialog () {
OS.g_free (name);
}
if (utf8Ptr != 0) {
@@ -41577,7 +41613,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -144,19 +144,19 @@
+@@ -144,19 +144,19 @@ String computeResultChooserDialog () {
}
OS.g_slist_free (list);
} else {
@@ -41601,7 +41637,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -170,9 +170,9 @@
+@@ -170,9 +170,9 @@ String computeResultChooserDialog () {
}
}
filterIndex = -1;
@@ -41613,7 +41649,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (filterNamePtr != 0) {
int length = OS.strlen (filterNamePtr);
byte[] buffer = new byte [length];
-@@ -220,23 +220,23 @@
+@@ -220,23 +220,23 @@ String computeResultClassicDialog () {
filterIndex = -1;
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
@@ -41646,7 +41682,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (OS.gtk_tree_model_get_iter (model [0], iter, path)) {
OS.gtk_tree_model_get (model [0], iter, 0, ptr, -1);
}
-@@ -253,10 +253,10 @@
+@@ -253,10 +253,10 @@ String computeResultClassicDialog () {
OS.gtk_entry_set_text (entry, buffer);
}
@@ -41661,7 +41697,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
entryLength = (int)/*64*/items_written [0];
char [] buffer = new char [entryLength];
OS.memmove (buffer, utf16Ptr, entryLength * 2);
-@@ -273,9 +273,9 @@
+@@ -273,9 +273,9 @@ String computeResultClassicDialog () {
if ((style & SWT.MULTI) == 0) {
fileNames = new String[] {fileName};
} else {
@@ -41674,7 +41710,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.memmove (namePtr, namesPtr1, OS.PTR_SIZEOF);
int length = 0;
while (namePtr[0] != 0) {
-@@ -284,11 +284,11 @@
+@@ -284,11 +284,11 @@ String computeResultClassicDialog () {
OS.memmove(namePtr, namesPtr1, OS.PTR_SIZEOF);
}
fileNames = new String [length];
@@ -41688,7 +41724,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
buffer = new char [(int)/*64*/items_written [0]];
OS.memmove (buffer, utf16Ptr, items_written [0] * 2);
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ String openChooserDialog () {
int action = (style & SWT.SAVE) != 0 ?
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
@@ -41697,7 +41733,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
if (display.getDismissalAlignment() == SWT.RIGHT) {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
-@@ -415,10 +415,10 @@
+@@ -415,10 +415,10 @@ String openChooserDialog () {
}
OS.gtk_window_set_modal (handle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
@@ -41710,7 +41746,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -435,7 +435,7 @@
+@@ -435,7 +435,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -41719,7 +41755,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -458,9 +458,9 @@
+@@ -458,9 +458,9 @@ String openClassicDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
handle = OS.gtk_file_selection_new (titleBytes);
if (parent != null) {
@@ -41731,7 +41767,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ String openClassicDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -41740,7 +41776,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -517,7 +517,7 @@
+@@ -517,7 +517,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -41749,7 +41785,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
}
-@@ -548,7 +548,7 @@
+@@ -548,7 +548,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -41758,7 +41794,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (ptr != 0) {
if (fileName.length() > 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
-@@ -570,10 +570,10 @@
+@@ -570,10 +570,10 @@ void presetChooserDialog () {
/* Set the extension filters */
if (filterNames == null) filterNames = new String [0];
if (filterExtensions == null) filterExtensions = new String [0];
@@ -41771,7 +41807,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (filterNames.length > i && filterNames [i] != null) {
byte [] name = Converter.wcsToMbcs (null, filterNames [i], true);
OS.gtk_file_filter_set_name (filter, name);
-@@ -629,8 +629,8 @@
+@@ -629,8 +629,8 @@ void presetClassicDialog () {
int length = fullPath.length ();
char [] buffer = new char [length + 1];
fullPath.getChars (0, length, buffer, 0);
@@ -41782,10 +41818,10 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widgets/FontDialog.java
---- x86/org/eclipse/swt/widgets/FontDialog.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/FontDialog.java 2010-09-09 12:02:46.000000000 +0000
-@@ -134,28 +134,28 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/FontDialog.java swt-gtk-3.6.2/org/eclipse/swt/widgets/FontDialog.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/FontDialog.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/FontDialog.java 2011-03-21 11:34:23.805727132 +0000
+@@ -134,28 +134,28 @@ public RGB getRGB () {
* </ul>
*/
public FontData open () {
@@ -41819,7 +41855,7 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
int length = OS.strlen (fontName);
byte [] buffer = new byte [length + 1];
OS.memmove (buffer, fontName, length);
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ public FontData open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -41828,7 +41864,7 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -184,12 +184,12 @@
+@@ -184,12 +184,12 @@ public FontData open () {
}
boolean success = response == OS.GTK_RESPONSE_OK;
if (success) {
@@ -41843,10 +41879,10 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
Font font = Font.gtk_new (display, fontDesc);
fontData = font.getFontData () [0];
OS.pango_font_description_free (fontDesc);
-diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/Group.java
---- x86/org/eclipse/swt/widgets/Group.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Group.java 2010-09-09 12:02:46.000000000 +0000
-@@ -41,7 +41,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Group.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Group.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Group.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Group.java 2011-03-21 11:34:23.915725579 +0000
+@@ -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 {
@@ -41855,7 +41891,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
String text = "";
/**
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -41864,7 +41900,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return clientHandle;
}
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (labelHandle, enabled);
}
@@ -41873,7 +41909,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ boolean mnemonicMatch (char key) {
return mnemonicMatch (labelHandle, key);
}
@@ -41882,7 +41918,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ void setBackgroundColor (GdkColor color)
setBackgroundColor(fixedHandle, color);
}
@@ -41891,10 +41927,10 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
OS.gtk_widget_modify_font (labelHandle, font);
}
-diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widgets/ImageList.java
---- x86/org/eclipse/swt/widgets/ImageList.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ImageList.java 2010-09-09 12:02:46.000000000 +0000
-@@ -15,13 +15,13 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ImageList.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ImageList.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ImageList.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ImageList.java 2011-03-21 11:34:23.815727004 +0000
+@@ -15,13 +15,13 @@ import org.eclipse.swt.internal.gtk.*;
import org.eclipse.swt.graphics.*;
class ImageList {
@@ -41910,7 +41946,7 @@ diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widg
}
public int add (Image image) {
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ public int add (Image image) {
Image [] newImages = new Image [images.length + 4];
System.arraycopy (images, 0, newImages, 0, images.length);
images = newImages;
@@ -41919,7 +41955,7 @@ diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widg
System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length);
pixbufs = newPixbufs;
}
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ public Image get (int index) {
return images [index];
}
@@ -41928,7 +41964,7 @@ diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widg
return pixbufs [index];
}
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ public int indexOf (Image image) {
return -1;
}
@@ -41937,7 +41973,7 @@ diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widg
if (pixbuf == 0) return -1;
for (int index=0; index<images.length; index++) {
if (pixbuf == pixbufs [index]) return index;
-@@ -112,17 +112,17 @@
+@@ -112,17 +112,17 @@ public void remove (Image image) {
void set (int index, Image image) {
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (image.pixmap, w, h);
@@ -41958,10 +41994,10 @@ diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widg
if (oldPixbuf != 0) {
if (images [index] == image) {
OS.gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height, oldPixbuf, 0, 0);
-diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME.java
---- x86/org/eclipse/swt/widgets/IME.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/IME.java 2010-09-09 12:02:46.000000000 +0000
-@@ -242,14 +242,14 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/IME.java swt-gtk-3.6.2/org/eclipse/swt/widgets/IME.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/IME.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/IME.java 2011-03-21 11:34:23.785727425 +0000
+@@ -242,14 +242,14 @@ public boolean getWideCaret () {
return false;
}
@@ -41979,7 +42015,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
if (!isInlineEnabled ()) return 0;
boolean doit = true;
ranges = null;
-@@ -278,14 +278,14 @@
+@@ -278,14 +278,14 @@ int /*long*/ gtk_commit (int /*long*/ im
return doit ? 0 : 1;
}
@@ -41998,7 +42034,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
int [] cursorPos = new int [1];
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
caretOffset = cursorPos [0];
-@@ -297,7 +297,7 @@
+@@ -297,7 +297,7 @@ int /*long*/ gtk_preedit_changed (int /*
chars = Converter.mbcsToWcs (null, buffer);
if (pangoAttrs [0] != 0) {
int count = 0;
@@ -42007,7 +42043,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
while (OS.pango_attr_iterator_next (iterator)) count++;
OS.pango_attr_iterator_destroy (iterator);
ranges = new int [count * 2];
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ int /*long*/ gtk_preedit_changed (int /*
ranges [i * 2] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + start [0]);
ranges [i * 2 + 1] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1;
styles [i] = new TextStyle (null, null, null);
@@ -42016,7 +42052,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
if (attr != 0) {
OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
GdkColor color = new GdkColor ();
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ int /*long*/ gtk_preedit_changed (int /*
return 1;
}
@@ -42025,10 +42061,10 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
return parent.imHandle ();
}
-diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/Label.java
---- x86/org/eclipse/swt/widgets/Label.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Label.java 2010-09-09 12:02:46.000000000 +0000
-@@ -51,7 +51,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Label.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Label.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Label.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Label.java 2011-03-21 11:34:23.745727976 +0000
+@@ -51,7 +51,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Label extends Control {
@@ -42037,7 +42073,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
ImageList imageList;
Image image;
String text;
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ public Point computeSize (int wHint, int
boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0;
if (fixWrap || frameHandle != 0) forceResize ();
if (fixWrap) {
@@ -42046,7 +42082,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
int pangoWidth = OS.pango_layout_get_width (labelLayout);
if (wHint != SWT.DEFAULT) {
OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
-@@ -177,11 +177,11 @@
+@@ -177,11 +177,11 @@ public Point computeSize (int wHint, int
* muliple lines of text.
*/
if (hHint == SWT.DEFAULT && labelHandle != 0) {
@@ -42063,7 +42099,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ public Point computeSize (int wHint, int
OS.g_object_get (labelHandle, OS.ypad, buffer, 0);
fontHeight += 2 * buffer [0];
if (frameHandle != 0) {
@@ -42072,7 +42108,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
fontHeight += 2 * OS.gtk_style_get_ythickness (style);
fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);
}
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ void deregister () {
if (imageHandle != 0) display.removeWidget (imageHandle);
}
@@ -42081,7 +42117,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -485,7 +485,7 @@
+@@ -485,7 +485,7 @@ int setBounds (int x, int y, int width,
return result;
}
@@ -42090,7 +42126,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -529,7 +529,7 @@
+@@ -529,7 +529,7 @@ public void setImage (Image image) {
if (image != null) {
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -42099,10 +42135,10 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Link.java
---- x86/org/eclipse/swt/widgets/Link.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Link.java 2010-09-09 12:02:46.000000000 +0000
-@@ -282,8 +282,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Link.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Link.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Link.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Link.java 2011-03-21 11:34:23.755727838 +0000
+@@ -282,8 +282,8 @@ public String getText () {
return text;
}
@@ -42113,7 +42149,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -321,8 +321,8 @@
+@@ -321,8 +321,8 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -42124,7 +42160,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -345,8 +345,8 @@
+@@ -345,8 +345,8 @@ int /*long*/ gtk_button_release_event (i
return result;
}
@@ -42135,7 +42171,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ int /*long*/ gtk_event_after (int /*long
return result;
}
@@ -42144,7 +42180,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if ((state & OBSCURED) != 0) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
-@@ -398,8 +398,8 @@
+@@ -398,8 +398,8 @@ int /*long*/ gtk_expose_event (int /*lon
return 0;
}
@@ -42155,7 +42191,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
-@@ -428,8 +428,8 @@
+@@ -428,8 +428,8 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -42166,7 +42202,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
-@@ -694,7 +694,7 @@
+@@ -694,7 +694,7 @@ int setBounds(int x, int y, int width, i
return result;
}
@@ -42175,10 +42211,10 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
super.setFontDescription (font);
layout.setFont (Font.gtk_new (display, font));
}
-diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/List.java
---- x86/org/eclipse/swt/widgets/List.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/List.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,7 +40,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/List.java swt-gtk-3.6.2/org/eclipse/swt/widgets/List.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/List.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/List.java 2011-03-21 11:34:23.805727132 +0000
+@@ -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 {
@@ -42187,7 +42223,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
static final int TEXT_COLUMN = 0;
-@@ -96,7 +96,7 @@
+@@ -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);
@@ -42196,7 +42232,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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 @@
+@@ -134,7 +134,7 @@ public void add (String string, int inde
error (SWT.ERROR_INVALID_RANGE);
}
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -42205,7 +42241,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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 @@
+@@ -196,14 +196,14 @@ void createHandle (int index) {
* Columns:
* 0 - text
*/
@@ -42223,7 +42259,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,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;
@@ -42232,7 +42268,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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;
-@@ -276,8 +276,8 @@
+@@ -276,8 +276,8 @@ void deregister() {
public void deselect (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -42243,7 +42279,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -307,8 +307,8 @@
+@@ -307,8 +307,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));
@@ -42254,7 +42290,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-@@ -338,9 +338,9 @@
+@@ -338,9 +338,9 @@ public void deselect (int start, int end
public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -42266,7 +42302,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<indices.length; i++) {
int index = indices [i];
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ public void deselect (int [] indices) {
*/
public void deselectAll () {
checkWidget();
@@ -42275,7 +42311,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -371,10 +371,10 @@
+@@ -371,10 +371,10 @@ public void deselectAll () {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -42288,7 +42324,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ boolean dragDetect (int x, int y, boolea
return dragDetect;
}
@@ -42297,7 +42333,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
return paintWindow ();
}
-@@ -408,10 +408,10 @@
+@@ -408,10 +408,10 @@ GdkColor getBackgroundColor () {
*/
public int getFocusIndex () {
checkWidget();
@@ -42310,7 +42346,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
int [] index = new int []{-1};
if (indices != 0) OS.memmove (index, indices, 4);
OS.gtk_tree_path_free (path [0]);
-@@ -442,8 +442,8 @@
+@@ -442,8 +442,8 @@ public String getItem (int index) {
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -42321,7 +42357,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -484,13 +484,13 @@
+@@ -484,13 +484,13 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -42337,7 +42373,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_model_get_iter_first (modelHandle, iter);
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
-@@ -519,9 +519,9 @@
+@@ -519,9 +519,9 @@ public int getItemHeight () {
public String [] getItems () {
checkWidget();
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -42349,7 +42385,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
for (int index=0; index<count; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
-@@ -575,7 +575,7 @@
+@@ -575,7 +575,7 @@ public String [] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -42358,7 +42394,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ public int getSelectionCount () {
*/
public int getSelectionIndex () {
checkWidget();
@@ -42367,7 +42403,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -612,14 +612,14 @@
+@@ -612,14 +612,14 @@ public int getSelectionIndex () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -42386,7 +42422,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -649,7 +649,7 @@
+@@ -649,7 +649,7 @@ public int getSelectionIndex () {
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -42395,7 +42431,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -665,15 +665,15 @@
+@@ -665,15 +665,15 @@ public int [] getSelectionIndices () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -42415,7 +42451,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -703,24 +703,24 @@
+@@ -703,24 +703,24 @@ public int [] getSelectionIndices () {
*/
public int getTopIndex () {
checkWidget();
@@ -42445,7 +42481,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select list view, when multiple items are already
-@@ -734,10 +734,10 @@
+@@ -734,10 +734,10 @@ int /*long*/ gtk_button_press_event (int
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -42458,7 +42494,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -752,10 +752,10 @@
+@@ -752,10 +752,10 @@ int /*long*/ gtk_button_press_event (int
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -42471,7 +42507,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -775,8 +775,8 @@
+@@ -775,8 +775,8 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -42482,7 +42518,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -798,8 +798,8 @@
+@@ -798,8 +798,8 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -42493,7 +42529,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -812,14 +812,14 @@
+@@ -812,14 +812,14 @@ int /*long*/ gtk_popup_menu (int /*long*
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -42510,7 +42546,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
}
-@@ -892,15 +892,15 @@
+@@ -892,15 +892,15 @@ public int indexOf (String string, int s
*/
public boolean isSelected (int index) {
checkWidget();
@@ -42529,7 +42565,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -935,9 +935,9 @@
+@@ -935,9 +935,9 @@ public void remove (int index) {
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -42541,7 +42577,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -967,8 +967,8 @@
+@@ -967,8 +967,8 @@ public void remove (int start, int end)
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -42552,7 +42588,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=end; index>=start; index--) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-@@ -1029,8 +1029,8 @@
+@@ -1029,8 +1029,8 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -42563,7 +42599,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
int last = -1;
for (int i=0; i<newIndices.length; i++) {
-@@ -1055,7 +1055,7 @@
+@@ -1055,7 +1055,7 @@ public void remove (int [] indices) {
*/
public void removeAll () {
checkWidget();
@@ -42572,7 +42608,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_clear (modelHandle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1101,13 +1101,13 @@
+@@ -1101,13 +1101,13 @@ public void removeSelectionListener(Sele
public void select (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -42589,7 +42625,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1144,14 +1144,14 @@
+@@ -1144,14 +1144,14 @@ public void select (int start, int end)
if (count == 0 || start >= count) return;
start = Math.max (0, start);
end = Math.min (end, count - 1);
@@ -42607,7 +42643,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1187,9 +1187,9 @@
+@@ -1187,9 +1187,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;
@@ -42619,7 +42655,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -1197,7 +1197,7 @@
+@@ -1197,7 +1197,7 @@ public void select (int [] indices) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_select_iter (selection, iter);
if ((style & SWT.SINGLE) != 0) {
@@ -42628,7 +42664,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1219,7 +1219,7 @@
+@@ -1219,7 +1219,7 @@ public void select (int [] indices) {
public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
@@ -42637,7 +42673,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1233,10 +1233,10 @@
+@@ -1233,10 +1233,10 @@ void selectFocusIndex (int index) {
*/
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (!(0 <= index && index < count)) return;
@@ -42651,7 +42687,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
/*
-@@ -1303,7 +1303,7 @@
+@@ -1303,7 +1303,7 @@ public void setItem (int index, String s
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -42660,7 +42696,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
-@@ -1330,11 +1330,11 @@
+@@ -1330,11 +1330,11 @@ public void setItems (String [] items) {
for (int i=0; i<items.length; i++) {
if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -42674,7 +42710,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
for (int i=0; i<items.length; i++) {
String string = items [i];
-@@ -1504,9 +1504,9 @@
+@@ -1504,9 +1504,9 @@ public void setSelection (String [] item
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -42686,7 +42722,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -1543,9 +1543,9 @@
+@@ -1543,9 +1543,9 @@ public void showSelection () {
checkWidget();
int index = getSelectionIndex ();
if (index == -1) return;
@@ -42698,7 +42734,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -1579,9 +1579,9 @@
+@@ -1579,9 +1579,9 @@ public void showSelection () {
OS.g_free (iter);
}
@@ -42710,10 +42746,10 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widgets/MenuItem.java
---- x86/org/eclipse/swt/widgets/MenuItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/MenuItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,7 +38,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/MenuItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/MenuItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/MenuItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/MenuItem.java 2011-03-21 11:34:23.805727132 +0000
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
*/
public class MenuItem extends Item {
Menu parent, menu;
@@ -42722,7 +42758,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
int accelerator;
/**
-@@ -127,11 +127,11 @@
+@@ -127,11 +127,11 @@ public MenuItem (Menu parent, int style,
createWidget (index);
}
@@ -42736,7 +42772,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
addAccelerator (accelGroup);
if (menu != null) menu.addAccelerators (accelGroup);
}
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ void createHandle (int index) {
if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_object_ref (groupHandle);
OS.gtk_object_sink (groupHandle);
@@ -42745,7 +42781,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
handle = OS.gtk_radio_menu_item_new_with_label (group, buffer);
break;
case SWT.CHECK:
-@@ -271,10 +271,10 @@
+@@ -271,10 +271,10 @@ void createHandle (int index) {
}
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.SEPARATOR) == 0) {
@@ -42758,7 +42794,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);
if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
OS.gtk_menu_shell_insert (parentHandle, handle, index);
-@@ -306,7 +306,7 @@
+@@ -306,7 +306,7 @@ public int getAccelerator () {
return accelerator;
}
@@ -42767,7 +42803,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
Menu menu = parent;
while (menu != null && menu.cascade != null) {
menu = menu.cascade.parent;
-@@ -407,7 +407,7 @@
+@@ -407,7 +407,7 @@ public boolean getSelection () {
return OS.gtk_check_menu_item_get_active(handle);
}
@@ -42776,7 +42812,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if ((style & SWT.CASCADE) != 0 && menu != null) return 0;
/*
* Bug in GTK. When an ancestor menu is disabled and
-@@ -426,13 +426,13 @@
+@@ -426,13 +426,13 @@ int /*long*/ gtk_activate (int /*long*/
return 0;
}
@@ -42792,7 +42828,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
boolean handled = hooks (SWT.Help);
if (handled) {
postEvent (SWT.Help);
-@@ -491,7 +491,7 @@
+@@ -491,7 +491,7 @@ void releaseParent () {
void releaseWidget () {
super.releaseWidget ();
@@ -42801,7 +42837,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
if (groupHandle != 0) OS.g_object_unref (groupHandle);
groupHandle = 0;
-@@ -499,11 +499,11 @@
+@@ -499,11 +499,11 @@ void releaseWidget () {
parent = null;
}
@@ -42815,7 +42851,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
removeAccelerator (accelGroup);
if (menu != null) menu.removeAccelerators (accelGroup);
}
-@@ -615,7 +615,7 @@
+@@ -615,7 +615,7 @@ void selectRadio () {
public void setAccelerator (int accelerator) {
checkWidget();
if (this.accelerator == accelerator) return;
@@ -42824,7 +42860,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
this.accelerator = accelerator;
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -637,7 +637,7 @@
+@@ -637,7 +637,7 @@ public void setAccelerator (int accelera
public void setEnabled (boolean enabled) {
checkWidget();
if (OS.GTK_WIDGET_SENSITIVE (handle) == enabled) return;
@@ -42833,7 +42869,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
OS.gtk_widget_set_sensitive (handle, enabled);
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -674,8 +674,8 @@
+@@ -674,8 +674,8 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -42844,7 +42880,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_menu_item_set_image (handle, imageHandle);
OS.gtk_widget_show (imageHandle);
} else {
-@@ -727,7 +727,7 @@
+@@ -727,7 +727,7 @@ public void setMenu (Menu menu) {
/* Assign the new menu */
Menu oldMenu = this.menu;
if (oldMenu == menu) return;
@@ -42853,7 +42889,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerators (accelGroup);
if (oldMenu != null) {
oldMenu.cascade = null;
-@@ -837,17 +837,17 @@
+@@ -837,17 +837,17 @@ public void setText (String string) {
}
char [] chars = fixMnemonic (string);
byte [] buffer = Converter.wcsToMbcs (null, chars, true);
@@ -42875,10 +42911,10 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelerator == 0 || !getEnabled ()) return;
if ((accelerator & SWT.COMMAND) != 0) return;
int mask = 0;
-diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Menu.java
---- x86/org/eclipse/swt/widgets/Menu.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Menu.java 2010-09-09 12:02:46.000000000 +0000
-@@ -44,7 +44,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Menu.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Menu.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Menu.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Menu.java 2011-03-21 11:34:23.845726568 +0000
+@@ -44,7 +44,7 @@ public class Menu extends Widget {
boolean hasLocation;
MenuItem cascade, selectedItem;
Decorations parent;
@@ -42887,7 +42923,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
ImageList imageList;
/**
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ void _setVisible (boolean visible) {
OS.gtk_menu_shell_set_take_focus (handle, false);
}
}
@@ -42896,7 +42932,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
/*
* Bug in GTK. The timestamp passed into gtk_menu_popup is used
* to perform an X pointer grab. It cannot be zero, else the grab
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ void _setVisible (boolean visible) {
}
}
@@ -42905,7 +42941,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
MenuItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
MenuItem item = items[i];
-@@ -291,7 +291,7 @@
+@@ -291,7 +291,7 @@ void createHandle (int index) {
if ((style & SWT.BAR) != 0) {
handle = OS.gtk_menu_bar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -42914,7 +42950,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
OS.gtk_container_add (vboxHandle, handle);
OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
} else {
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,7 @@ void createHandle (int index) {
}
}
@@ -42923,7 +42959,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if (this.imHandle == imHandle) return;
this.imHandle = imHandle;
if (imHandle == 0) {
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ void createIMMenu (int /*long*/ imHandle
OS.gtk_widget_show (imItem);
OS.gtk_menu_shell_insert (handle, imItem, -1);
}
@@ -42932,7 +42968,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
}
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ void fixMenus (Decorations newParent) {
if (!OS.GTK_WIDGET_MAPPED (handle)) {
return new Rectangle (0, 0, 0, 0);
}
@@ -42941,7 +42977,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
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);
-@@ -415,13 +415,13 @@
+@@ -415,13 +415,13 @@ public boolean getEnabled () {
*/
public MenuItem getItem (int index) {
checkWidget();
@@ -42957,7 +42993,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
OS.g_list_free (list);
if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
return (MenuItem) display.getWidget (data);
-@@ -439,7 +439,7 @@
+@@ -439,7 +439,7 @@ public MenuItem getItem (int index) {
*/
public int getItemCount () {
checkWidget();
@@ -42966,7 +43002,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ public int getItemCount () {
*/
public MenuItem [] getItems () {
checkWidget();
@@ -42975,7 +43011,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if (list == 0) return new MenuItem [0];
int count = OS.g_list_length (list);
if (imSeparator != 0) count--;
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ public MenuItem [] getItems () {
MenuItem [] items = new MenuItem [count];
int index = 0;
for (int i=0; i<count; i++) {
@@ -42984,7 +43020,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
MenuItem item = (MenuItem) display.getWidget (data);
if (item != null) items [index++] = item;
}
-@@ -600,7 +600,7 @@
+@@ -600,7 +600,7 @@ public boolean getVisible () {
return OS.GTK_WIDGET_MAPPED (handle);
}
@@ -42993,7 +43029,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if ((style & SWT.POP_UP) != 0) {
if (display.activeShell != null) display.activeShell = getShell ();
}
-@@ -619,7 +619,7 @@
+@@ -619,7 +619,7 @@ int /*long*/ gtk_hide (int /*long*/ widg
return 0;
}
@@ -43002,7 +43038,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if ((style & SWT.POP_UP) != 0) {
if (display.activeShell != null) display.activeShell = getShell ();
return 0;
-@@ -629,7 +629,7 @@
+@@ -629,7 +629,7 @@ int /*long*/ gtk_show (int /*long*/ widg
}
@@ -43011,7 +43047,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if (sendHelpEvent (helpType)) {
OS.gtk_menu_shell_deactivate (handle);
return 1;
-@@ -714,7 +714,7 @@
+@@ -714,7 +714,7 @@ public boolean isVisible () {
return getVisible ();
}
@@ -43020,7 +43056,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
/*
* Feature in GTK. The menu position function sets the position of the
* top-left pixel of the menu. If the menu would be off-screen, GTK will
-@@ -802,7 +802,7 @@
+@@ -802,7 +802,7 @@ public void removeMenuListener (MenuList
eventTable.unhook (SWT.Show, listener);
}
@@ -43029,7 +43065,7 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
MenuItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
MenuItem item = items[i];
-@@ -843,7 +843,7 @@
+@@ -843,7 +843,7 @@ void reskinChildren (int flags) {
super.reskinChildren (flags);
}
@@ -43038,10 +43074,10 @@ diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/M
if (selectedItem != null && !selectedItem.isDisposed()) {
if (selectedItem.hooks (SWT.Help)) {
selectedItem.postEvent (SWT.Help);
-diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widgets/MessageBox.java
---- x86/org/eclipse/swt/widgets/MessageBox.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/MessageBox.java 2010-09-09 12:02:46.000000000 +0000
-@@ -42,7 +42,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/MessageBox.java swt-gtk-3.6.2/org/eclipse/swt/widgets/MessageBox.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/MessageBox.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/MessageBox.java 2011-03-21 11:34:23.815727004 +0000
+@@ -42,7 +42,7 @@ import org.eclipse.swt.internal.gtk.*;
public class MessageBox extends Dialog {
String message = "";
@@ -43050,7 +43086,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
/**
* Constructs a new instance of this class given only its parent.
*
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ public void setMessage (String string) {
* </ul>
*/
public int open () {
@@ -43059,7 +43095,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
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;
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ public int open () {
handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (parentHandle != 0) {
@@ -43068,7 +43104,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -173,7 +173,7 @@
+@@ -173,7 +173,7 @@ public int open () {
* dialog to the same window group as of the shells.
*/
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
@@ -43077,7 +43113,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
OS.gtk_window_group_add_window (group, handle);
}
-@@ -182,7 +182,7 @@
+@@ -182,7 +182,7 @@ public int open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -43086,10 +43122,10 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets/Monitor.java
---- x86/org/eclipse/swt/widgets/Monitor.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Monitor.java 2010-09-09 12:02:46.000000000 +0000
-@@ -22,7 +22,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Monitor.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Monitor.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Monitor.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Monitor.java 2011-03-21 11:34:23.835726712 +0000
+@@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.*;
* @since 3.0
*/
public final class Monitor {
@@ -43098,10 +43134,10 @@ diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widget
int x, y, width, height;
int clientX, clientY, clientWidth, clientHeight;
-diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/widgets/ProgressBar.java
---- x86/org/eclipse/swt/widgets/ProgressBar.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ProgressBar.java 2010-09-09 12:02:46.000000000 +0000
-@@ -162,8 +162,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ProgressBar.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ProgressBar.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ProgressBar.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ProgressBar.java 2011-03-21 11:34:23.735728129 +0000
+@@ -162,8 +162,8 @@ public int getState () {
return SWT.NORMAL;
}
@@ -43112,7 +43148,7 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
if (result != 0) return result;
/*
* Bug in GTK. When a progress bar has been unrealized after being
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ public void setState (int state) {
//NOT IMPLEMENTED
}
@@ -43121,7 +43157,7 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
if (isVisible ()) OS.gtk_progress_bar_pulse (handle);
return 1;
}
-@@ -295,7 +295,7 @@
+@@ -295,7 +295,7 @@ void updateBar (int selection, int minim
* but unexpected. The fix is to force all
* outstanding redraws to be delivered.
*/
@@ -43130,10 +43166,10 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
OS.gdk_window_process_updates (window, false);
OS.gdk_flush ();
}
-diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sash.java
---- x86/org/eclipse/swt/widgets/Sash.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Sash.java 2010-09-09 12:02:46.000000000 +0000
-@@ -41,7 +41,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Sash.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Sash.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Sash.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Sash.java 2011-03-21 11:34:23.825726858 +0000
+@@ -41,7 +41,7 @@ import org.eclipse.swt.events.*;
public class Sash extends Control {
boolean dragging;
int startX, startY, lastX, lastY;
@@ -43142,7 +43178,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
private final static int INCREMENT = 1;
private final static int PAGE_INCREMENT = 9;
-@@ -145,12 +145,12 @@
+@@ -145,12 +145,12 @@ void createHandle (int index) {
void drawBand (int x, int y, int width, int height) {
if ((style & SWT.SMOOTH) != 0) return;
@@ -43159,7 +43195,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -163,8 +163,8 @@
+@@ -163,8 +163,8 @@ void drawBand (int x, int y, int width,
OS.g_object_unref (gc);
}
@@ -43170,7 +43206,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ int /*long*/ gtk_button_press_event (int
if (button != 1) return 0;
if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0;
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -43179,7 +43215,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
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 @@
+@@ -210,8 +210,8 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -43190,7 +43226,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -240,8 +240,8 @@
+@@ -240,8 +240,8 @@ int /*long*/ gtk_button_release_event (i
return result;
}
@@ -43201,7 +43237,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
// widget could be disposed at this point
if (handle != 0) {
-@@ -251,8 +251,8 @@
+@@ -251,8 +251,8 @@ int /*long*/ gtk_focus_in_event (int /*l
return 0;
}
@@ -43212,7 +43248,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -287,9 +287,9 @@
+@@ -287,9 +287,9 @@ int /*long*/ gtk_key_press_event (int /*
if (newX == lastX && newY == lastY) return result;
/* Ensure that the pointer image does not change */
@@ -43224,7 +43260,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
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 @@
+@@ -326,8 +326,8 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -43235,7 +43271,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
if (!dragging) return 0;
GdkEventMotion gdkEvent = new GdkEventMotion ();
-@@ -389,7 +389,7 @@
+@@ -389,7 +389,7 @@ int /*long*/ gtk_motion_notify_event (in
return result;
}
@@ -43244,7 +43280,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
setCursor (cursor != null ? cursor.handle : 0);
return super.gtk_realize (widget);
}
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ public void removeSelectionListener(Sele
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -43253,10 +43289,10 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
super.setCursor (cursor != 0 ? cursor : defaultCursor);
}
-diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/Scale.java
---- x86/org/eclipse/swt/widgets/Scale.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Scale.java 2010-09-09 12:02:46.000000000 +0000
-@@ -127,7 +127,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Scale.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Scale.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Scale.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Scale.java 2011-03-21 11:34:23.735728129 +0000
+@@ -127,7 +127,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);
@@ -43265,7 +43301,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscale_new (hAdjustment);
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ void hookEvents () {
*/
public int getIncrement () {
checkWidget ();
@@ -43274,7 +43310,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -43283,7 +43319,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -43292,7 +43328,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -43301,7 +43337,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -233,13 +233,13 @@
+@@ -233,13 +233,13 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -43317,10 +43353,10 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
sendSelectionEvent (SWT.Selection);
return 0;
}
-diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widgets/Scrollable.java
---- x86/org/eclipse/swt/widgets/Scrollable.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Scrollable.java 2010-09-09 12:02:46.000000000 +0000
-@@ -33,7 +33,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Scrollable.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Scrollable.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Scrollable.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Scrollable.java 2011-03-21 11:34:23.815727004 +0000
+@@ -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 {
@@ -43329,7 +43365,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
ScrollBar horizontalBar, verticalBar;
/**
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ public Scrollable (Composite parent, int
super (parent, style);
}
@@ -43338,7 +43374,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
return handle;
}
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ public Rectangle computeTrim (int x, int
trimWidth += vScrollBarWidth ();
if (scrolledHandle != 0) {
if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
@@ -43347,7 +43383,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
int xthickness = OS.gtk_style_get_xthickness (style);
int ythickness = OS.gtk_style_get_ythickness (style);
trimX -= xthickness;
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ public int getBorderWidth () {
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
@@ -43356,7 +43392,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
int x = OS.GTK_WIDGET_X (clientHandle);
int y = OS.GTK_WIDGET_Y (clientHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
-@@ -233,8 +233,8 @@
+@@ -233,8 +233,8 @@ public ScrollBar getVerticalBar () {
return verticalBar;
}
@@ -43367,7 +43403,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
/*
* Feature in GTK. Scrolled windows do not scroll if the scrollbars
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ int /*long*/ gtk_scroll_event (int /*lon
int hScrollBarWidth() {
if (horizontalBar==null) return 0;
@@ -43376,7 +43412,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (hBarHandle==0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request(hBarHandle, requisition);
-@@ -318,9 +318,9 @@
+@@ -318,9 +318,9 @@ void redrawWidget (int x, int y, int wid
super.redrawWidget (x, y, width, height, redrawAll, all, trim);
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
if (!trim) return;
@@ -43388,7 +43424,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
rect.width = OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -368,7 +368,7 @@
+@@ -368,7 +368,7 @@ void showWidget () {
if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
}
@@ -43397,7 +43433,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (fixedHandle != 0) return fixedHandle;
if (scrolledHandle != 0) return scrolledHandle;
return super.topHandle ();
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ void updateScrollBarValue (ScrollBar bar
int vScrollBarWidth() {
if (verticalBar == null) return 0;
@@ -43406,10 +43442,10 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (vBarHandle == 0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request (vBarHandle, requisition);
-diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widgets/ScrollBar.java
---- x86/org/eclipse/swt/widgets/ScrollBar.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ScrollBar.java 2010-09-09 12:02:46.000000000 +0000
-@@ -84,7 +84,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ScrollBar.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ScrollBar.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ScrollBar.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ScrollBar.java 2011-03-21 11:34:23.815727004 +0000
+@@ -84,7 +84,7 @@ import org.eclipse.swt.events.*;
*/
public class ScrollBar extends Widget {
Scrollable parent;
@@ -43418,7 +43454,7 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
int detail;
boolean dragSent;
-@@ -355,7 +355,7 @@
+@@ -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];
@@ -43427,7 +43463,7 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
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 @@
+@@ -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];
@@ -43436,7 +43472,7 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
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 @@
+@@ -446,7 +446,7 @@ public Rectangle getThumbTrackBounds ()
*/
public boolean getVisible () {
checkWidget ();
@@ -43445,7 +43481,7 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
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 @@
+@@ -456,20 +456,20 @@ public boolean getVisible () {
}
}
@@ -43470,7 +43506,7 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
-@@ -497,7 +497,7 @@
+@@ -497,7 +497,7 @@ int /*long*/ gtk_value_changed (int /*lo
return 0;
}
@@ -43479,10 +43515,10 @@ diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widg
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
-diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/Shell.java
---- x86/org/eclipse/swt/widgets/Shell.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Shell.java 2010-09-09 12:02:46.000000000 +0000
-@@ -117,7 +117,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Shell.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Shell.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Shell.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Shell.java 2011-03-21 11:34:23.885726002 +0000
+@@ -117,7 +117,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Shell extends Decorations {
@@ -43491,7 +43527,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;
int oldX, oldY, oldWidth, oldHeight;
int minWidth, minHeight;
-@@ -253,7 +253,7 @@
+@@ -253,7 +253,7 @@ public Shell (Display display, int style
this (display, null, style, 0, false);
}
@@ -43500,7 +43536,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ public Shell (Shell parent, int style) {
this (parent != null ? parent.display : null, parent, style, 0, false);
}
@@ -43509,7 +43545,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ public static Shell gtk_new (Display dis
*
* @since 3.3
*/
@@ -43518,7 +43554,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ void adjustTrim () {
if (display.ignoreTrim) return;
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -43527,7 +43563,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
GdkRectangle rect = new GdkRectangle ();
OS.gdk_window_get_frame_extents (window, rect);
int trimWidth = Math.max (0, rect.width - width);
-@@ -507,7 +507,7 @@
+@@ -507,7 +507,7 @@ void bringToTop (boolean force) {
if (!force) {
if (activeShell == null) return;
if (!display.activePending) {
@@ -43536,7 +43572,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (focusHandle != 0 && !OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return;
}
}
-@@ -535,10 +535,10 @@
+@@ -535,10 +535,10 @@ void bringToTop (boolean force) {
* window. The fix is to use XSetInputFocus() to force
* the focus.
*/
@@ -43550,7 +43586,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -588,7 +588,7 @@
+@@ -588,7 +588,7 @@ void checkOpen () {
if (!opened) resized = false;
}
@@ -43559,7 +43595,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -692,7 +692,7 @@
+@@ -692,7 +692,7 @@ void createHandle (int index) {
} else {
vboxHandle = OS.gtk_bin_get_child (shellHandle);
if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -43568,7 +43604,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (OS.g_list_length (children) > 0) {
scrolledHandle = OS.g_list_data (children);
}
-@@ -712,7 +712,7 @@
+@@ -712,7 +712,7 @@ void createHandle (int index) {
OS.gtk_widget_realize (shellHandle);
}
@@ -43577,7 +43613,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int eventType = OS.X_EVENT_TYPE (xEvent);
if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0;
XFocusChangeEvent xFocusEvent = new XFocusChangeEvent();
-@@ -784,7 +784,7 @@
+@@ -784,7 +784,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);
@@ -43586,7 +43622,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
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;
-@@ -825,7 +825,7 @@
+@@ -825,7 +825,7 @@ void releaseParent () {
/* Do nothing */
}
@@ -43595,7 +43631,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return shellHandle;
}
-@@ -856,15 +856,15 @@
+@@ -856,15 +856,15 @@ void fixShell (Shell newShell, Control c
}
}
@@ -43614,7 +43650,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
}
void forceResize () {
-@@ -1125,7 +1125,7 @@
+@@ -1125,7 +1125,7 @@ public Shell [] getShells () {
return result;
}
@@ -43623,7 +43659,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (widget == shellHandle) {
if (isCustomResize ()) {
if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) {
-@@ -1149,7 +1149,7 @@
+@@ -1149,7 +1149,7 @@ int /*long*/ gtk_button_press_event (int
return super.gtk_button_press_event (widget, event);
}
@@ -43632,7 +43668,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
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]) {
-@@ -1162,25 +1162,25 @@
+@@ -1162,25 +1162,25 @@ int /*long*/ gtk_configure_event (int /*
return 0;
}
@@ -43663,7 +43699,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int [] width = new int [1];
int [] height = new int [1];
OS.gdk_drawable_get_size (window, width, height);
-@@ -1204,7 +1204,7 @@
+@@ -1204,7 +1204,7 @@ int /*long*/ gtk_expose_event (int /*lon
return super.gtk_expose_event (widget, event);
}
@@ -43672,7 +43708,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/directionType) {
case OS.GTK_DIR_TAB_FORWARD:
case OS.GTK_DIR_TAB_BACKWARD:
-@@ -1221,13 +1221,13 @@
+@@ -1221,13 +1221,13 @@ int /*long*/ gtk_focus (int /*long*/ wid
return super.gtk_focus (widget, directionType);
}
@@ -43688,7 +43724,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_window_set_cursor (window, 0);
display.resizeMode = 0;
}
-@@ -1237,17 +1237,17 @@
+@@ -1237,17 +1237,17 @@ int /*long*/ gtk_leave_notify_event (int
return super.gtk_leave_notify_event (widget, event);
}
@@ -43709,7 +43745,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (widget == shellHandle) {
if (isCustomResize ()) {
GdkEventMotion gdkEvent = new GdkEventMotion ();
-@@ -1306,8 +1306,8 @@
+@@ -1306,8 +1306,8 @@ int /*long*/ gtk_motion_notify_event (in
} else {
int mode = getResizeMode (gdkEvent.x, gdkEvent.y);
if (mode != display.resizeMode) {
@@ -43720,7 +43756,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_window_set_cursor (window, cursor);
OS.gdk_cursor_destroy (cursor);
display.resizeMode = mode;
-@@ -1319,7 +1319,7 @@
+@@ -1319,7 +1319,7 @@ int /*long*/ gtk_motion_notify_event (in
return super.gtk_motion_notify_event (widget, event);
}
@@ -43729,7 +43765,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
/* Stop menu mnemonics when the shell is disabled */
if (widget == shellHandle) {
return (state & DISABLED) != 0 ? 1 : 0;
-@@ -1327,7 +1327,7 @@
+@@ -1327,7 +1327,7 @@ int /*long*/ gtk_key_press_event (int /*
return super.gtk_key_press_event (widget, event);
}
@@ -43738,7 +43774,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
if (!resized || oldWidth != width || oldHeight != height) {
-@@ -1338,9 +1338,9 @@
+@@ -1338,9 +1338,9 @@ int /*long*/ gtk_size_allocate (int /*lo
return 0;
}
@@ -43751,7 +43787,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) {
int decorations = 0;
if ((style & SWT.NO_TRIM) == 0) {
-@@ -1366,7 +1366,7 @@
+@@ -1366,7 +1366,7 @@ int /*long*/ gtk_realize (int /*long*/ w
return result;
}
@@ -43760,7 +43796,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
GdkEventWindowState gdkEvent = new GdkEventWindowState ();
OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof);
minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0;
-@@ -1634,13 +1634,13 @@
+@@ -1634,13 +1634,13 @@ int setBounds (int x, int y, int width,
return result;
}
@@ -43776,7 +43812,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.XFlush (xDisplay);
}
}
-@@ -1673,9 +1673,9 @@
+@@ -1673,9 +1673,9 @@ public void setEnabled (boolean enabled)
enableWindow = 0;
}
} else {
@@ -43788,7 +43824,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -1690,7 +1690,7 @@
+@@ -1690,7 +1690,7 @@ public void setEnabled (boolean enabled)
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -43797,7 +43833,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.XFlush (xDisplay);
}
}
-@@ -1764,7 +1764,7 @@
+@@ -1764,7 +1764,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;
@@ -43806,7 +43842,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (screen != 0) {
if (OS.gdk_screen_get_n_monitors (screen) > 1) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
-@@ -1799,13 +1799,13 @@
+@@ -1799,13 +1799,13 @@ public void setMenuBar (Menu menu) {
if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);
}
if (menuBar != null) {
@@ -43822,7 +43858,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_show (menuHandle);
createAccelGroup ();
menuBar.addAccelerators (accelGroup);
-@@ -2051,7 +2051,7 @@
+@@ -2051,7 +2051,7 @@ void setZOrder (Control sibling, boolean
if (mapped) setZOrder (sibling, above, false, false);
}
@@ -43831,7 +43867,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
mapped = true;
display.dispatchEvents = null;
return 0;
-@@ -2076,12 +2076,12 @@
+@@ -2076,12 +2076,12 @@ void showWidget () {
if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);
}
@@ -43846,7 +43882,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]);
GdkRectangle dest = new GdkRectangle ();
-@@ -2099,7 +2099,7 @@
+@@ -2099,7 +2099,7 @@ int /*long*/ sizeAllocateProc (int /*lon
return 0;
}
@@ -43855,7 +43891,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_hide (handle);
return 0;
}
-@@ -2146,7 +2146,7 @@
+@@ -2146,7 +2146,7 @@ int trimWidth () {
void updateModal () {
if (OS.GTK_IS_PLUG (shellHandle)) return;
@@ -43864,7 +43900,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
boolean isModalShell = false;
if (display.getModalDialog () == null) {
Shell modal = getModalShell ();
-@@ -2314,16 +2314,16 @@
+@@ -2314,16 +2314,16 @@ void releaseWidget () {
tooltipsHandle = 0;
if (group != 0) OS.g_object_unref (group);
group = modalGroup = 0;
@@ -43884,7 +43920,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
byte [] buffer = null;
if (string != null && string.length () > 0) {
-@@ -2339,12 +2339,12 @@
+@@ -2339,12 +2339,12 @@ void setToolTipText (int /*long*/ rootWi
* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
* contain the proper x and y coordinates.
*/
@@ -43901,7 +43937,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -2390,7 +2390,7 @@
+@@ -2390,7 +2390,7 @@ void setToolTipText (int /*long*/ rootWi
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) {
OS.gtk_tooltips_force_window (tooltipsHandle);
}
@@ -43910,7 +43946,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
-@@ -2406,9 +2406,9 @@
+@@ -2406,9 +2406,9 @@ void setToolTipText (int /*long*/ rootWi
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];
@@ -43922,7 +43958,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
-@@ -2422,7 +2422,7 @@
+@@ -2422,7 +2422,7 @@ void setToolTipText (int /*long*/ rootWi
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);
@@ -43931,10 +43967,10 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
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 -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/Slider.java
---- x86/org/eclipse/swt/widgets/Slider.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Slider.java 2010-09-09 12:02:46.000000000 +0000
-@@ -153,7 +153,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Slider.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Slider.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Slider.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Slider.java 2011-03-21 11:34:23.925725432 +0000
+@@ -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);
@@ -43943,7 +43979,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscrollbar_new (hAdjustment);
-@@ -175,20 +175,20 @@
+@@ -175,20 +175,20 @@ void createHandle (int index) {
OS.gtk_container_add (fixedHandle, handle);
}
@@ -43968,7 +44004,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ int /*long*/ gtk_value_changed (int /*lo
return 0;
}
@@ -43977,7 +44013,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
-@@ -247,13 +247,13 @@
+@@ -247,13 +247,13 @@ void hookEvents () {
void register () {
super.register ();
@@ -43993,7 +44029,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
display.removeWidget (hAdjustment);
}
-@@ -284,7 +284,7 @@
+@@ -284,7 +284,7 @@ public Point computeSize (int wHint, int
*/
public int getIncrement () {
checkWidget ();
@@ -44002,7 +44038,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -44011,7 +44047,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -44020,7 +44056,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -44029,7 +44065,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -44038,7 +44074,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.value;
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ public int getSelection () {
*/
public int getThumb () {
checkWidget ();
@@ -44047,7 +44083,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_size;
-@@ -443,7 +443,7 @@
+@@ -443,7 +443,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
@@ -44056,7 +44092,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int minimum = (int) adjustment.lower;
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ public void setMaximum (int value) {
public void setMinimum (int value) {
checkWidget ();
if (value < 0) return;
@@ -44065,7 +44101,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int maximum = (int) adjustment.upper;
-@@ -556,7 +556,7 @@
+@@ -556,7 +556,7 @@ public void setSelection (int value) {
public void setThumb (int value) {
checkWidget ();
if (value < 1) return;
@@ -44074,7 +44110,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
-@@ -597,7 +597,7 @@
+@@ -597,7 +597,7 @@ public void setValues (int selection, in
if (increment < 1) return;
if (pageIncrement < 1) return;
thumb = Math.min (thumb, maximum - minimum);
@@ -44083,10 +44119,10 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
-diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets/Spinner.java
---- x86/org/eclipse/swt/widgets/Spinner.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Spinner.java 2010-09-09 12:02:46.000000000 +0000
-@@ -45,7 +45,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Spinner.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Spinner.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Spinner.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Spinner.java 2011-03-21 11:34:23.765727712 +0000
+@@ -45,7 +45,7 @@ import org.eclipse.swt.events.*;
public class Spinner extends Composite {
static final int MIN_ARROW_WIDTH = 6;
int lastEventTime = 0;
@@ -44095,7 +44131,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
int fixStart = -1, fixEnd = -1;
double climbRate = 1;
-@@ -203,8 +203,8 @@
+@@ -203,8 +203,8 @@ public Point computeSize (int wHint, int
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (handle);
@@ -44106,7 +44142,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,7 @@ public Point computeSize (int wHint, int
string = buffer.toString ();
}
byte [] buffer1 = Converter.wcsToMbcs (null, string, false);
@@ -44115,7 +44151,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
int length = OS.strlen (ptr);
byte [] buffer2 = new byte [length];
OS.memmove (buffer2, ptr, length);
-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ public Point computeSize (int wHint, int
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
int xborder = 0, yborder = 0;
@@ -44124,7 +44160,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if ((this.style & SWT.BORDER) != 0) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ public Rectangle computeTrim (int x, int
xborder += property [0];
yborder += property [0];
}
@@ -44133,7 +44169,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
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 @@
+@@ -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);
@@ -44142,7 +44178,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
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 @@
+@@ -320,23 +320,23 @@ public void cut () {
void deregister () {
super.deregister ();
@@ -44171,7 +44207,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -44180,7 +44216,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -371,7 +371,7 @@
+@@ -371,7 +371,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
@@ -44189,7 +44225,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ GdkColor getForegroundColor () {
*/
public int getIncrement () {
checkWidget ();
@@ -44198,7 +44234,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -44207,7 +44243,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -437,7 +437,7 @@
+@@ -437,7 +437,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -44216,7 +44252,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -459,7 +459,7 @@
+@@ -459,7 +459,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -44225,7 +44261,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -480,7 +480,7 @@
+@@ -480,7 +480,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -44234,7 +44270,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -505,7 +505,7 @@
+@@ -505,7 +505,7 @@ public int getSelection () {
*/
public String getText () {
checkWidget ();
@@ -44243,7 +44279,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -552,26 +552,26 @@
+@@ -552,26 +552,26 @@ public int getDigits () {
}
String getDecimalSeparator () {
@@ -44276,7 +44312,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
-@@ -588,7 +588,7 @@
+@@ -588,7 +588,7 @@ int /*long*/ gtk_changed (int /*long*/ w
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -44285,7 +44321,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -607,7 +607,7 @@
+@@ -607,7 +607,7 @@ int /*long*/ gtk_changed (int /*long*/ w
return 0;
}
@@ -44294,7 +44330,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (handle)) return 0;
int length = OS.strlen (text);
-@@ -645,7 +645,7 @@
+@@ -645,7 +645,7 @@ int /*long*/ gtk_commit (int /*long*/ im
return 0;
}
@@ -44303,7 +44339,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (end_pos == -1) end_pos = OS.g_utf8_strlen (OS.gtk_entry_get_text (handle), -1);
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
-@@ -667,17 +667,17 @@
+@@ -667,17 +667,17 @@ int /*long*/ gtk_delete_text (int /*long
return 0;
}
@@ -44324,7 +44360,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
// 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];
-@@ -686,7 +686,7 @@
+@@ -686,7 +686,7 @@ int /*long*/ gtk_insert_text (int /*long
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -44333,7 +44369,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -718,15 +718,15 @@
+@@ -718,15 +718,15 @@ int /*long*/ gtk_insert_text (int /*long
return 0;
}
@@ -44352,7 +44388,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
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);
-@@ -734,7 +734,7 @@
+@@ -734,7 +734,7 @@ int /*long*/ gtk_populate_popup (int /*l
return 0;
}
@@ -44361,7 +44397,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
sendSelectionEvent (SWT.Selection);
return 0;
}
-@@ -747,7 +747,7 @@
+@@ -747,7 +747,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);
@@ -44370,7 +44406,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
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 ());
-@@ -756,13 +756,13 @@
+@@ -756,13 +756,13 @@ void hookEvents () {
}
}
@@ -44388,7 +44424,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -787,7 +787,7 @@
+@@ -787,7 +787,7 @@ public void paste () {
void register () {
super.register ();
@@ -44397,7 +44433,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -874,14 +874,14 @@
+@@ -874,14 +874,14 @@ void setBackgroundColor (GdkColor color)
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -44415,7 +44451,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
super.setFontDescription (font);
}
-@@ -900,7 +900,7 @@
+@@ -900,7 +900,7 @@ void setFontDescription (int /*long*/ fo
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -44424,7 +44460,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -926,7 +926,7 @@
+@@ -926,7 +926,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
@@ -44433,7 +44469,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -953,7 +953,7 @@
+@@ -953,7 +953,7 @@ public void setMaximum (int value) {
*/
public void setMinimum (int value) {
checkWidget ();
@@ -44442,7 +44478,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -980,7 +980,7 @@
+@@ -980,7 +980,7 @@ public void setMinimum (int value) {
public void setPageIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -44451,7 +44487,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -1067,7 +1067,7 @@
+@@ -1067,7 +1067,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;
@@ -44460,7 +44496,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int diff = Math.abs (value - digits);
-@@ -1135,7 +1135,7 @@
+@@ -1135,7 +1135,7 @@ public void setValues (int selection, in
* depending upon the value of digits.
*/
climbRate = 1.0 / factor;
@@ -44469,7 +44505,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
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);
}
-@@ -1149,9 +1149,9 @@
+@@ -1149,9 +1149,9 @@ boolean translateTraversal (GdkEventKey
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -44481,7 +44517,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -1170,7 +1170,7 @@
+@@ -1170,7 +1170,7 @@ String verifyText (String string, int st
event.text = string;
event.start = start;
event.end = end;
@@ -44490,7 +44526,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1191,7 +1191,7 @@
+@@ -1191,7 +1191,7 @@ String verifyText (String string, int st
index = 0;
}
if (string.length () > 0) {
@@ -44499,10 +44535,10 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (adjustment.lower < 0 && string.charAt (0) == '-') index++;
-diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widgets/TabFolder.java
---- x86/org/eclipse/swt/widgets/TabFolder.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TabFolder.java 2010-09-09 12:02:46.000000000 +0000
-@@ -100,8 +100,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TabFolder.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TabFolder.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TabFolder.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TabFolder.java 2011-03-21 11:34:23.915725579 +0000
+@@ -100,8 +100,8 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -44513,7 +44549,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;
OS.gtk_widget_realize (handle);
return OS.gtk_widget_get_style (handle);
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ public void addSelectionListener(Selecti
addListener(SWT.DefaultSelection,typedListener);
}
@@ -44522,7 +44558,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1 && items [index] != null) {
return items [index].pageHandle;
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ public Point computeSize (int wHint, int
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget();
forceResize ();
@@ -44531,7 +44567,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int clientX = OS.GTK_WIDGET_X (clientHandle);
int clientY = OS.GTK_WIDGET_Y (clientHandle);
x -= clientX;
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ void createWidget (int index) {
}
void createItem (TabItem item, int index) {
@@ -44540,7 +44576,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int itemCount = 0;
if (list != 0) {
itemCount = OS.g_list_length (list);
-@@ -213,15 +213,15 @@
+@@ -213,15 +213,15 @@ void createItem (TabItem item, int index
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
}
@@ -44560,7 +44596,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ void destroyItem (TabItem item) {
}
}
@@ -44569,7 +44605,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
return handle;
}
-@@ -305,7 +305,7 @@
+@@ -305,7 +305,7 @@ int /*long*/ eventHandle () {
public TabItem getItem (int index) {
checkWidget();
if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
@@ -44578,7 +44614,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ public TabItem getItem (int index) {
public TabItem getItem(Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -44587,7 +44623,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return null;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ public TabItem getItem(Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -44596,7 +44632,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -428,11 +428,11 @@
+@@ -428,11 +428,11 @@ public int getSelectionIndex () {
return OS.gtk_notebook_get_current_page (handle);
}
@@ -44610,7 +44646,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1) {
Control control = items [index].getControl ();
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ void hookEvents () {
public int indexOf (TabItem item) {
checkWidget();
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -44619,7 +44655,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return -1;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -494,7 +494,7 @@
+@@ -494,7 +494,7 @@ Point minimumSize (int wHint, int hHint,
Control child = children [i];
int index = 0;
int count = 0;
@@ -44628,7 +44664,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list != 0) {
count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -519,7 +519,7 @@
+@@ -519,7 +519,7 @@ Point minimumSize (int wHint, int hHint,
boolean mnemonicHit (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -44637,7 +44673,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -528,7 +528,7 @@
+@@ -528,7 +528,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -44646,7 +44682,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -589,7 +589,7 @@
+@@ -589,7 +589,7 @@ public void removeSelectionListener (Sel
void reskinChildren (int flags) {
if (items != null) {
@@ -44655,7 +44691,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list != 0){
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -617,7 +617,7 @@
+@@ -617,7 +617,7 @@ int setBounds (int x, int y, int width,
return result;
}
@@ -44664,10 +44700,10 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
super.setFontDescription (font);
TabItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets/TabItem.java
---- x86/org/eclipse/swt/widgets/TabItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TabItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -34,7 +34,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TabItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TabItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TabItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TabItem.java 2011-03-21 11:34:23.865726298 +0000
+@@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class TabItem extends Item {
@@ -44676,7 +44712,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
Control control;
TabFolder parent;
String toolTipText;
-@@ -206,12 +206,12 @@
+@@ -206,12 +206,12 @@ public String getToolTipText () {
return toolTipText;
}
@@ -44691,7 +44727,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -281,7 +281,7 @@
+@@ -281,7 +281,7 @@ public void setControl (Control control)
if (oldControl != null) oldControl.setVisible (false);
}
@@ -44700,7 +44736,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -44709,10 +44745,10 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/widgets/TableColumn.java
---- x86/org/eclipse/swt/widgets/TableColumn.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TableColumn.java 2010-09-09 12:02:46.000000000 +0000
-@@ -36,7 +36,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TableColumn.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TableColumn.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TableColumn.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TableColumn.java 2011-03-21 11:34:23.885726002 +0000
+@@ -36,7 +36,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class TableColumn extends Item {
@@ -44721,7 +44757,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
Table parent;
int modelIndex, lastButton, lastTime, lastX, lastWidth;
boolean customDraw, useFixedWidth;
-@@ -324,7 +324,7 @@
+@@ -324,7 +324,7 @@ public int getWidth () {
return OS.gtk_tree_view_column_get_width (handle);
}
@@ -44730,7 +44766,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
/*
* There is no API to get a double click on a table column. Normally, when
* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
*/
boolean doubleClick = false;
boolean postEvent = true;
@@ -44739,7 +44775,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
if (eventPtr != 0) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
return 0;
}
@@ -44748,7 +44784,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -382,11 +382,11 @@
+@@ -382,11 +382,11 @@ int /*long*/ gtk_event_after (int /*long
return 0;
}
@@ -44762,7 +44798,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
useFixedWidth = false;
int x = OS.GTK_WIDGET_X (widget);
int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -438,7 +438,7 @@
+@@ -438,7 +438,7 @@ public void pack () {
}
}
} else {
@@ -44771,7 +44807,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
do {
width = Math.max (width, parent.calculateWidth (handle, iter));
-@@ -545,7 +545,7 @@
+@@ -545,7 +545,7 @@ public void setAlignment (int alignment)
parent.createRenderers (handle, modelIndex, index == 0, style);
}
@@ -44780,7 +44816,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -560,7 +560,7 @@
+@@ -560,7 +560,7 @@ public void setImage (Image image) {
}
int imageIndex = headerImageList.indexOf (image);
if (imageIndex == -1) imageIndex = headerImageList.add (image);
@@ -44789,7 +44825,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-@@ -705,14 +705,14 @@
+@@ -705,14 +705,14 @@ public void setWidth (int width) {
*/
if (width != 0) {
if (buttonHandle != 0) {
@@ -44809,10 +44845,10 @@ diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wi
OS.gdk_window_get_user_data (child, userData);
if (userData[0] == buttonHandle) {
OS.gdk_window_lower (child);
-diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widgets/TableItem.java
---- x86/org/eclipse/swt/widgets/TableItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TableItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -127,7 +127,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TableItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TableItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TableItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TableItem.java 2011-03-21 11:34:23.905725730 +0000
+@@ -127,7 +127,7 @@ static Table checkNull (Table control) {
}
Color _getBackground () {
@@ -44821,7 +44857,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getBackground ();
GdkColor gdkColor = new GdkColor ();
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ Color _getBackground () {
Color _getBackground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getBackground ();
@@ -44830,7 +44866,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -148,13 +148,13 @@
+@@ -148,13 +148,13 @@ Color _getBackground (int index) {
}
boolean _getChecked () {
@@ -44846,7 +44882,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ Color _getForeground () {
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
@@ -44855,7 +44891,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ Color _getForeground (int index) {
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
@@ -44864,7 +44900,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ Image _getImage (int index) {
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
@@ -44873,7 +44909,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return "";
-@@ -269,14 +269,14 @@
+@@ -269,14 +269,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);
@@ -44893,7 +44929,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -357,15 +357,15 @@
+@@ -357,15 +357,15 @@ public Color getBackground (int index) {
public Rectangle getBounds (int index) {
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -44912,7 +44948,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -549,18 +549,18 @@
+@@ -549,18 +549,18 @@ public Image getImage (int index) {
public Rectangle getImageBounds (int index) {
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -44935,7 +44971,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
OS.gtk_tree_path_free (path);
-@@ -675,19 +675,19 @@
+@@ -675,19 +675,19 @@ public Rectangle getTextBounds (int inde
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
@@ -44960,7 +44996,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -735,12 +735,12 @@
+@@ -735,12 +735,12 @@ public Rectangle getTextBounds (int inde
void redraw () {
if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {
@@ -44976,7 +45012,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -845,16 +845,16 @@
+@@ -845,16 +845,16 @@ public void setBackground (int index, Co
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -44997,7 +45033,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -918,7 +918,7 @@
+@@ -918,7 +918,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -45006,7 +45042,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -969,7 +969,7 @@
+@@ -969,7 +969,7 @@ public void setFont (int index, Font fon
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -45015,7 +45051,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -987,16 +987,16 @@
+@@ -987,16 +987,16 @@ public void setFont (int index, Font fon
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -45036,7 +45072,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1092,16 +1092,16 @@
+@@ -1092,16 +1092,16 @@ public void setForeground (int index, Co
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -45057,7 +45093,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1134,7 +1134,7 @@
+@@ -1134,7 +1134,7 @@ public void setGrayed (boolean grayed) {
* GTK+'s "inconsistent" state does not match SWT's concept of grayed.
* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
*/
@@ -45066,7 +45102,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
cached = true;
-@@ -1164,7 +1164,7 @@
+@@ -1164,7 +1164,7 @@ public void setImage (int index, Image i
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -45075,7 +45111,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1192,10 +1192,10 @@
+@@ -1192,10 +1192,10 @@ public void setImage (int index, Image i
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
if (image != null) {
@@ -45089,7 +45125,7 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1203,7 +1203,7 @@
+@@ -1203,7 +1203,7 @@ public void setImage (int index, Image i
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -45098,10 +45134,10 @@ diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widg
parent.modifyStyle (parentHandle, style);
}
}
-diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/Table.java
---- x86/org/eclipse/swt/widgets/Table.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Table.java 2010-09-09 12:02:46.000000000 +0000
-@@ -68,9 +68,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Table.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Table.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Table.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Table.java 2011-03-21 11:34:23.785727425 +0000
+@@ -68,9 +68,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Table extends Composite {
@@ -45113,7 +45149,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem [] items;
TableColumn [] columns;
TableItem currentItem;
-@@ -170,9 +170,9 @@
+@@ -170,9 +170,9 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -45125,7 +45161,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] index = new int [1];
OS.memmove (index, OS.gtk_tree_path_get_indices (path), 4);
TableItem item = _getItem (index[0]);
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ int /*long*/ cellDataProc (int /*long*/
setData = checkData (item);
}
}
@@ -45134,7 +45170,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (setData) {
ptr [0] = 0;
if (isPixbuf) {
-@@ -332,7 +332,7 @@
+@@ -332,7 +332,7 @@ public void addSelectionListener (Select
addListener (SWT.DefaultSelection, typedListener);
}
@@ -45143,7 +45179,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -348,11 +348,11 @@
+@@ -348,11 +348,11 @@ int calculateWidth (int /*long*/ column,
int [] w = new int [1];
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -45158,7 +45194,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -524,18 +524,18 @@
+@@ -524,18 +524,18 @@ void createColumn (TableColumn column, i
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -45183,7 +45219,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int j=0; j<modelLength; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ void createColumn (TableColumn column, i
modelHandle = newModel;
}
}
@@ -45192,7 +45228,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TableColumn checkColumn = columns [0];
-@@ -609,7 +609,7 @@
+@@ -609,7 +609,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);
@@ -45201,7 +45237,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -624,7 +624,7 @@
+@@ -624,7 +624,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;
@@ -45210,7 +45246,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -669,11 +669,11 @@
+@@ -669,11 +669,11 @@ void createItem (TableColumn column, int
} else {
createColumn (column, index);
}
@@ -45225,7 +45261,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -682,7 +682,7 @@
+@@ -682,7 +682,7 @@ void createItem (TableColumn column, int
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -45234,7 +45270,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -748,7 +748,7 @@
+@@ -748,7 +748,7 @@ void createItem (TableItem item, int ind
items [index] = item;
}
@@ -45243,7 +45279,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -771,9 +771,9 @@
+@@ -771,9 +771,9 @@ void createRenderers (int /*long*/ colum
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -45255,7 +45291,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -877,7 +877,7 @@
+@@ -877,7 +877,7 @@ public void deselect (int index) {
checkWidget();
if (index < 0 || index >= itemCount) return;
boolean fixColumn = showFirstColumn ();
@@ -45264,7 +45300,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -902,7 +902,7 @@
+@@ -902,7 +902,7 @@ public void deselect (int index) {
public void deselect (int start, int end) {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -45273,7 +45309,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
if (index < 0 || index >= itemCount) continue;
-@@ -933,7 +933,7 @@
+@@ -933,7 +933,7 @@ public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -45282,7 +45318,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<indices.length; i++) {
int index = indices[i];
-@@ -955,7 +955,7 @@
+@@ -955,7 +955,7 @@ public void deselect (int [] indices) {
public void deselectAll () {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -45291,7 +45327,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -969,7 +969,7 @@
+@@ -969,7 +969,7 @@ void destroyItem (TableColumn column) {
index++;
}
if (index == columnCount) return;
@@ -45300,7 +45336,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -977,18 +977,18 @@
+@@ -977,18 +977,18 @@ void destroyItem (TableColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -45325,7 +45361,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int j=0; j<FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -1019,7 +1019,7 @@
+@@ -1019,7 +1019,7 @@ void destroyItem (TableColumn column) {
for (int i=0; i<itemCount; i++) {
TableItem item = items [i];
if (item != null) {
@@ -45334,7 +45370,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int modelIndex = column.modelIndex;
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1075,7 +1075,7 @@
+@@ -1075,7 +1075,7 @@ void destroyItem (TableItem item) {
index++;
}
if (index == itemCount) return;
@@ -45343,7 +45379,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1087,10 +1087,10 @@
+@@ -1087,10 +1087,10 @@ void destroyItem (TableItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -45356,7 +45392,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1103,7 +1103,7 @@
+@@ -1103,7 +1103,7 @@ boolean dragDetect (int x, int y, boolea
return dragDetect;
}
@@ -45365,7 +45401,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
return paintWindow ();
}
-@@ -1141,13 +1141,13 @@
+@@ -1141,13 +1141,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -45382,7 +45418,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1212,8 +1212,8 @@
+@@ -1212,8 +1212,8 @@ public int getColumnCount () {
return columnCount;
}
@@ -45393,7 +45429,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
// per row data
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1262,13 +1262,13 @@
+@@ -1262,13 +1262,13 @@ int /*long*/[] getColumnTypes (int colum
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -45410,7 +45446,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1318,11 +1318,11 @@
+@@ -1318,11 +1318,11 @@ public TableColumn [] getColumns () {
}
TableItem getFocusItem () {
@@ -45424,7 +45460,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1370,7 +1370,7 @@
+@@ -1370,7 +1370,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -45433,7 +45469,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1379,8 +1379,8 @@
+@@ -1379,8 +1379,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -45444,7 +45480,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1457,11 +1457,11 @@
+@@ -1457,11 +1457,11 @@ public TableItem getItem (int index) {
public TableItem getItem (Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -45458,7 +45494,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = null;
if (indices != 0) {
int [] index = new int [1];
-@@ -1501,7 +1501,7 @@
+@@ -1501,7 +1501,7 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget();
if (itemCount == 0) {
@@ -45467,7 +45503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1509,11 +1509,11 @@
+@@ -1509,11 +1509,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -45481,7 +45517,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1576,14 +1576,14 @@
+@@ -1576,14 +1576,14 @@ public boolean getLinesVisible() {
return OS.gtk_tree_view_get_rules_hint (handle);
}
@@ -45500,7 +45536,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1612,7 +1612,7 @@
+@@ -1612,7 +1612,7 @@ int /*long*/ getPixbufRenderer (int /*lo
*/
public TableItem [] getSelection () {
checkWidget();
@@ -45509,7 +45545,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1626,15 +1626,15 @@
+@@ -1626,15 +1626,15 @@ public TableItem [] getSelection () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -45529,7 +45565,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1662,7 +1662,7 @@
+@@ -1662,7 +1662,7 @@ public TableItem [] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -45538,7 +45574,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1688,25 +1688,25 @@
+@@ -1688,25 +1688,25 @@ public int getSelectionIndex () {
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
@@ -45570,7 +45606,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -1736,7 +1736,7 @@
+@@ -1736,7 +1736,7 @@ public int getSelectionIndex () {
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -45579,7 +45615,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1751,15 +1751,15 @@
+@@ -1751,15 +1751,15 @@ public int [] getSelectionIndices () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -45599,7 +45635,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1817,14 +1817,14 @@
+@@ -1817,14 +1817,14 @@ public int getSortDirection () {
return sortDirection;
}
@@ -45618,7 +45654,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1849,22 +1849,22 @@
+@@ -1849,22 +1849,22 @@ int /*long*/ getTextRenderer (int /*long
*/
public int getTopIndex () {
checkWidget();
@@ -45645,7 +45681,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select table view, when multiple items are already
-@@ -1876,10 +1876,10 @@
+@@ -1876,10 +1876,10 @@ int /*long*/ gtk_button_press_event (int
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -45658,7 +45694,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1894,10 +1894,10 @@
+@@ -1894,10 +1894,10 @@ int /*long*/ gtk_button_press_event (int
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -45671,7 +45707,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -1917,13 +1917,13 @@
+@@ -1917,13 +1917,13 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -45688,7 +45724,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1933,22 +1933,22 @@
+@@ -1933,22 +1933,22 @@ int /*long*/ gtk_changed (int /*long*/ w
return 0;
}
@@ -45715,7 +45751,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
bottom = rect.y + rect.height;
-@@ -1964,8 +1964,8 @@
+@@ -1964,8 +1964,8 @@ int /*long*/ gtk_expose_event (int /*lon
return super.gtk_expose_event (widget, eventPtr);
}
@@ -45726,7 +45762,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1989,8 +1989,8 @@
+@@ -1989,8 +1989,8 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -45737,7 +45773,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -2003,15 +2003,15 @@
+@@ -2003,15 +2003,15 @@ int /*long*/ gtk_popup_menu (int /*long*
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -45757,7 +45793,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -2036,17 +2036,17 @@
+@@ -2036,17 +2036,17 @@ int gtk_row_inserted (int model, int pat
}
return 0;
}
@@ -45779,7 +45815,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -2061,7 +2061,7 @@
+@@ -2061,7 +2061,7 @@ int /*long*/ gtk_toggled (int /*long*/ r
return 0;
}
@@ -45788,7 +45824,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2072,17 +2072,17 @@
+@@ -2072,17 +2072,17 @@ void gtk_widget_size_request (int /*long
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -45809,7 +45845,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2095,13 +2095,13 @@
+@@ -2095,13 +2095,13 @@ void gtk_widget_size_request (int /*long
}
void hideFirstColumn () {
@@ -45825,7 +45861,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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) {
-@@ -2192,9 +2192,9 @@
+@@ -2192,9 +2192,9 @@ public int indexOf (TableItem item) {
*/
public boolean isSelected (int index) {
checkWidget();
@@ -45837,7 +45873,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -2202,7 +2202,7 @@
+@@ -2202,7 +2202,7 @@ public boolean isSelected (int index) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -45846,7 +45882,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2210,13 +2210,13 @@
+@@ -2210,13 +2210,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -45862,7 +45898,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2306,7 +2306,7 @@
+@@ -2306,7 +2306,7 @@ void releaseWidget () {
public void remove (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);
@@ -45871,7 +45907,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = items [index];
boolean disposed = false;
if (item != null) {
-@@ -2319,7 +2319,7 @@
+@@ -2319,7 +2319,7 @@ public void remove (int index) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
}
if (!disposed) {
@@ -45880,7 +45916,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2351,8 +2351,8 @@
+@@ -2351,8 +2351,8 @@ public void remove (int start, int end)
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -45891,7 +45927,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2404,9 +2404,9 @@
+@@ -2404,9 +2404,9 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -45903,7 +45939,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2460,7 +2460,7 @@
+@@ -2460,7 +2460,7 @@ public void removeAll () {
}
items = new TableItem [4];
itemCount = 0;
@@ -45912,7 +45948,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2521,16 +2521,16 @@
+@@ -2521,16 +2521,16 @@ public void removeSelectionListener(Sele
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -45934,7 +45970,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] buffer = new int [1];
OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
int index = buffer [0];
-@@ -2540,7 +2540,7 @@
+@@ -2540,7 +2540,7 @@ int /*long*/ rendererGetSizeProc (int /*
if (item != null) {
int columnIndex = 0;
if (columnCount > 0) {
@@ -45943,7 +45979,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2579,18 +2579,18 @@
+@@ -2579,18 +2579,18 @@ int /*long*/ rendererGetSizeProc (int /*
return result;
}
@@ -45966,7 +46002,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2604,7 +2604,7 @@
+@@ -2604,7 +2604,7 @@ int /*long*/ rendererRenderProc (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;
@@ -45975,7 +46011,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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;
-@@ -2615,7 +2615,7 @@
+@@ -2615,7 +2615,7 @@ int /*long*/ rendererRenderProc (int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -45984,7 +46020,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2629,7 +2629,7 @@
+@@ -2629,7 +2629,7 @@ int /*long*/ rendererRenderProc (int /*l
}
//send out measure before erase
@@ -45993,7 +46029,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
-@@ -2667,7 +2667,7 @@
+@@ -2667,7 +2667,7 @@ int /*long*/ rendererRenderProc (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) {
@@ -46002,7 +46038,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
//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);
-@@ -2678,7 +2678,7 @@
+@@ -2678,7 +2678,7 @@ int /*long*/ rendererRenderProc (int /*l
}
}
}
@@ -46011,7 +46047,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2688,7 +2688,7 @@
+@@ -2688,7 +2688,7 @@ int /*long*/ rendererRenderProc (int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -46020,7 +46056,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2700,7 +2700,7 @@
+@@ -2700,7 +2700,7 @@ int /*long*/ rendererRenderProc (int /*l
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
@@ -46029,7 +46065,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
ignoreSize = true;
-@@ -2751,8 +2751,8 @@
+@@ -2751,8 +2751,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -46040,7 +46076,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2805,12 +2805,12 @@
+@@ -2805,12 +2805,12 @@ public void select (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
boolean fixColumn = showFirstColumn ();
@@ -46055,7 +46091,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2848,13 +2848,13 @@
+@@ -2848,13 +2848,13 @@ public void select (int start, int end)
start = Math.max (0, start);
end = Math.min (end, itemCount - 1);
boolean fixColumn = showFirstColumn ();
@@ -46071,7 +46107,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2892,7 +2892,7 @@
+@@ -2892,7 +2892,7 @@ public void select (int [] indices) {
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -46080,7 +46116,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -2900,7 +2900,7 @@
+@@ -2900,7 +2900,7 @@ public void select (int [] indices) {
TableItem item = _getItem (index);
OS.gtk_tree_selection_select_iter (selection, item.handle);
if ((style & SWT.SINGLE) != 0) {
@@ -46089,7 +46125,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2924,7 +2924,7 @@
+@@ -2924,7 +2924,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -46098,7 +46134,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2939,8 +2939,8 @@
+@@ -2939,8 +2939,8 @@ void selectFocusIndex (int index) {
*/
if (!(0 <= index && index < itemCount)) return;
TableItem item = _getItem (index);
@@ -46109,7 +46145,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
/*
-@@ -2962,7 +2962,7 @@
+@@ -2962,7 +2962,7 @@ void setBackgroundColor (GdkColor color)
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -46118,7 +46154,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
ownerDraw = true;
recreateRenderers ();
}
-@@ -3027,13 +3027,13 @@
+@@ -3027,13 +3027,13 @@ public void setColumnOrder (int [] order
seen [index] = true;
}
for (int i=0; i<order.length; i++) {
@@ -46135,7 +46171,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
TableColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -3088,7 +3088,7 @@
+@@ -3088,7 +3088,7 @@ public void setItemCount (int count) {
System.arraycopy (items, 0, newItems, 0, itemCount);
items = newItems;
if (isVirtual) {
@@ -46144,7 +46180,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -3140,8 +3140,8 @@
+@@ -3140,8 +3140,8 @@ void setParentBackground () {
recreateRenderers ();
}
@@ -46155,7 +46191,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_set_parent_window (widget, window);
}
-@@ -3159,7 +3159,7 @@
+@@ -3159,7 +3159,7 @@ public void setRedraw (boolean redraw) {
}
}
@@ -46164,7 +46200,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -3416,7 +3416,7 @@
+@@ -3416,7 +3416,7 @@ public void setSelection (TableItem [] i
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
@@ -46173,7 +46209,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -3490,10 +3490,10 @@
+@@ -3490,10 +3490,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -46186,7 +46222,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3524,8 +3524,8 @@
+@@ -3524,8 +3524,8 @@ public void showItem (TableItem item) {
showItem (item.handle);
}
@@ -46197,7 +46233,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -3578,9 +3578,9 @@
+@@ -3578,9 +3578,9 @@ public void showSelection () {
showItem (item.handle);
}
@@ -46209,7 +46245,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -3599,19 +3599,19 @@
+@@ -3599,19 +3599,19 @@ void updateScrollBarValue (ScrollBar bar
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -46234,7 +46270,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
/*
-@@ -3625,7 +3625,7 @@
+@@ -3625,7 +3625,7 @@ int /*long*/ windowProc (int /*long*/ ha
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -46243,10 +46279,10 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (window == gdkEvent.window) {
drawBackground (control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
}
-diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Text.java
---- x86/org/eclipse/swt/widgets/Text.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Text.java 2010-09-09 12:02:46.000000000 +0000
-@@ -56,9 +56,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Text.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Text.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Text.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Text.java 2011-03-21 11:34:23.925725432 +0000
+@@ -56,9 +56,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Text extends Scrollable {
@@ -46258,7 +46294,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
int fixStart = -1, fixEnd = -1;
boolean doubleClick;
String message = "";
-@@ -346,7 +346,7 @@
+@@ -346,7 +346,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);
@@ -46267,7 +46303,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -366,8 +366,8 @@
+@@ -366,8 +366,8 @@ public void clearSelection () {
OS.gtk_editable_select_region (handle, position, position);
} else {
byte [] position = new byte [ITER_SIZEOF];
@@ -46278,7 +46314,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -381,13 +381,13 @@
+@@ -381,13 +381,13 @@ public Point computeSize (int wHint, int
int[] w = new int [1], h = new int [1];
if ((style & SWT.SINGLE) != 0) {
OS.gtk_widget_realize (handle);
@@ -46295,7 +46331,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.g_free (text);
OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);
OS.pango_layout_get_size (layout, w, h);
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,7 @@ public Point computeSize (int wHint, int
int height = OS.PANGO_PIXELS (h [0]);
if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
@@ -46304,7 +46340,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.pango_layout_get_size (layout, w, h);
OS.g_object_unref (layout);
width = Math.max (width, OS.PANGO_PIXELS (w [0]));
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ public Rectangle computeTrim (int x, int
int xborder = 0, yborder = 0;
if ((style & SWT.SINGLE) != 0) {
if ((style & SWT.BORDER) != 0) {
@@ -46313,7 +46349,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
-@@ -461,7 +461,7 @@
+@@ -461,7 +461,7 @@ public void copy () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_copy_clipboard (handle);
} else {
@@ -46322,7 +46358,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
}
}
-@@ -483,7 +483,7 @@
+@@ -483,7 +483,7 @@ public void cut () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_cut_clipboard (handle);
} else {
@@ -46331,7 +46367,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -491,7 +491,7 @@
+@@ -491,7 +491,7 @@ public void cut () {
void deregister () {
super.deregister ();
if (bufferHandle != 0) display.removeWidget (bufferHandle);
@@ -46340,7 +46376,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) display.removeWidget (imContext);
}
-@@ -519,9 +519,9 @@
+@@ -519,9 +519,9 @@ boolean dragDetect (int x, int y, boolea
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -46352,7 +46388,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -540,15 +540,15 @@
+@@ -540,15 +540,15 @@ boolean dragDetect (int x, int y, boolea
return super.dragDetect (x, y, filter, consume);
}
@@ -46371,7 +46407,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -567,7 +567,7 @@
+@@ -567,7 +567,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -46380,7 +46416,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -584,7 +584,7 @@
+@@ -584,7 +584,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
if ((style & SWT.MULTI) != 0) return super.getBorderWidth ();
@@ -46389,7 +46425,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -608,7 +608,7 @@
+@@ -608,7 +608,7 @@ public int getCaretLineNumber () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return 0;
byte [] position = new byte [ITER_SIZEOF];
@@ -46398,7 +46434,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_line (position);
}
-@@ -636,7 +636,7 @@
+@@ -636,7 +636,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);
@@ -46407,7 +46443,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
PangoRectangle pos = new PangoRectangle ();
OS.pango_layout_index_to_pos (layout, index, pos);
int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();
-@@ -644,7 +644,7 @@
+@@ -644,7 +644,7 @@ public Point getCaretLocation () {
return new Point (x, y);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -46416,7 +46452,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -673,7 +673,7 @@
+@@ -673,7 +673,7 @@ public int getCaretPosition () {
return OS.gtk_editable_get_position (handle);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -46425,7 +46461,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_offset (position);
}
-@@ -691,7 +691,7 @@
+@@ -691,7 +691,7 @@ public int getCaretPosition () {
public int getCharCount () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) {
@@ -46434,7 +46470,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
return (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
return OS.gtk_text_buffer_get_char_count (bufferHandle);
-@@ -860,9 +860,9 @@
+@@ -860,9 +860,9 @@ public int getOrientation () {
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -46446,7 +46482,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -958,7 +958,7 @@
+@@ -958,7 +958,7 @@ public int getTabs () {
int getTabWidth (int tabs) {
byte[] buffer = Converter.wcsToMbcs(null, " ", true);
@@ -46455,7 +46491,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
int [] width = new int [1];
int [] height = new int [1];
OS.pango_layout_get_size (layout, width, height);
-@@ -982,7 +982,7 @@
+@@ -982,7 +982,7 @@ int getTabWidth (int tabs) {
*/
public String getText () {
checkWidget ();
@@ -46464,7 +46500,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
address = OS.gtk_entry_get_text (handle);
} else {
-@@ -1020,7 +1020,7 @@
+@@ -1020,7 +1020,7 @@ public String getText () {
public String getText (int start, int end) {
checkWidget ();
if (!(start <= end && 0 <= end)) return "";
@@ -46473,7 +46509,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
start = Math.max (0, start);
address = OS.gtk_editable_get_chars (handle, start, end + 1);
-@@ -1121,13 +1121,13 @@
+@@ -1121,13 +1121,13 @@ public int getTopPixel () {
return lineTop [0];
}
@@ -46490,7 +46526,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -1142,7 +1142,7 @@
+@@ -1142,7 +1142,7 @@ int /*long*/ gtk_button_press_event (int
}
@@ -46499,7 +46535,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
/*
* Feature in GTK. When the user types, GTK positions
* the caret after sending the changed signal. This
-@@ -1151,7 +1151,7 @@
+@@ -1151,7 +1151,7 @@ int /*long*/ gtk_changed (int /*long*/ w
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -46508,7 +46544,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1169,14 +1169,14 @@
+@@ -1169,14 +1169,14 @@ int /*long*/ gtk_changed (int /*long*/ w
}
if ((style & SWT.SEARCH) != 0) {
if ((style & SWT.ICON_CANCEL) != 0) {
@@ -46525,7 +46561,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (text == 0) return 0;
if ((style & SWT.SINGLE) != 0) {
if (!OS.gtk_editable_get_editable (handle)) return 0;
-@@ -1218,7 +1218,7 @@
+@@ -1218,7 +1218,7 @@ int /*long*/ gtk_commit (int /*long*/ im
return 0;
}
@@ -46534,7 +46570,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
-@@ -1254,7 +1254,7 @@
+@@ -1254,7 +1254,7 @@ int /*long*/ gtk_delete_range (int /*lon
return 0;
}
@@ -46543,7 +46579,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (end_pos == -1) end_pos = OS.g_utf8_strlen (OS.gtk_entry_get_text (handle), -1);
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
-@@ -1283,7 +1283,7 @@
+@@ -1283,7 +1283,7 @@ int /*long*/ gtk_delete_text (int /*long
return 0;
}
@@ -46552,7 +46588,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (cursor != null) setCursor (cursor.handle);
/*
* Feature in GTK. The gtk-entry-select-on-focus property is a global
-@@ -1299,7 +1299,7 @@
+@@ -1299,7 +1299,7 @@ int /*long*/ gtk_event_after (int /*long
GdkEventFocus gdkEventFocus = new GdkEventFocus ();
OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
if (gdkEventFocus.in == 0) {
@@ -46561,7 +46597,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);
}
break;
-@@ -1308,29 +1308,29 @@
+@@ -1308,29 +1308,29 @@ int /*long*/ gtk_event_after (int /*long
return super.gtk_event_after (widget, gdkEvent);
}
@@ -46600,7 +46636,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
PangoRectangle rect = new PangoRectangle ();
OS.pango_layout_line_get_extents (line, null, rect);
rect.y = OS.PANGO_PIXELS (rect.y);
-@@ -1353,8 +1353,8 @@
+@@ -1353,8 +1353,8 @@ int /*long*/ gtk_expose_event (int /*lon
case SWT.CENTER: x = (width - rect.width) / 2; break;
case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
}
@@ -46611,7 +46647,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
GdkColor textColor = new GdkColor ();
OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
GdkColor baseColor = new GdkColor ();
-@@ -1367,13 +1367,13 @@
+@@ -1367,13 +1367,13 @@ int /*long*/ gtk_expose_event (int /*lon
return result;
}
@@ -46628,7 +46664,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
/*
* Feature in GTK. GtkEntry widgets select their text on focus in,
* clearing the previous selection. This behavior is controlled by
-@@ -1382,13 +1382,13 @@
+@@ -1382,13 +1382,13 @@ int /*long*/ gtk_grab_focus (int /*long*
* the entry has done focus in processing.
*/
if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
@@ -46644,7 +46680,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
Event e = new Event();
if (icon_pos == OS.GTK_ENTRY_ICON_PRIMARY) {
e.detail = SWT.ICON_SEARCH;
-@@ -1400,7 +1400,7 @@
+@@ -1400,7 +1400,7 @@ int /*long*/ gtk_icon_release (int /*lon
return 0;
}
@@ -46653,7 +46689,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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];
-@@ -1409,7 +1409,7 @@
+@@ -1409,7 +1409,7 @@ int /*long*/ gtk_insert_text (int /*long
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -46662,7 +46698,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
/* Use the selection when the text was deleted */
-@@ -1448,15 +1448,15 @@
+@@ -1448,15 +1448,15 @@ int /*long*/ gtk_insert_text (int /*long
return 0;
}
@@ -46681,7 +46717,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -1464,7 +1464,7 @@
+@@ -1464,7 +1464,7 @@ int /*long*/ gtk_populate_popup (int /*l
return 0;
}
@@ -46690,7 +46726,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] position = new byte [ITER_SIZEOF];
OS.memmove (position, iter, position.length);
-@@ -1511,7 +1511,7 @@
+@@ -1511,7 +1511,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);
}
@@ -46699,7 +46735,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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 ());
-@@ -1520,7 +1520,7 @@
+@@ -1520,7 +1520,7 @@ void hookEvents () {
}
}
@@ -46708,7 +46744,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;
}
-@@ -1561,15 +1561,15 @@
+@@ -1561,15 +1561,15 @@ public void insert (String string) {
}
OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, start);
@@ -46728,7 +46764,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (children != 0) {
/*
* When search or cancel icons are added to Text, those
-@@ -1605,7 +1605,7 @@
+@@ -1605,7 +1605,7 @@ public void paste () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_paste_clipboard (handle);
} else {
@@ -46737,7 +46773,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1613,7 +1613,7 @@
+@@ -1613,7 +1613,7 @@ public void paste () {
void register () {
super.register ();
if (bufferHandle != 0) display.addWidget (bufferHandle, this);
@@ -46746,7 +46782,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1628,7 +1628,7 @@
+@@ -1628,7 +1628,7 @@ void releaseWidget () {
* it around until ownership of the clipboard is lost.
*/
if ((style & SWT.MULTI) != 0) {
@@ -46755,7 +46791,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1725,8 +1725,8 @@
+@@ -1725,8 +1725,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);
@@ -46766,7 +46802,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end);
}
-@@ -1737,8 +1737,8 @@
+@@ -1737,8 +1737,8 @@ void setBackgroundColor (GdkColor color)
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -46777,7 +46813,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
super.setCursor (cursor != 0 ? cursor : defaultCursor);
if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor);
-@@ -1817,7 +1817,7 @@
+@@ -1817,7 +1817,7 @@ public void setEditable (boolean editabl
}
}
@@ -46786,7 +46822,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
super.setFontDescription (font);
setTabStops (tabs);
}
-@@ -1900,7 +1900,7 @@
+@@ -1900,7 +1900,7 @@ public void setSelection (int start) {
byte [] position = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, start);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -46795,7 +46831,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -1940,8 +1940,8 @@
+@@ -1940,8 +1940,8 @@ public void setSelection (int start, int
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
@@ -46806,7 +46842,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);
}
-@@ -2007,7 +2007,7 @@
+@@ -2007,7 +2007,7 @@ public void setTabs (int tabs) {
void setTabStops (int tabs) {
if ((style & SWT.SINGLE) != 0) return;
int tabWidth = getTabWidth (tabs);
@@ -46815,7 +46851,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -2061,7 +2061,7 @@
+@@ -2061,7 +2061,7 @@ public void setText (String string) {
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);
@@ -46824,7 +46860,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
sendEvent (SWT.Modify);
-@@ -2133,7 +2133,7 @@
+@@ -2133,7 +2133,7 @@ public void setTopIndex (int index) {
public void showSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return;
@@ -46833,7 +46869,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -2144,9 +2144,9 @@
+@@ -2144,9 +2144,9 @@ boolean translateTraversal (GdkEventKey
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -46845,7 +46881,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2180,7 +2180,7 @@
+@@ -2180,7 +2180,7 @@ String verifyText (String string, int st
event.text = string;
event.start = start;
event.end = end;
@@ -46854,10 +46890,10 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets/ToolBar.java
---- x86/org/eclipse/swt/widgets/ToolBar.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ToolBar.java 2010-09-09 12:02:46.000000000 +0000
-@@ -188,11 +188,11 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolBar.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolBar.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolBar.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolBar.java 2011-03-21 11:34:23.915725579 +0000
+@@ -188,11 +188,11 @@ Widget [] computeTabList () {
return result;
}
@@ -46871,7 +46907,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
return handle;
}
-@@ -210,7 +210,7 @@
+@@ -210,7 +210,7 @@ void fixChildren (Shell newShell, Shell
}
}
@@ -46880,7 +46916,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (lastFocus != null && lastFocus.setFocus ()) return true;
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ public ToolItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -46889,7 +46925,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -308,13 +308,13 @@
+@@ -308,13 +308,13 @@ public ToolItem [] getItems () {
}
ToolItem [] _getItems () {
@@ -46905,7 +46941,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
Widget widget = display.getWidget (data);
if (widget != null) items [index++] = (ToolItem) widget;
}
-@@ -364,9 +364,9 @@
+@@ -364,9 +364,9 @@ ToolItem [] _getTabItemList () {
return tabItemList;
}
@@ -46917,7 +46953,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (result != 0) return result;
ToolItem [] items = getItems ();
int length = items.length;
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ int /*long*/ gtk_key_press_event (int /*
if ((item.style & SWT.DROP_DOWN) != 0) {
Event event = new Event ();
event.detail = SWT.ARROW;
@@ -46926,7 +46962,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
event.x = OS.GTK_WIDGET_X (topHandle);
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth() - OS.GTK_WIDGET_WIDTH(topHandle) - event.x;
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ public int indexOf (ToolItem item) {
boolean mnemonicHit (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -46935,7 +46971,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -46944,7 +46980,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;
}
return false;
-@@ -515,7 +515,7 @@
+@@ -515,7 +515,7 @@ int setBounds (int x, int y, int width,
return result;
}
@@ -46953,10 +46989,10 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
super.setFontDescription (font);
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widgets/ToolItem.java
---- x86/org/eclipse/swt/widgets/ToolItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ToolItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,7 +38,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolItem.java 2011-03-21 11:34:23.845726568 +0000
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class ToolItem extends Item {
@@ -46965,7 +47001,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
ToolBar parent;
Control control;
Image hotImage, disabledImage;
-@@ -252,11 +252,11 @@
+@@ -252,11 +252,11 @@ void createHandle (int index) {
}
OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);
// This code is intentionally commented.
@@ -46980,7 +47016,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
// setForegroundColor (color);
// setFontDescription (font);
if ((parent.state & FOREGROUND) != 0) {
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ public void dispose () {
public Rectangle getBounds () {
checkWidget();
parent.forceResize ();
@@ -46989,7 +47025,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
int x, y, width, height;
/*
* Bug in GTK. Toolbar items are only allocated their minimum size
-@@ -401,7 +401,7 @@
+@@ -401,7 +401,7 @@ public Image getDisabledImage () {
*/
public boolean getEnabled () {
checkWidget();
@@ -46998,7 +47034,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
return OS.GTK_WIDGET_SENSITIVE (topHandle);
}
-@@ -491,11 +491,11 @@
+@@ -491,11 +491,11 @@ public String getToolTipText () {
public int getWidth () {
checkWidget();
parent.forceResize ();
@@ -47012,7 +47048,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -503,14 +503,14 @@
+@@ -503,14 +503,14 @@ int /*long*/ gtk_button_press_event (int
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -47029,7 +47065,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -518,17 +518,17 @@
+@@ -518,17 +518,17 @@ int /*long*/ gtk_button_release_event (i
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -47050,7 +47086,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
if (eventPtr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
-@@ -544,7 +544,7 @@
+@@ -544,7 +544,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
if ((((parent.style & SWT.RIGHT_TO_LEFT) == 0) && x <= (int)x_win [0])
|| (((parent.style & SWT.RIGHT_TO_LEFT) != 0) && (int)x_win [0] <= x + width)) {
event.detail = SWT.ARROW;
@@ -47059,7 +47095,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
event.x = OS.GTK_WIDGET_X (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) event.x = parent.getClientWidth () - OS.GTK_WIDGET_WIDTH (topHandle) - event.x;
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
-@@ -564,7 +564,7 @@
+@@ -564,7 +564,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
return 0;
}
@@ -47068,7 +47104,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
parent.gtk_enter_notify_event (widget, event);
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
if (drawHotImage && imageHandle != 0) {
-@@ -572,7 +572,7 @@
+@@ -572,7 +572,7 @@ int /*long*/ gtk_enter_notify_event (int
if (imageList != null) {
int index = imageList.indexOf (hotImage);
if (index != -1) {
@@ -47077,7 +47113,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -580,7 +580,7 @@
+@@ -580,7 +580,7 @@ int /*long*/ gtk_enter_notify_event (int
return 0;
}
@@ -47086,7 +47122,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -596,13 +596,13 @@
+@@ -596,13 +596,13 @@ int /*long*/ gtk_event_after (int /*long
return 0;
}
@@ -47102,7 +47138,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
parent.gtk_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
-@@ -611,7 +611,7 @@
+@@ -611,7 +611,7 @@ int /*long*/ gtk_leave_notify_event (int
if (imageList != null) {
int index = imageList.indexOf (image);
if (index != -1) {
@@ -47111,7 +47147,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -620,12 +620,12 @@
+@@ -620,12 +620,12 @@ int /*long*/ gtk_leave_notify_event (int
return 0;
}
@@ -47126,7 +47162,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -662,7 +662,7 @@
+@@ -662,7 +662,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
@@ -47135,7 +47171,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -846,7 +846,7 @@
+@@ -846,7 +846,7 @@ public void setDisabledImage (Image imag
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -47144,7 +47180,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
/*
-@@ -885,7 +885,7 @@
+@@ -885,7 +885,7 @@ boolean setFocus () {
return result;
}
@@ -47153,7 +47189,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
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);
-@@ -944,7 +944,7 @@
+@@ -944,7 +944,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -47162,10 +47198,10 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets/ToolTip.java
---- x86/org/eclipse/swt/widgets/ToolTip.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/ToolTip.java 2010-09-09 12:02:46.000000000 +0000
-@@ -47,7 +47,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolTip.java swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolTip.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/ToolTip.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/ToolTip.java 2011-03-21 11:34:23.865726298 +0000
+@@ -47,7 +47,7 @@ public class ToolTip extends Widget {
String text, message;
TrayItem item;
int x, y, timerId;
@@ -47174,7 +47210,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
int [] borderPolygon;
boolean spikeAbove, autohide;
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ public void addSelectionListener (Select
}
void configure () {
@@ -47183,7 +47219,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (handle);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (handle));
GdkRectangle dest = new GdkRectangle ();
-@@ -249,9 +249,9 @@
+@@ -249,9 +249,9 @@ void configure () {
OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
}
}
@@ -47195,7 +47231,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gdk_window_shape_combine_region (window, rgn, 0, 0);
OS.gdk_region_destroy (rgn);
}
-@@ -291,13 +291,13 @@
+@@ -291,13 +291,13 @@ void createWidget (int index) {
void deregister () {
super.deregister ();
if ((style & SWT.BALLOON) == 0) {
@@ -47211,7 +47247,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (parent != null) parent.removeTooTip (this);
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
-@@ -330,7 +330,7 @@
+@@ -330,7 +330,7 @@ Point getLocation () {
int x = this.x;
int y = this.y;
if (item != null) {
@@ -47220,7 +47256,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
GdkRectangle area = new GdkRectangle ();
OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
-@@ -338,7 +338,7 @@
+@@ -338,7 +338,7 @@ Point getLocation () {
y = area.y + area.height / 2;
} else {
OS.gtk_widget_realize (itemHandle);
@@ -47229,7 +47265,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
int [] px = new int [1], py = new int [1];
OS.gdk_window_get_origin (window, px, py);
x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
-@@ -458,20 +458,20 @@
+@@ -458,20 +458,20 @@ public String getText () {
public boolean getVisible () {
checkWidget ();
if ((style & SWT.BALLOON) != 0) return OS.GTK_WIDGET_VISIBLE (handle);
@@ -47255,7 +47291,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2);
int x = BORDER + PADDING;
int y = BORDER + PADDING;
-@@ -485,8 +485,8 @@
+@@ -485,8 +485,8 @@ int /*long*/ gtk_expose_event (int /*lon
case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;
}
if (buffer != null) {
@@ -47266,7 +47302,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_icon_factory_lookup_default (buffer),
style,
OS.GTK_TEXT_DIR_NONE,
-@@ -516,11 +516,11 @@
+@@ -516,11 +516,11 @@ int /*long*/ gtk_expose_event (int /*lon
return 0;
}
@@ -47280,7 +47316,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (widget);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (widget));
GdkRectangle dest = new GdkRectangle ();
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,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 {
@@ -47289,7 +47325,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
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);
-@@ -570,7 +570,7 @@
+@@ -570,7 +570,7 @@ public boolean isVisible () {
void register () {
super.register ();
if ((style & SWT.BALLOON) == 0) {
@@ -47298,7 +47334,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (tipWindow != 0) display.addWidget (tipWindow, this);
}
}
-@@ -657,7 +657,7 @@
+@@ -657,7 +657,7 @@ public void setLocation (int x, int y) {
if ((style & SWT.BALLOON) != 0) {
if (OS.GTK_WIDGET_VISIBLE (handle)) configure ();
} else {
@@ -47307,7 +47343,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (OS.GTK_WIDGET_VISIBLE (tipWindow)) {
OS.gtk_window_move (tipWindow, x, y);
}
-@@ -749,13 +749,13 @@
+@@ -749,13 +749,13 @@ public void setText (String string) {
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
OS.pango_layout_set_auto_dir (layoutText, false);
}
@@ -47323,7 +47359,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.pango_attr_list_insert (attrList, boldAttr);
OS.pango_layout_set_attributes (layoutText, attrList);
OS.pango_attr_list_unref (attrList);
-@@ -789,13 +789,13 @@
+@@ -789,13 +789,13 @@ public void setVisible (boolean visible)
configure ();
OS.gtk_widget_show (handle);
} else {
@@ -47339,7 +47375,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
}
-@@ -804,17 +804,17 @@
+@@ -804,17 +804,17 @@ public void setVisible (boolean visible)
if ((style & SWT.BALLOON) != 0) {
OS.gtk_widget_hide (handle);
} else {
@@ -47360,10 +47396,10 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_hide (tipWindow);
}
return 0;
-diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets/Tracker.java
---- x86/org/eclipse/swt/widgets/Tracker.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Tracker.java 2010-09-09 12:02:46.000000000 +0000
-@@ -42,7 +42,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Tracker.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Tracker.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Tracker.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Tracker.java 2011-03-21 11:34:23.865726298 +0000
+@@ -42,7 +42,7 @@ import org.eclipse.swt.events.*;
public class Tracker extends Widget {
Composite parent;
Cursor cursor;
@@ -47372,7 +47408,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
boolean tracking, cancelled, grabbed, stippled;
Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;
Rectangle bounds;
-@@ -306,14 +306,14 @@
+@@ -306,14 +306,14 @@ Rectangle [] computeProportions (Rectang
}
void drawRectangles (Rectangle [] rects) {
@@ -47390,7 +47426,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -366,17 +366,17 @@
+@@ -366,17 +366,17 @@ public boolean getStippled () {
}
boolean grab () {
@@ -47412,7 +47448,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
if (result != 0) return result;
GdkEventKey keyEvent = new GdkEventKey ();
OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
-@@ -510,8 +510,8 @@
+@@ -510,8 +510,8 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -47423,7 +47459,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
if (cursor != lastCursor) {
ungrab ();
grabbed = grab ();
-@@ -520,7 +520,7 @@
+@@ -520,7 +520,7 @@ int /*long*/ gtk_motion_notify_event (in
return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr);
}
@@ -47432,7 +47468,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
int [] newX = new int [1], newY = new int [1];
OS.gdk_window_get_pointer (window, newX, newY, null);
if (oldX != newX [0] || oldY != newY [0]) {
-@@ -710,7 +710,7 @@
+@@ -710,7 +710,7 @@ public boolean open () {
GdkEvent gdkEvent = new GdkEvent();
while (tracking) {
if (parent != null && parent.isDisposed ()) break;
@@ -47441,7 +47477,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
while (true) {
eventPtr = OS.gdk_event_get ();
if (eventPtr != 0) {
-@@ -720,7 +720,7 @@
+@@ -720,7 +720,7 @@ public boolean open () {
}
}
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
@@ -47450,10 +47486,10 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
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 -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widgets/TrayItem.java
---- x86/org/eclipse/swt/widgets/TrayItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TrayItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -40,8 +40,8 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TrayItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TrayItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TrayItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TrayItem.java 2011-03-21 11:34:23.835726712 +0000
+@@ -40,8 +40,8 @@ public class TrayItem extends Item {
Tray parent;
ToolTip toolTip;
String toolTipText;
@@ -47464,7 +47500,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
ImageList imageList;
/**
-@@ -164,20 +164,20 @@
+@@ -164,20 +164,20 @@ void createHandle (int index) {
OS.gtk_container_add (handle, imageHandle);
OS.gtk_widget_show (handle);
OS.gtk_widget_show (imageHandle);
@@ -47493,7 +47529,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
XClientMessageEvent event = new XClientMessageEvent ();
event.type = OS.ClientMessage;
event.window = trayWindow;
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ void createHandle (int index) {
event.data [0] = OS.GDK_CURRENT_TIME;
event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
event.data [2] = id;
@@ -47502,7 +47538,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
OS.g_free (clientEvent);
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ public String getToolTipText () {
return toolTipText;
}
@@ -47511,7 +47547,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
sendSelectionEvent (SWT.Selection);
/*
* Feature in GTK. GTK will generate a single-click event before sending
-@@ -262,10 +262,10 @@
+@@ -262,10 +262,10 @@ int /*long*/ gtk_activate (int /*long*/
* the single-click as the current event and for the double-click in the
* event queue.
*/
@@ -47524,7 +47560,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
int currEventType = 0;
if (currEvent != 0) {
currEventType = OS.GDK_EVENT_TYPE (currEvent);
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ int /*long*/ gtk_activate (int /*long*/
return 0;
}
@@ -47533,7 +47569,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -295,13 +295,13 @@
+@@ -295,13 +295,13 @@ int /*long*/ gtk_button_press_event (int
return 0;
}
@@ -47549,7 +47585,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove (gdkImage, gdkImagePtr);
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ int /*long*/ gtk_size_allocate (int /*lo
}
}
OS.gtk_widget_realize (handle);
@@ -47558,7 +47594,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
region.dispose ();
}
-@@ -328,7 +328,7 @@
+@@ -328,7 +328,7 @@ int /*long*/ gtk_size_allocate (int /*lo
return 0;
}
@@ -47567,7 +47603,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
sendEvent (SWT.MenuDetect);
return 0;
}
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -47576,10 +47612,10 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
OS.gtk_status_icon_set_visible (handle, true);
-diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widgets/TreeColumn.java
---- x86/org/eclipse/swt/widgets/TreeColumn.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TreeColumn.java 2010-09-09 12:02:46.000000000 +0000
-@@ -38,7 +38,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TreeColumn.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TreeColumn.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TreeColumn.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TreeColumn.java 2011-03-21 11:34:23.915725579 +0000
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class TreeColumn extends Item {
@@ -47588,7 +47624,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
Tree parent;
int modelIndex, lastButton, lastTime, lastX, lastWidth;
boolean customDraw, useFixedWidth;
-@@ -326,7 +326,7 @@
+@@ -326,7 +326,7 @@ public int getWidth () {
return OS.gtk_tree_view_column_get_width (handle);
}
@@ -47597,7 +47633,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
/*
* There is no API to get a double click on a table column. Normally, when
* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -336,7 +336,7 @@
+@@ -336,7 +336,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
*/
boolean doubleClick = false;
boolean postEvent = true;
@@ -47606,7 +47642,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
if (eventPtr != 0) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -368,7 +368,7 @@
+@@ -368,7 +368,7 @@ int /*long*/ gtk_clicked (int /*long*/ w
return 0;
}
@@ -47615,7 +47651,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -384,11 +384,11 @@
+@@ -384,11 +384,11 @@ int /*long*/ gtk_event_after (int /*long
return 0;
}
@@ -47629,7 +47665,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
useFixedWidth = false;
int x = OS.GTK_WIDGET_X (widget);
int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -435,7 +435,7 @@
+@@ -435,7 +435,7 @@ public void pack () {
if ((parent.style & SWT.VIRTUAL) != 0) {
//NOT DONE
} else {
@@ -47638,7 +47674,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
do {
width = Math.max (width, parent.calculateWidth (handle, iter, true));
-@@ -542,7 +542,7 @@
+@@ -542,7 +542,7 @@ public void setAlignment (int alignment)
parent.createRenderers (handle, modelIndex, index == 0, style);
}
@@ -47647,7 +47683,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ public void setImage (Image image) {
}
int imageIndex = headerImageList.indexOf (image);
if (imageIndex == -1) imageIndex = headerImageList.add (image);
@@ -47656,7 +47692,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-@@ -700,14 +700,14 @@
+@@ -700,14 +700,14 @@ public void setWidth (int width) {
*/
if (width != 0) {
if (buttonHandle != 0) {
@@ -47676,10 +47712,10 @@ diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/wid
OS.gdk_window_get_user_data (child, userData);
if (userData[0] == buttonHandle) {
OS.gdk_window_lower (child);
-diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widgets/TreeItem.java
---- x86/org/eclipse/swt/widgets/TreeItem.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/TreeItem.java 2010-09-09 12:02:46.000000000 +0000
-@@ -181,7 +181,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TreeItem.java swt-gtk-3.6.2/org/eclipse/swt/widgets/TreeItem.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/TreeItem.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/TreeItem.java 2011-03-21 11:34:23.875726151 +0000
+@@ -181,7 +181,7 @@ public TreeItem (TreeItem parentItem, in
this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true);
}
@@ -47688,7 +47724,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
super (parent, style);
this.parent = parent;
if (create) {
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ protected void checkSubclass () {
}
Color _getBackground () {
@@ -47697,7 +47733,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getBackground ();
GdkColor gdkColor = new GdkColor ();
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ Color _getBackground () {
Color _getBackground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getBackground ();
@@ -47706,7 +47742,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -233,13 +233,13 @@
+@@ -233,13 +233,13 @@ Color _getBackground (int index) {
}
boolean _getChecked () {
@@ -47722,7 +47758,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,7 @@ Color _getForeground () {
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
@@ -47731,7 +47767,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
-@@ -262,7 +262,7 @@
+@@ -262,7 +262,7 @@ Color _getForeground (int index) {
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
@@ -47740,7 +47776,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
-@@ -275,7 +275,7 @@
+@@ -275,7 +275,7 @@ Image _getImage (int index) {
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
@@ -47749,7 +47785,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return ""; //$NON-NLS-1$
-@@ -423,15 +423,15 @@
+@@ -423,15 +423,15 @@ public Rectangle getBounds (int index) {
// TODO fully test on early and later versions of GTK
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -47768,7 +47804,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -494,14 +494,14 @@
+@@ -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);
@@ -47788,7 +47824,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@ public boolean getChecked () {
*/
public boolean getExpanded () {
checkWidget();
@@ -47797,7 +47833,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -746,18 +746,18 @@
+@@ -746,18 +746,18 @@ public Rectangle getImageBounds (int ind
// TODO fully test on early and later versions of GTK
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -47820,7 +47856,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-@@ -908,12 +908,12 @@
+@@ -908,12 +908,12 @@ public Tree getParent () {
*/
public TreeItem getParentItem () {
checkWidget();
@@ -47835,7 +47871,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
item = parent._getItem (iter);
}
-@@ -971,19 +971,19 @@
+@@ -971,19 +971,19 @@ public Rectangle getTextBounds (int inde
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
@@ -47860,7 +47896,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -1066,8 +1066,8 @@
+@@ -1066,8 +1066,8 @@ public int indexOf (TreeItem item) {
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
boolean isParent = false;
@@ -47871,7 +47907,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int depth = OS.gtk_tree_path_get_depth (parentPath);
if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
-@@ -1075,9 +1075,9 @@
+@@ -1075,9 +1075,9 @@ public int indexOf (TreeItem item) {
OS.gtk_tree_path_free (currentPath);
OS.gtk_tree_path_free (parentPath);
if (!isParent) return index;
@@ -47883,7 +47919,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
if (indices != 0) {
int[] temp = new int[depth];
OS.memmove (temp, indices, 4 * temp.length);
-@@ -1089,13 +1089,13 @@
+@@ -1089,13 +1089,13 @@ public int indexOf (TreeItem item) {
}
void redraw () {
@@ -47900,7 +47936,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -1136,15 +1136,15 @@
+@@ -1136,15 +1136,15 @@ void releaseWidget () {
*/
public void removeAll () {
checkWidget ();
@@ -47919,7 +47955,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
int [] value = new int [1];
while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
-@@ -1249,16 +1249,16 @@
+@@ -1249,16 +1249,16 @@ public void setBackground (int index, Co
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -47940,7 +47976,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1309,7 +1309,7 @@
+@@ -1309,7 +1309,7 @@ public void setChecked (boolean checked)
*/
public void setExpanded (boolean expanded) {
checkWidget();
@@ -47949,7 +47985,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
if (expanded) {
OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
OS.gtk_tree_view_expand_row (parent.handle, path, false);
-@@ -1351,7 +1351,7 @@
+@@ -1351,7 +1351,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -47958,7 +47994,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1402,7 +1402,7 @@
+@@ -1402,7 +1402,7 @@ public void setFont (int index, Font fon
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -47967,7 +48003,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1420,16 +1420,16 @@
+@@ -1420,16 +1420,16 @@ public void setFont (int index, Font fon
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -47988,7 +48024,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1527,16 +1527,16 @@
+@@ -1527,16 +1527,16 @@ public void setForeground (int index, Co
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -48009,7 +48045,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1569,7 +1569,7 @@
+@@ -1569,7 +1569,7 @@ public void setGrayed (boolean grayed) {
* GTK+'s "inconsistent" state does not match SWT's concept of grayed.
* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
*/
@@ -48018,7 +48054,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
cached = true;
-@@ -1601,7 +1601,7 @@
+@@ -1601,7 +1601,7 @@ public void setImage (int index, Image i
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -48027,7 +48063,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1631,10 +1631,10 @@
+@@ -1631,10 +1631,10 @@ public void setImage (int index, Image i
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
if (image != null) {
@@ -48041,7 +48077,7 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1642,7 +1642,7 @@
+@@ -1642,7 +1642,7 @@ public void setImage (int index, Image i
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -48050,10 +48086,10 @@ diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widge
parent.modifyStyle (parentHandle, style);
}
}
-diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tree.java
---- x86/org/eclipse/swt/widgets/Tree.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Tree.java 2010-09-09 12:02:46.000000000 +0000
-@@ -75,9 +75,9 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Tree.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Tree.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Tree.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Tree.java 2011-03-21 11:34:23.855726427 +0000
+@@ -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 {
@@ -48065,7 +48101,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
TreeItem[] items;
TreeColumn [] columns;
TreeColumn sortColumn;
-@@ -155,14 +155,14 @@
+@@ -155,14 +155,14 @@ void _addListener (int eventType, Listen
}
}
@@ -48083,7 +48119,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (depth > 1) {
OS.gtk_tree_path_up (path);
parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-@@ -174,8 +174,8 @@
+@@ -174,8 +174,8 @@ TreeItem _getItem (int /*long*/ iter) {
return items [id];
}
@@ -48094,7 +48130,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int id = getId (iter, true);
OS.g_free (iter);
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ TreeItem _getItem (int /*long*/ parentIt
return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false);
}
@@ -48103,7 +48139,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (queryModel) {
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -219,7 +219,7 @@
+@@ -219,7 +219,7 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -48112,7 +48148,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (cell == ignoreCell) return 0;
TreeItem item = _getItem (iter);
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ int /*long*/ cellDataProc (int /*long*/
* fix is to only provide the data if the row is visible.
*/
if (OS.GTK_VERSION < OS.VERSION (2, 3, 2)) {
@@ -48121,7 +48157,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
GdkRectangle visible = new GdkRectangle ();
OS.gtk_tree_view_get_visible_rect (handle, visible);
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ int /*long*/ cellDataProc (int /*long*/
setData = checkData (item);
}
}
@@ -48130,7 +48166,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (setData) {
if (isPixbuf) {
ptr [0] = 0;
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ public void addTreeListener(TreeListener
addListener (SWT.Collapse, typedListener);
}
@@ -48139,7 +48175,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ int calculateWidth (int /*long*/ column,
int width = 0;
int [] w = new int [1];
@@ -48148,7 +48184,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_view_get_expander_column (handle) == column) {
/* indent */
-@@ -435,11 +435,11 @@
+@@ -435,11 +435,11 @@ int calculateWidth (int /*long*/ column,
}
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -48163,7 +48199,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ int calculateWidth (int /*long*/ column,
if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);
boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);
if (expanded) {
@@ -48172,7 +48208,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);
while (valid) {
width = Math.max (width, calculateWidth (column, childIter, true));
-@@ -498,8 +498,8 @@
+@@ -498,8 +498,8 @@ public void clear(int index, boolean all
clear (0, index, all);
}
@@ -48183,7 +48219,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -534,10 +534,10 @@
+@@ -534,10 +534,10 @@ public void clearAll (boolean all) {
checkWidget ();
clearAll (all, 0);
}
@@ -48196,7 +48232,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
int[] value = new int[1];
while (valid) {
-@@ -563,13 +563,13 @@
+@@ -563,13 +563,13 @@ public Point computeSize (int wHint, int
return size;
}
@@ -48214,7 +48250,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (newModel, newItem, newParent);
int [] index = new int [1];
-@@ -578,9 +578,9 @@
+@@ -578,9 +578,9 @@ void copyModel (int /*long*/ oldModel, i
if (index [0] != -1) {
item = items [index [0]];
if (item != null) {
@@ -48226,7 +48262,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int j = 0; j < FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -605,7 +605,7 @@
+@@ -605,7 +605,7 @@ void copyModel (int /*long*/ oldModel, i
}
} while (OS.gtk_tree_model_iter_next(oldModel, iter));
for (int i = 0; i < oldItems.length; i++) {
@@ -48235,7 +48271,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (oldItem != 0) {
OS.gtk_tree_store_remove (oldModel, oldItem);
OS.g_free (oldItem);
-@@ -638,17 +638,17 @@
+@@ -638,17 +638,17 @@ void createColumn (TreeColumn column, in
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -48258,7 +48294,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TreeColumn checkColumn = columns [0];
-@@ -704,7 +704,7 @@
+@@ -704,7 +704,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);
@@ -48267,7 +48303,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
modelHandle = OS.gtk_tree_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,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;
@@ -48276,7 +48312,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -769,11 +769,11 @@
+@@ -769,11 +769,11 @@ void createItem (TreeColumn column, int
} else {
createColumn (column, index);
}
@@ -48291,7 +48327,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -782,7 +782,7 @@
+@@ -782,7 +782,7 @@ void createItem (TreeColumn column, int
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -48300,7 +48336,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -816,7 +816,7 @@
+@@ -816,7 +816,7 @@ void createItem (TreeColumn column, int
}
}
@@ -48309,7 +48345,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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 @@
+@@ -836,7 +836,7 @@ void createItem (TreeItem item, int /*lo
modelChanged = true;
}
@@ -48318,7 +48354,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -859,9 +859,9 @@
+@@ -859,9 +859,9 @@ void createRenderers (int /*long*/ colum
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -48330,7 +48366,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -971,7 +971,7 @@
+@@ -971,7 +971,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 ();
@@ -48339,7 +48375,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -989,7 +989,7 @@
+@@ -989,7 +989,7 @@ public void deselect (TreeItem item) {
public void deselectAll() {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -48348,7 +48384,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1003,7 +1003,7 @@
+@@ -1003,7 +1003,7 @@ void destroyItem (TreeColumn column) {
index++;
}
if (index == columnCount) return;
@@ -48357,7 +48393,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -1011,11 +1011,11 @@
+@@ -1011,11 +1011,11 @@ void destroyItem (TreeColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -48373,7 +48409,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_set_model (handle, newModel);
OS.g_object_unref (oldModel);
modelHandle = newModel;
-@@ -1025,7 +1025,7 @@
+@@ -1025,7 +1025,7 @@ void destroyItem (TreeColumn column) {
for (int i=0; i<items.length; i++) {
TreeItem item = items [i];
if (item != null) {
@@ -48382,7 +48418,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int modelIndex = column.modelIndex;
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1089,7 +1089,7 @@
+@@ -1089,7 +1089,7 @@ void destroyItem (TreeItem item) {
if (OS.GTK_VERSION < OS.VERSION (2, 0, 6)) {
int length = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (length > 0) {
@@ -48391,7 +48427,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, 0);
while (valid) {
if (item.handle == iter) {
-@@ -1101,7 +1101,7 @@
+@@ -1101,7 +1101,7 @@ void destroyItem (TreeItem item) {
OS.g_free (iter);
}
}
@@ -48400,7 +48436,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1111,10 +1111,10 @@
+@@ -1111,10 +1111,10 @@ void destroyItem (TreeItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -48413,7 +48449,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1127,7 +1127,7 @@
+@@ -1127,7 +1127,7 @@ boolean dragDetect (int x, int y, boolea
return dragDetect;
}
@@ -48422,7 +48458,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
return paintWindow ();
}
-@@ -1165,13 +1165,13 @@
+@@ -1165,13 +1165,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -48439,7 +48475,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1271,13 +1271,13 @@
+@@ -1271,13 +1271,13 @@ public int getColumnCount () {
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -48456,7 +48492,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1292,8 +1292,8 @@
+@@ -1292,8 +1292,8 @@ public int [] getColumnOrder () {
return order;
}
@@ -48467,7 +48503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
// per row data
types [ID_COLUMN] = OS.G_TYPE_INT ();
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1349,11 +1349,11 @@
+@@ -1349,11 +1349,11 @@ public TreeColumn [] getColumns () {
}
TreeItem getFocusItem () {
@@ -48481,7 +48517,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1404,7 +1404,7 @@
+@@ -1404,7 +1404,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -48490,7 +48526,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1413,8 +1413,8 @@
+@@ -1413,8 +1413,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -48501,7 +48537,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1497,13 +1497,13 @@
+@@ -1497,13 +1497,13 @@ public TreeItem getItem (int index) {
public TreeItem getItem (Point point) {
checkWidget ();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -48518,7 +48554,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
boolean overExpander = false;
if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
-@@ -1560,7 +1560,7 @@
+@@ -1560,7 +1560,7 @@ public int getItemHeight () {
checkWidget ();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (itemCount == 0) {
@@ -48527,7 +48563,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1568,11 +1568,11 @@
+@@ -1568,11 +1568,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -48541,7 +48577,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1605,7 +1605,7 @@
+@@ -1605,7 +1605,7 @@ public TreeItem [] getItems () {
return getItems (0);
}
@@ -48550,7 +48586,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
TreeItem[] result = new TreeItem [length];
if (length == 0) return result;
-@@ -1616,7 +1616,7 @@
+@@ -1616,7 +1616,7 @@ TreeItem [] getItems (int /*long*/ paren
} else {
int i = 0;
int[] index = new int [1];
@@ -48559,7 +48595,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);
while (valid) {
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1670,14 +1670,14 @@
+@@ -1670,14 +1670,14 @@ public TreeItem getParentItem () {
return null;
}
@@ -48578,7 +48614,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1706,7 +1706,7 @@
+@@ -1706,7 +1706,7 @@ int /*long*/ getPixbufRenderer (int /*lo
*/
public TreeItem[] getSelection () {
checkWidget();
@@ -48587,7 +48623,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [items.length];
-@@ -1720,15 +1720,15 @@
+@@ -1720,15 +1720,15 @@ public TreeItem[] getSelection () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -48607,7 +48643,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
treeSelection [length] = _getItem (iter);
length++;
-@@ -1758,7 +1758,7 @@
+@@ -1758,7 +1758,7 @@ public TreeItem[] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -48616,7 +48652,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1810,14 +1810,14 @@
+@@ -1810,14 +1810,14 @@ public int getSortDirection () {
return sortDirection;
}
@@ -48635,7 +48671,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1844,12 +1844,12 @@
+@@ -1844,12 +1844,12 @@ int /*long*/ getTextRenderer (int /*long
*/
public TreeItem getTopItem () {
checkWidget ();
@@ -48650,7 +48686,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
item = _getItem (iter);
}
-@@ -1858,11 +1858,11 @@
+@@ -1858,11 +1858,11 @@ public TreeItem getTopItem () {
return item;
}
@@ -48664,7 +48700,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select tree view, when multiple items are already
-@@ -1874,10 +1874,10 @@
+@@ -1874,10 +1874,10 @@ int /*long*/ gtk_button_press_event (int
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -48677,7 +48713,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1892,10 +1892,10 @@
+@@ -1892,10 +1892,10 @@ int /*long*/ gtk_button_press_event (int
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -48690,7 +48726,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1915,13 +1915,13 @@
+@@ -1915,13 +1915,13 @@ int /*long*/ gtk_button_press_event (int
return result;
}
@@ -48707,7 +48743,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
TreeItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1931,32 +1931,32 @@
+@@ -1931,32 +1931,32 @@ int /*long*/ gtk_changed (int /*long*/ w
return 0;
}
@@ -48746,7 +48782,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -1973,8 +1973,8 @@
+@@ -1973,8 +1973,8 @@ int /*long*/ gtk_expose_event (int /*lon
return super.gtk_expose_event (widget, eventPtr);
}
@@ -48757,7 +48793,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1998,14 +1998,14 @@
+@@ -1998,14 +1998,14 @@ int /*long*/ gtk_key_press_event (int /*
return result;
}
@@ -48776,7 +48812,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -2018,10 +2018,10 @@
+@@ -2018,10 +2018,10 @@ int /*long*/ gtk_popup_menu (int /*long*
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -48789,7 +48825,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -2048,7 +2048,7 @@
+@@ -2048,7 +2048,7 @@ int gtk_row_inserted (int model, int pat
return 0;
}
@@ -48798,7 +48834,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (!searchEnabled()) {
OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search);
return 1;
-@@ -2056,7 +2056,7 @@
+@@ -2056,7 +2056,7 @@ int /*long*/ gtk_start_interactive_searc
return 0;
}
@@ -48807,7 +48843,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2094,7 +2094,7 @@
+@@ -2094,7 +2094,7 @@ int /*long*/ gtk_test_collapse_row (int
return 0;
}
@@ -48816,7 +48852,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2136,11 +2136,11 @@
+@@ -2136,11 +2136,11 @@ int /*long*/ gtk_test_expand_row (int /*
return 0;
}
@@ -48831,7 +48867,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
item = _getItem (iter);
}
-@@ -2156,7 +2156,7 @@
+@@ -2156,7 +2156,7 @@ int /*long*/ gtk_toggled (int /*long*/ r
return 0;
}
@@ -48840,7 +48876,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2167,17 +2167,17 @@
+@@ -2167,17 +2167,17 @@ void gtk_widget_size_request (int /*long
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -48861,7 +48897,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2190,13 +2190,13 @@
+@@ -2190,13 +2190,13 @@ void gtk_widget_size_request (int /*long
}
void hideFirstColumn () {
@@ -48877,7 +48913,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);
-@@ -2265,10 +2265,10 @@
+@@ -2265,10 +2265,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;
@@ -48890,7 +48926,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-@@ -2281,7 +2281,7 @@
+@@ -2281,7 +2281,7 @@ public int indexOf (TreeItem item) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -48899,7 +48935,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2289,13 +2289,13 @@
+@@ -2289,13 +2289,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -48915,7 +48951,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2342,9 +2342,9 @@
+@@ -2342,9 +2342,9 @@ void releaseItem (TreeItem item, boolean
items [index [0]] = null;
}
@@ -48927,7 +48963,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
while (valid) {
releaseItems (iter);
-@@ -2394,14 +2394,14 @@
+@@ -2394,14 +2394,14 @@ void releaseWidget () {
currentItem = null;
}
@@ -48945,7 +48981,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2441,7 +2441,7 @@
+@@ -2441,7 +2441,7 @@ public void removeAll () {
if (item != null && !item.isDisposed ()) item.release (false);
}
items = new TreeItem[4];
@@ -48954,7 +48990,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2525,19 +2525,19 @@
+@@ -2525,19 +2525,19 @@ public void removeTreeListener(TreeListe
eventTable.unhook (SWT.Collapse, listener);
}
@@ -48979,7 +49015,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2576,11 +2576,11 @@
+@@ -2576,11 +2576,11 @@ int /*long*/ rendererGetSizeProc (int /*
return result;
}
@@ -48994,7 +49030,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2594,7 +2594,7 @@
+@@ -2594,7 +2594,7 @@ int /*long*/ rendererRenderProc (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;
@@ -49003,7 +49039,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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;
-@@ -2605,7 +2605,7 @@
+@@ -2605,7 +2605,7 @@ int /*long*/ rendererRenderProc (int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -49012,7 +49048,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2619,7 +2619,7 @@
+@@ -2619,7 +2619,7 @@ int /*long*/ rendererRenderProc (int /*l
}
//send out measure before erase
@@ -49021,7 +49057,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
if (hooks (SWT.EraseItem)) {
-@@ -2656,7 +2656,7 @@
+@@ -2656,7 +2656,7 @@ int /*long*/ rendererRenderProc (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) {
@@ -49030,7 +49066,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2667,7 +2667,7 @@
+@@ -2667,7 +2667,7 @@ int /*long*/ rendererRenderProc (int /*l
}
}
}
@@ -49039,7 +49075,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2677,7 +2677,7 @@
+@@ -2677,7 +2677,7 @@ int /*long*/ rendererRenderProc (int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -49048,7 +49084,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2690,7 +2690,7 @@
+@@ -2690,7 +2690,7 @@ int /*long*/ rendererRenderProc (int /*l
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
GdkRectangle clipRect = new GdkRectangle ();
@@ -49057,7 +49093,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -2754,8 +2754,8 @@
+@@ -2754,8 +2754,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -49068,7 +49104,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2816,7 +2816,7 @@
+@@ -2816,7 +2816,7 @@ public void setInsertMark (TreeItem item
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
Rectangle rect = item.getBounds();
@@ -49077,7 +49113,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
if (path [0] == 0) return;
-@@ -2825,7 +2825,7 @@
+@@ -2825,7 +2825,7 @@ public void setInsertMark (TreeItem item
OS.gtk_tree_path_free (path [0]);
}
@@ -49086,7 +49122,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (count == itemCount) return;
boolean isVirtual = (style & SWT.VIRTUAL) != 0;
-@@ -2836,7 +2836,7 @@
+@@ -2836,7 +2836,7 @@ void setItemCount (int /*long*/ parentIt
ignoreAccessibility = true;
}
for (int i=itemCount; i<count; i++) {
@@ -49095,7 +49131,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (modelHandle, iter, parentIter);
OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
-@@ -2895,7 +2895,7 @@
+@@ -2895,7 +2895,7 @@ public void select (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -49104,7 +49140,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2917,7 +2917,7 @@
+@@ -2917,7 +2917,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -49113,7 +49149,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2929,7 +2929,7 @@
+@@ -2929,7 +2929,7 @@ void setBackgroundColor (GdkColor color)
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -49122,7 +49158,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
ownerDraw = true;
recreateRenderers ();
}
-@@ -2995,15 +2995,15 @@
+@@ -2995,15 +2995,15 @@ public void setColumnOrder (int [] order
if (seen [index]) error (SWT.ERROR_INVALID_ARGUMENT);
seen [index] = true;
}
@@ -49141,7 +49177,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
super.setFontDescription (font);
TreeColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -3068,12 +3068,12 @@
+@@ -3068,12 +3068,12 @@ void setParentBackground () {
recreateRenderers ();
}
@@ -49157,7 +49193,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -3142,7 +3142,7 @@
+@@ -3142,7 +3142,7 @@ public void setSelection (TreeItem [] it
int length = items.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -49166,7 +49202,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
boolean first = true;
for (int i = 0; i < length; i++) {
-@@ -3150,7 +3150,7 @@
+@@ -3150,7 +3150,7 @@ public void setSelection (TreeItem [] it
if (item == null) continue;
if (item.isDisposed ()) break;
if (item.parent != this) continue;
@@ -49175,7 +49211,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
showItem (path, false);
if (first) {
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-@@ -3243,7 +3243,7 @@
+@@ -3243,7 +3243,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;
@@ -49184,7 +49220,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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)) {
-@@ -3318,10 +3318,10 @@
+@@ -3318,10 +3318,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -49197,7 +49233,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3344,13 +3344,13 @@
+@@ -3344,13 +3344,13 @@ public void showSelection () {
if (items.length != 0 && items [0] != null) showItem (items [0]);
}
@@ -49214,7 +49250,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int i=0; i<indices.length; i++) {
OS.gtk_tree_path_append_index (tempPath, indices [i]);
OS.gtk_tree_view_expand_row (handle, tempPath, false);
-@@ -3422,12 +3422,12 @@
+@@ -3422,12 +3422,12 @@ public void showItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -49229,7 +49265,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (selection != null) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -3445,19 +3445,19 @@
+@@ -3445,19 +3445,19 @@ void updateScrollBarValue (ScrollBar bar
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -49254,7 +49290,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
/*
-@@ -3472,7 +3472,7 @@
+@@ -3472,7 +3472,7 @@ int /*long*/ windowProc (int /*long*/ ha
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -49263,10 +49299,10 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (window == gdkEvent.window) {
drawBackground (control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
}
-diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/Widget.java
---- x86/org/eclipse/swt/widgets/Widget.java 2010-09-09 12:01:42.000000000 +0000
-+++ x86_64/org/eclipse/swt/widgets/Widget.java 2010-09-09 12:02:46.000000000 +0000
-@@ -56,7 +56,7 @@
+diff -Nurp swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Widget.java swt-gtk-3.6.2/org/eclipse/swt/widgets/Widget.java
+--- swt-gtk-3.6.2.orig//org/eclipse/swt/widgets/Widget.java 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/org/eclipse/swt/widgets/Widget.java 2011-03-21 11:34:23.825726858 +0000
+@@ -56,7 +56,7 @@ public abstract class Widget {
*
* @noreference This field is not intended to be referenced by clients.
*/
@@ -49275,7 +49311,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
int style, state;
Display display;
EventTable eventTable;
-@@ -284,7 +284,7 @@
+@@ -284,7 +284,7 @@ public void addDisposeListener (DisposeL
addListener (SWT.Dispose, typedListener);
}
@@ -49284,7 +49320,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,7 @@ static int checkBits (int style, int int
return style;
}
@@ -49293,7 +49329,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -421,7 +421,7 @@
+@@ -421,7 +421,7 @@ void deregister () {
}
void destroyWidget () {
@@ -49302,7 +49338,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
OS.gtk_widget_destroy (topHandle);
-@@ -620,281 +620,281 @@
+@@ -620,281 +620,281 @@ public int getStyle () {
}
@@ -49654,7 +49690,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -902,11 +902,11 @@
+@@ -902,11 +902,11 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
@@ -49668,7 +49704,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);
}
-@@ -1009,15 +1009,15 @@
+@@ -1009,15 +1009,15 @@ boolean hooks (int eventType) {
return eventTable.hooks (eventType);
}
@@ -49687,7 +49723,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (!mnemonicMatch (mnemonicHandle, key)) return false;
OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);
-@@ -1025,13 +1025,13 @@
+@@ -1025,13 +1025,13 @@ boolean mnemonicHit (int /*long*/ mnemon
return result;
}
@@ -49703,7 +49739,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_modify_style (handle, style);
}
-@@ -1176,11 +1176,11 @@
+@@ -1176,11 +1176,11 @@ protected void removeListener (int event
eventTable.unhook (eventType, handler);
}
@@ -49717,7 +49753,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1311,7 +1311,7 @@
+@@ -1311,7 +1311,7 @@ boolean sendKeyEvent (int type, GdkEvent
char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
int index = 0, count = 0, state = 0;
@@ -49726,7 +49762,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (keyEvent == null) {
ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
-@@ -1375,7 +1375,7 @@
+@@ -1375,7 +1375,7 @@ void sendSelectionEvent (int eventType,
return;
}
if (event == null) event = new Event ();
@@ -49735,7 +49771,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
-@@ -1509,8 +1509,8 @@
+@@ -1509,8 +1509,8 @@ public void setData (String key, Object
if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
}
@@ -49746,7 +49782,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
-@@ -1644,15 +1644,15 @@
+@@ -1644,15 +1644,15 @@ boolean setTabItemFocus (boolean next) {
return false;
}
@@ -49765,7 +49801,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1671,15 +1671,15 @@
+@@ -1671,15 +1671,15 @@ public String toString () {
return getName () + " {" + string + "}";
}
@@ -49784,7 +49820,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1687,7 +1687,7 @@
+@@ -1687,7 +1687,7 @@ boolean translateTraversal (int event) {
return false;
}
@@ -49793,7 +49829,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
-@@ -1713,13 +1713,13 @@
+@@ -1713,13 +1713,13 @@ int /*long*/ windowProc (int /*long*/ ha
}
}
@@ -49810,7 +49846,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
-@@ -1762,7 +1762,7 @@
+@@ -1762,7 +1762,7 @@ int /*long*/ windowProc (int /*long*/ ha
}
}
@@ -49819,7 +49855,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
switch ((int)/*64*/user_data) {
case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1);
case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);
-@@ -1778,7 +1778,7 @@
+@@ -1778,7 +1778,7 @@ int /*long*/ windowProc (int /*long*/ ha
}
}
diff --git a/debian/patches/common/02-webkit_linkage.patch b/debian/patches/common/02-webkit_linkage.patch
new file mode 100644
index 0000000..d06c644
--- /dev/null
+++ b/debian/patches/common/02-webkit_linkage.patch
@@ -0,0 +1,15 @@
+Description: Fix linkage for WebKit (>= 1.3).
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=326066
+Origin: https://bugs.eclipse.org/bugs/attachment.cgi?id=179464&action=diff
+diff -Nurp swt-gtk-3.6.2.orig//make_linux.mak swt-gtk-3.6.2/make_linux.mak
+--- swt-gtk-3.6.2.orig//make_linux.mak 2011-03-21 11:12:43.205883562 +0000
++++ swt-gtk-3.6.2/make_linux.mak 2011-03-21 11:23:02.149147482 +0000
+@@ -95,7 +95,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdo
+ XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
+ WEBKITCFLAGS = `pkg-config --cflags gtk+-2.0` -I/usr/include/webkit-1.0 -I/usr/include/libsoup-2.4
+-WEBKITLIBS = -lwebkit-1.0
++WEBKITLIBS = `pkg-config --libs webkit-1.0`
+
+ SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+ CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
diff --git a/debian/patches/common/04-fix-webkit-includes.patch b/debian/patches/common/04-fix-webkit-includes.patch
new file mode 100644
index 0000000..f919318
--- /dev/null
+++ b/debian/patches/common/04-fix-webkit-includes.patch
@@ -0,0 +1,17 @@
+Description: Fix a missing include for WebKit (>= 1.3) JNI.
+Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=341250
+Author: Chris Coulson <chris.coulson at canonical.com>,
+ Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+diff -Nurp swt-gtk-3.6.2.orig//webkitgtk.h swt-gtk-3.6.2/webkitgtk.h
+--- swt-gtk-3.6.2.orig//webkitgtk.h 2011-02-10 17:27:56.000000000 +0000
++++ swt-gtk-3.6.2/webkitgtk.h 2011-03-23 10:21:39.019518695 +0000
+@@ -28,6 +28,9 @@
+ #include <webkit/webkitnetworkrequest.h>
+ #include <webkit/webkitsoupauthdialog.h>
+ #include <webkit/webkitversion.h>
++#if WEBKIT_MINOR_VERSION > 2
++# include <webkit/webkitglobals.h>
++#endif
+ #include <webkit/webkitwebpolicydecision.h>
+ #include <webkit/webkitwebsettings.h>
+ #include <webkit/webkitwebview.h>
diff --git a/gnome.h b/gnome.h
index 6caca74..4cebd6d 100644
--- a/gnome.h
+++ b/gnome.h
@@ -28,8 +28,16 @@
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-info.h>
-#define gnome_vfs_url_show_LIB "libgnomevfs-2.so.0"
-#define gnome_vfs_make_uri_from_input_with_dirs_LIB "libgnomevfs-2.so.0"
-#define gnome_vfs_mime_application_launch_LIB "libgnomevfs-2.so.0"
+#ifdef AIX
+#define LIB_VFS "libgnomevfs-2.a(libgnomevfs-2.so.0)"
+#elif HPUX
+#define LIB_VFS "libgnomevfs-2.so"
+#else
+#define LIB_VFS "libgnomevfs-2.so.0"
+#endif
+
+#define gnome_vfs_url_show_LIB LIB_VFS
+#define gnome_vfs_make_uri_from_input_with_dirs_LIB LIB_VFS
+#define gnome_vfs_mime_application_launch_LIB LIB_VFS
#endif
diff --git a/make_aix.mak b/make_aix.mak
new file mode 100644
index 0000000..a951b1b
--- /dev/null
+++ b/make_aix.mak
@@ -0,0 +1,198 @@
+#*******************************************************************************
+# Copyright (c) 2000, 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Makefile for creating SWT libraries for Linux GTK
+
+include make_common.mak
+
+SWT_VERSION=$(maj_ver)$(min_ver)
+
+# Define the various shared libraries to be build.
+WS_PREFIX = gtk
+SWT_PREFIX = swt
+CDE_PREFIX = swt-cde
+AWT_PREFIX = swt-awt
+SWTPI_PREFIX = swt-pi
+CAIRO_PREFIX = swt-cairo
+ATK_PREFIX = swt-atk
+GNOME_PREFIX = swt-gnome
+GLX_PREFIX = swt-glx
+
+SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+CDE_LIB = lib$(CDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+
+CAIROCFLAGS = `pkg-config --cflags cairo`
+CAIROLIBS = `pkg-config --libs cairo` -lcairo
+
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lXtst -lX11
+
+CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+
+AWT_LFLAGS = -shared -s ${SWT_LFLAGS}
+AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -lX11
+
+ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
+ATKLIBS = `pkg-config --libs atk gtk+-2.0`
+
+GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
+
+GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
+
+# Uncomment for Native Stats tool
+#NATIVE_STATS = -DNATIVE_STATS
+
+SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
+AWT_OBJECTS = swt_awt.o
+SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
+CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
+ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
+GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
+GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+
+CFLAGS = -O -Wall \
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
+ -DAIX -DGTK \
+ -I$(JAVA_HOME)/include \
+ ${SWT_PTR_CFLAGS}
+LFLAGS = -shared -s ${SWT_LFLAGS}
+
+
+all: make_swt make_atk #make_glx
+
+#
+# SWT libs
+#
+make_swt: $(SWT_LIB) $(SWTPI_LIB)
+
+$(SWT_LIB): $(SWT_OBJECTS)
+ $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+
+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)
+
+swt.o: swt.c swt.h
+ $(CC) $(CFLAGS) -c swt.c
+os.o: os.c os.h swt.h os_custom.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
+os_structs.o: os_structs.c os_structs.h os.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c
+os_custom.o: os_custom.c os_structs.h os.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_custom.c
+os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_stats.c
+
+#
+# CAIRO libs
+#
+make_cairo: $(CAIRO_LIB)
+
+$(CAIRO_LIB): $(CAIRO_OBJECTS)
+ $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+
+cairo.o: cairo.c cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c
+cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_stats.c
+
+#
+# CDE lib
+#
+
+make_cde: $(CDE_LIB)
+
+$(CDE_LIB): $(CDE_OBJECTS)
+ $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+
+#
+# AWT lib
+#
+make_awt:$(AWT_LIB)
+
+$(AWT_LIB): $(AWT_OBJECTS)
+ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+
+#
+# Atk lib
+#
+make_atk: $(ATK_LIB)
+
+$(ATK_LIB): $(ATK_OBJECTS)
+ $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+
+atk.o: atk.c atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+atk_structs.o: atk_structs.c atk_structs.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_structs.c
+atk_custom.o: atk_custom.c atk_structs.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_custom.c
+atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
+
+#
+# Gnome lib
+#
+make_gnome: $(GNOME_LIB)
+
+$(GNOME_LIB): $(GNOME_OBJECTS)
+ $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+
+gnome.o: gnome.c
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+
+gnome_structs.o: gnome_structs.c
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_structs.c
+
+gnome_stats.o: gnome_stats.c gnome_stats.h
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_stats.c
+
+#
+# GLX lib
+#
+make_glx: $(GLX_LIB)
+
+$(GLX_LIB): $(GLX_OBJECTS)
+ $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+
+glx.o: glx.c
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+
+glx_structs.o: glx_structs.c
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_structs.c
+
+glx_stats.o: glx_stats.c glx_stats.h
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_stats.c
+
+#
+# Install
+#
+install: all
+ cp *.a $(OUTPUT_DIR)
+
+#
+# Clean
+#
+clean:
+ rm -f *.o *.a
diff --git a/make_common.mak b/make_common.mak
index af8082b..7182563 100644
--- a/make_common.mak
+++ b/make_common.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=3
-min_ver=655
-comma_ver=3,6,5,5
+min_ver=659
+comma_ver=3,6,5,9
diff --git a/org/eclipse/swt/accessibility/AccessibleObject.java b/org/eclipse/swt/accessibility/AccessibleObject.java
index 07ef376..ec4c646 100644
--- a/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -545,42 +545,42 @@ class AccessibleObject {
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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.rightMargin != -1) {
int /*long*/ 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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.topMargin != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.topMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.bottomMargin != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.bottomMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.indent != -1) {
int /*long*/ 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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.justify) {
int /*long*/ 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_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
} else if (event.alignment != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION));
@@ -592,7 +592,7 @@ class AccessibleObject {
}
attr.value = getStringPtr (str);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
//TODO - tabStops
if (event.attributes != null) {
@@ -602,7 +602,7 @@ class AccessibleObject {
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
}
}
@@ -1729,7 +1729,7 @@ class AccessibleObject {
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_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.underline) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -1743,14 +1743,14 @@ class AccessibleObject {
}
attr.value = getStringPtr (str);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.strikeout) {
int /*long*/ 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);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
Font font = style.font;
if (font != null && !font.isDisposed()) {
@@ -1760,37 +1760,37 @@ class AccessibleObject {
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));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_SIZE));
attr.value = getStringPtr (String.valueOf (OS.pango_font_description_get_size(font.handle) / OS.PANGO_SCALE));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STYLE));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_STYLE, OS.pango_font_description_get_style(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_VARIANT));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_VARIANT, OS.pango_font_description_get_variant(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRETCH));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_STRETCH, OS.pango_font_description_get_stretch(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_WEIGHT));
attr.value = getStringPtr (String.valueOf (OS.pango_font_description_get_weight(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
Color color = style.foreground;
if (color != null && !color.isDisposed()) {
@@ -1798,7 +1798,7 @@ class AccessibleObject {
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);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
color = style.background;
if (color != null && !color.isDisposed()) {
@@ -1806,7 +1806,7 @@ class AccessibleObject {
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);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
}
if (event.attributes != null) {
@@ -1816,7 +1816,7 @@ class AccessibleObject {
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
}
return result;
diff --git a/org/eclipse/swt/browser/Mozilla.java b/org/eclipse/swt/browser/Mozilla.java
index 30d6b71..af44dda 100644
--- a/org/eclipse/swt/browser/Mozilla.java
+++ b/org/eclipse/swt/browser/Mozilla.java
@@ -3719,8 +3719,6 @@ int SetVisibility (int aVisibility) {
visibilityWindowListeners[i].hide (event);
}
}
- } else {
- visible = aVisibility != 0;
}
return XPCOM.NS_OK;
}
diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
index 1244c84..fa8840b 100644
--- a/org/eclipse/swt/browser/WebKit.java
+++ b/org/eclipse/swt/browser/WebKit.java
@@ -116,7 +116,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
@@ -139,7 +139,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
@@ -173,7 +173,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) {
/* this happens if a navigation has not occurred yet */
diff --git a/org/eclipse/swt/graphics/Device.java b/org/eclipse/swt/graphics/Device.java
index 7393351..32e16e8 100644
--- a/org/eclipse/swt/graphics/Device.java
+++ b/org/eclipse/swt/graphics/Device.java
@@ -161,8 +161,17 @@ void checkCairo() {
if (CAIRO_LOADED) return;
try {
/* Check if cairo is available on the system */
- byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
+ byte[] buffer ;
+ int flags = OS.RTLD_LAZY;
+ if (OS.IsAIX) {
+ buffer = Converter.wcsToMbcs(null, "libcairo.a(libcairo.so.2)", true);
+ flags |= OS.RTLD_MEMBER;
+ } else if (OS.IsHPUX) {
+ buffer = Converter.wcsToMbcs(null, "libcairo.so", true);
+ } else {
+ buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
+ }
+ int /*long*/ libcairo = OS.dlopen(buffer, flags);
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
@@ -567,8 +576,10 @@ protected void init () {
useXRender = major_versionp[0] > 0 || (major_versionp[0] == 0 && minor_versionp[0] >= 8);
}
}
-
- if (debug) {
+ //TODO: Remove; temporary code only
+ boolean fixAIX = OS.IsAIX && OS.PTR_SIZEOF == 8;
+
+ if (debug || fixAIX) {
if (xDisplay != 0) {
/* Create the warning and error callbacks */
Class clazz = getClass ();
@@ -589,7 +600,7 @@ protected void init () {
XIOErrorProc = OS.XSetIOErrorHandler (XNullIOErrorProc);
}
}
- OS.XSynchronize (xDisplay, true);
+ if (debug) OS.XSynchronize (xDisplay, true);
}
}
@@ -883,7 +894,9 @@ static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent)
if (DEBUG || device.debug) {
new SWTError ().printStackTrace ();
}
- OS.Call (XErrorProc, xDisplay, xErrorEvent);
+ //TODO: Remove; temporary code only
+ boolean fixAIX = OS.IsAIX && OS.PTR_SIZEOF == 8;
+ if (!fixAIX) OS.Call (XErrorProc, xDisplay, xErrorEvent);
}
} else {
if (DEBUG) new SWTError ().printStackTrace ();
diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
index b1586d6..87d1355 100644
--- a/org/eclipse/swt/internal/Library.java
+++ b/org/eclipse/swt/internal/Library.java
@@ -24,7 +24,7 @@ public class Library {
/**
* SWT Minor version number (must be in the range 0..999)
*/
- static int MINOR_VERSION = 655;
+ static int MINOR_VERSION = 659;
/**
* SWT revision number (must be >= 0)
diff --git a/org/eclipse/swt/internal/gtk/OS.java b/org/eclipse/swt/internal/gtk/OS.java
index 7bdd8a6..41ed3fa 100644
--- a/org/eclipse/swt/internal/gtk/OS.java
+++ b/org/eclipse/swt/internal/gtk/OS.java
@@ -422,9 +422,10 @@ public class OS extends C {
public static final int PANGO_WEIGHT_NORMAL = 0x190;
public static final int PANGO_WRAP_WORD = 0;
public static final int PANGO_WRAP_WORD_CHAR = 2;
- public static final int RTLD_GLOBAL = 0x100;
- public static final int RTLD_LAZY = 1;
- public static final int RTLD_NOW = 2;
+ public static final int RTLD_GLOBAL = OS.RTLD_GLOBAL();
+ public static final int RTLD_LAZY = OS.RTLD_LAZY();
+ public static final int RTLD_MEMBER = 0x00040000;
+ public static final int RTLD_NOW = OS.RTLD_NOW();
public static final int X_OK = 0x01;
public static final int XA_CARDINAL = 6;
public static final int XA_WINDOW = 33;
@@ -1286,6 +1287,13 @@ public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src
*/
public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+/** @method flags=const*/
+public static final native int RTLD_GLOBAL();
+/** @method flags=const */
+public static final native int RTLD_NOW();
+/** @method flags=const */
+public static final native int RTLD_LAZY();
+
/** X render natives and constants */
public static final int PictStandardARGB32 = 0;
public static final int PictStandardRGB24 = 1;
@@ -3046,6 +3054,19 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GSList *)
+ * @param data cast=(gpointer)
+ */
+public static final native int /*long*/ _g_slist_append(int /*long*/ list, int /*long*/ data);
+public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/ data) {
+ lock.lock();
+ try {
+ return _g_slist_append(list, data);
+ } finally {
+ lock.unlock();
+ }
+}
/** @param list cast=(GSList *) */
public static final native int /*long*/ _g_slist_data (int /*long*/ list);
public static final int /*long*/ g_slist_data (int /*long*/ list) {
diff --git a/org/eclipse/swt/internal/webkit/WebKitGTK.java b/org/eclipse/swt/internal/webkit/WebKitGTK.java
index a564b4d..0b1717e 100644
--- a/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -537,8 +537,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
}
}
-public static final native int _soup_cookie_jar_get_type ();
-public static final int soup_cookie_jar_get_type () {
+public static final native int /*long*/ _soup_cookie_jar_get_type ();
+public static final int /*long*/ soup_cookie_jar_get_type () {
lock.lock();
try {
return _soup_cookie_jar_get_type ();
@@ -689,8 +689,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
* @param session cast=(SoupSession *)
* @param type cast=(GType)
*/
-public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int type);
-public static final void soup_session_add_feature_by_type (int /*long*/ session, int type) {
+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) {
lock.lock();
try {
_soup_session_add_feature_by_type (session, type);
@@ -703,8 +703,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
* @param session cast=(SoupSession *)
* @param feature_type cast=(GType)
*/
-public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int feature_type);
-public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int feature_type) {
+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) {
lock.lock();
try {
return _soup_session_get_feature (session, feature_type);
@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
}
}
-public static final native int _webkit_soup_auth_dialog_get_type ();
-public static final int webkit_soup_auth_dialog_get_type () {
+public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
+public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
lock.lock();
try {
return _webkit_soup_auth_dialog_get_type ();
diff --git a/org/eclipse/swt/program/Program.java b/org/eclipse/swt/program/Program.java
index 6f78ce2..9d4d4fe 100644
--- a/org/eclipse/swt/program/Program.java
+++ b/org/eclipse/swt/program/Program.java
@@ -115,8 +115,17 @@ static int getDesktop(final Display display) {
}
});
/* Check for the existence of libgio libraries */
- byte[] buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
- int /*long*/ libgio = OS.dlopen(buffer, OS.RTLD_LAZY);
+ byte[] buffer ;
+ int flags = OS.RTLD_LAZY;
+ if (OS.IsAIX) {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.a(libgio-2.0.so.0)", true);
+ flags |= OS.RTLD_MEMBER;
+ } else if (OS.IsHPUX) {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so", true);
+ } else {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
+ }
+ int /*long*/ 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);
diff --git a/os.c b/os.c
index 90076c4..04527a3 100644
--- a/os.c
+++ b/os.c
@@ -1107,6 +1107,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
}
#endif
+#ifndef NO_RTLD_1GLOBAL
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1GLOBAL)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1GLOBAL_FUNC);
+ rc = (jint)RTLD_GLOBAL;
+ OS_NATIVE_EXIT(env, that, RTLD_1GLOBAL_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1LAZY
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1LAZY)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1LAZY_FUNC);
+ rc = (jint)RTLD_LAZY;
+ OS_NATIVE_EXIT(env, that, RTLD_1LAZY_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1NOW
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1NOW)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1NOW_FUNC);
+ rc = (jint)RTLD_NOW;
+ OS_NATIVE_EXIT(env, that, RTLD_1NOW_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_XAnyEvent_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
(JNIEnv *env, jclass that)
@@ -4207,6 +4243,18 @@ fail:
}
#endif
+#ifndef NO__1g_1slist_1append
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1append)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1g_1slist_1append_FUNC);
+ rc = (jintLong)g_slist_append((GSList *)arg0, (gpointer)arg1);
+ OS_NATIVE_EXIT(env, that, _1g_1slist_1append_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1g_1slist_1data
JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/os_custom.c b/os_custom.c
index 5d757b0..704af6c 100644
--- a/os_custom.c
+++ b/os_custom.c
@@ -66,8 +66,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
rc = (jintLong)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
/*
* On AMD64, it is critical that functions which have a variable number of
* arguments, indicated by '...', include the '...' in their prototype. This
@@ -76,17 +74,10 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, ...); */
- typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_dialog_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_dialog_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jintLong)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ typedef jintLong (CALLING_CONVENTION* FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
+ LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new)
+ if (fp) {
+ rc = (jintLong)((FPTR) fp)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
}
fail:
@@ -107,8 +98,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
gtk_cell_layout_set_attributes(arg0, arg1, lparg2, arg3, arg4);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
/*
* On AMD64, it is critical that functions which have a variable number of
* arguments, indicated by '...', include the '...' in their prototype. This
@@ -117,16 +106,10 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef void (*FPTR)(jintLong, jintLong, ...); */
typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_set_attributes_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_set_attributes");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, lparg2, arg3, arg4);
+ LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes)
+ if (fp) {
+ ((FPTR)fp)(arg0, arg1, lparg2, arg3, arg4);
}
}
fail:
diff --git a/os_custom.h b/os_custom.h
index 90533e5..1f2b7de 100644
--- a/os_custom.h
+++ b/os_custom.h
@@ -25,229 +25,258 @@
#define GtkTextIter_sizeof() sizeof(GtkTextIter)
#define GtkTreeIter_sizeof() sizeof(GtkTreeIter)
+#ifdef AIX
+#define LIB_XRENDER "libXrender.a(libXrender.so)"
+#define LIB_GTK "libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)"
+#define LIB_GDK "libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)"
+#define LIB_ATK "libatk-1.0.a(libatk-1.0.so.0)"
+#define LIB_PANGO "libpango-1.0.a(libpango-1.0.so.0"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.a(libpangocairo-1.0.so.0)"
+#define LIB_GIO "libgio-2.0.a(libgio-2.0.so.0)"
+#define LIB_FONTCONFIG "libfontconfig.a(libfontconfig.so.1)"
+#elif HPUX
+#define LIB_XRENDER "libXrender.so"
+#define LIB_GTK "libgtk-x11-2.0.so"
+#define LIB_GDK "libgdk-x11-2.0.so"
+#define LIB_ATK "libatk-1.0.so"
+#define LIB_PANGO "libpango-1.0.so"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.so"
+#define LIB_GIO "libgio-2.0.so"
+#define LIB_FONTCONFIG "libfontconfig.so"
+#else
+#define LIB_XRENDER "libXrender.so"
+#define LIB_GTK "libgtk-x11-2.0.so.0"
+#define LIB_GDK "libgdk-x11-2.0.so.0"
+#define LIB_ATK "libatk-1.0.so.0"
+#define LIB_PANGO "libpango-1.0.so.0"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.so.0"
+#define LIB_GIO "libgio-2.0.so.0"
+#define LIB_FONTCONFIG "libfontconfig.so.1"
+#endif
+
/* Libraries for dynamic loaded functions */
-#define XRenderQueryExtension_LIB "libXrender.so"
-#define XRenderQueryVersion_LIB "libXrender.so"
-#define XRenderFindStandardFormat_LIB "libXrender.so"
-#define XRenderFindVisualFormat_LIB "libXrender.so"
-#define XRenderComposite_LIB "libXrender.so"
-#define XRenderCreatePicture_LIB "libXrender.so"
-#define XRenderFreePicture_LIB "libXrender.so"
-#define XRenderSetPictureClipRectangles_LIB "libXrender.so"
-#define XRenderSetPictureTransform_LIB "libXrender.so"
-#define gtk_calendar_display_options_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_get_date_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_select_day_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_select_month_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_set_display_options_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_set_attributes_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_clear_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_pack_start_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_entry_new_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_new_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_insert_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_remove_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_get_active_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_get_model_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_set_active_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_set_focus_on_click_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_popup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_popdown_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_get_inner_border_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_uris_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_folder_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_do_overwrite_confirmation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_local_only_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_label_set_line_wrap_mode_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_info_load_icon_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_info_free_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_theme_lookup_by_gicon_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_theme_get_default_LIB "libgtk-x11-2.0.so.0"
-#define gtk_menu_shell_set_take_focus_LIB "libgtk-x11-2.0.so.0"
-#define gtk_window_set_keep_below_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tooltip_trigger_tooltip_query_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_view_set_grid_lines_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_icon_from_stock_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_icon_sensitive_LIB "libgtk-x11-2.0.so.0"
-#define gdk_cursor_new_from_pixbuf_LIB "libgdk-x11-2.0.so.0"
-#define gdk_display_get_default_LIB "libgdk-x11-2.0.so.0"
-#define gdk_display_supports_cursor_color_LIB "libgdk-x11-2.0.so.0"
-#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0"
-#define gdk_pixbuf_save_to_bufferv_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_at_point_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0"
-#define gtk_status_icon_get_geometry_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_get_visible_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_set_from_pixbuf_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_set_visible_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
-#define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
-#define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
-#define gdk_window_restack_LIB "libgdk-x11-2.0.so.0"
-#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
-#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
-#define gtk_window_set_opacity_LIB "libgtk-x11-2.0.so.0"
-#define gtk_window_set_skip_taskbar_hint_LIB "libgtk-x11-2.0.so.0"
-#define gtk_widget_is_composited_LIB "libgtk-x11-2.0.so.0"
-#define gtk_widget_set_tooltip_text_LIB "libgtk-x11-2.0.so.0"
-#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0"
-#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so.0"
+#define XRenderQueryExtension_LIB LIB_XRENDER
+#define XRenderQueryVersion_LIB LIB_XRENDER
+#define XRenderFindStandardFormat_LIB LIB_XRENDER
+#define XRenderFindVisualFormat_LIB LIB_XRENDER
+#define XRenderComposite_LIB LIB_XRENDER
+#define XRenderCreatePicture_LIB LIB_XRENDER
+#define XRenderFreePicture_LIB LIB_XRENDER
+#define XRenderSetPictureClipRectangles_LIB LIB_XRENDER
+#define XRenderSetPictureTransform_LIB LIB_XRENDER
+#define gtk_calendar_display_options_LIB LIB_GTK
+#define gtk_calendar_get_date_LIB LIB_GTK
+#define gtk_calendar_new_LIB LIB_GTK
+#define gtk_calendar_select_day_LIB LIB_GTK
+#define gtk_calendar_select_month_LIB LIB_GTK
+#define gtk_calendar_set_display_options_LIB LIB_GTK
+#define gtk_cell_layout_set_attributes_LIB LIB_GTK
+#define gtk_cell_layout_clear_LIB LIB_GTK
+#define gtk_cell_layout_pack_start_LIB LIB_GTK
+#define gtk_combo_box_entry_new_text_LIB LIB_GTK
+#define gtk_combo_box_new_text_LIB LIB_GTK
+#define gtk_combo_box_insert_text_LIB LIB_GTK
+#define gtk_combo_box_remove_text_LIB LIB_GTK
+#define gtk_combo_box_get_active_LIB LIB_GTK
+#define gtk_combo_box_get_model_LIB LIB_GTK
+#define gtk_combo_box_set_active_LIB LIB_GTK
+#define gtk_combo_box_set_focus_on_click_LIB LIB_GTK
+#define gtk_combo_box_popup_LIB LIB_GTK
+#define gtk_combo_box_popdown_LIB LIB_GTK
+#define gtk_entry_text_index_to_layout_index_LIB LIB_GTK
+#define gtk_entry_get_inner_border_LIB LIB_GTK
+#define gtk_file_chooser_add_filter_LIB LIB_GTK
+#define gtk_file_chooser_dialog_new_LIB LIB_GTK
+#define gtk_file_chooser_get_current_folder_LIB LIB_GTK
+#define gtk_file_chooser_get_filename_LIB LIB_GTK
+#define gtk_file_chooser_get_filenames_LIB LIB_GTK
+#define gtk_file_chooser_get_filter_LIB LIB_GTK
+#define gtk_file_chooser_get_uri_LIB LIB_GTK
+#define gtk_file_chooser_get_uris_LIB LIB_GTK
+#define gtk_file_chooser_set_current_folder_LIB LIB_GTK
+#define gtk_file_chooser_set_current_folder_uri_LIB LIB_GTK
+#define gtk_file_chooser_set_current_name_LIB LIB_GTK
+#define gtk_file_chooser_set_do_overwrite_confirmation_LIB LIB_GTK
+#define gtk_file_chooser_set_extra_widget_LIB LIB_GTK
+#define gtk_file_chooser_set_filename_LIB LIB_GTK
+#define gtk_file_chooser_set_filter_LIB LIB_GTK
+#define gtk_file_chooser_set_local_only_LIB LIB_GTK
+#define gtk_file_chooser_set_uri_LIB LIB_GTK
+#define gtk_file_chooser_set_select_multiple_LIB LIB_GTK
+#define gtk_file_filter_add_pattern_LIB LIB_GTK
+#define gtk_file_filter_new_LIB LIB_GTK
+#define gtk_file_filter_get_name_LIB LIB_GTK
+#define gtk_file_filter_set_name_LIB LIB_GTK
+#define gtk_expander_get_expanded_LIB LIB_GTK
+#define gtk_expander_get_label_widget_LIB LIB_GTK
+#define gtk_expander_new_LIB LIB_GTK
+#define gtk_expander_set_expanded_LIB LIB_GTK
+#define gtk_expander_set_label_LIB LIB_GTK
+#define gtk_expander_set_label_widget_LIB LIB_GTK
+#define gtk_label_set_line_wrap_mode_LIB LIB_GTK
+#define gtk_icon_info_load_icon_LIB LIB_GTK
+#define gtk_icon_info_free_LIB LIB_GTK
+#define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK
+#define gtk_icon_theme_get_default_LIB LIB_GTK
+#define gtk_menu_shell_set_take_focus_LIB LIB_GTK
+#define gtk_window_set_keep_below_LIB LIB_GTK
+#define gtk_tooltip_trigger_tooltip_query_LIB LIB_GTK
+#define gtk_tree_selection_count_selected_rows_LIB LIB_GTK
+#define gtk_tree_selection_get_selected_rows_LIB LIB_GTK
+#define gtk_tree_view_column_cell_get_position_LIB LIB_GTK
+#define gtk_tree_view_set_grid_lines_LIB LIB_GTK
+#define gtk_entry_set_alignment_LIB LIB_GTK
+#define gtk_entry_set_icon_from_stock_LIB LIB_GTK
+#define gtk_entry_set_icon_sensitive_LIB LIB_GTK
+#define gdk_cursor_new_from_pixbuf_LIB LIB_GDK
+#define gdk_display_get_default_LIB LIB_GDK
+#define gdk_display_supports_cursor_color_LIB LIB_GDK
+#define gdk_draw_pixbuf_LIB LIB_GDK
+#define gdk_pixbuf_save_to_bufferv_LIB LIB_GDK
+#define gdk_screen_get_default_LIB LIB_GDK
+#define gdk_screen_get_monitor_at_point_LIB LIB_GDK
+#define gdk_screen_get_monitor_at_window_LIB LIB_GDK
+#define gdk_screen_get_monitor_geometry_LIB LIB_GDK
+#define gdk_screen_get_n_monitors_LIB LIB_GDK
+#define gdk_screen_get_number_LIB LIB_GDK
+#define gtk_status_icon_get_geometry_LIB LIB_GTK
+#define gtk_status_icon_get_visible_LIB LIB_GTK
+#define gtk_status_icon_new_LIB LIB_GTK
+#define gtk_status_icon_set_from_pixbuf_LIB LIB_GTK
+#define gtk_status_icon_set_visible_LIB LIB_GTK
+#define gtk_status_icon_set_tooltip_LIB LIB_GTK
+#define gtk_window_get_group_LIB LIB_GTK
+#define gtk_window_get_opacity_LIB LIB_GTK
+#define gdk_window_restack_LIB LIB_GDK
+#define gdk_window_set_keep_above_LIB LIB_GDK
+#define gdk_window_set_accept_focus_LIB LIB_GDK
+#define gtk_window_set_opacity_LIB LIB_GTK
+#define gtk_window_set_skip_taskbar_hint_LIB LIB_GTK
+#define gtk_widget_is_composited_LIB LIB_GTK
+#define gtk_widget_set_tooltip_text_LIB LIB_GTK
+#define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK
+#define gdk_x11_screen_lookup_visual_LIB LIB_GDK
-#define atk_object_add_relationship_LIB "libatk-1.0.so.0"
-#define atk_object_remove_relationship_LIB "libatk-1.0.so.0"
-#define pango_attr_underline_color_new_LIB "libpango-1.0.so.0"
-#define pango_attr_strikethrough_color_new_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_underline_thickness_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_underline_position_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_strikethrough_thickness_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_strikethrough_position_LIB "libpango-1.0.so.0"
-#define pango_layout_set_auto_dir_LIB "libpango-1.0.so.0"
-#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_context_set_font_options_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_context_get_font_options_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_set_resolution_LIB "libpangocairo-1.0.so.0"
-#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so.0"
-#define gdk_cairo_region_LIB "libgdk-x11-2.0.so.0"
-#define gdk_cairo_create_LIB "libgdk-x11-2.0.so.0"
-#define gtk_enumerate_printers_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_bottom_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_left_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_page_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_page_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_size_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_right_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_top_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_bottom_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_left_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_paper_size_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_right_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_top_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_free_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_display_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_ppd_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_is_custom_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_custom_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_from_ppd_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_status_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_surface_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_title_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_send_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_set_source_file_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_foreach_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_collate_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_n_copies_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_page_ranges_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_paper_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_paper_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_print_pages_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_resolution_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_collate_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_n_copies_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_page_ranges_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_print_pages_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_current_page_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_page_setup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_selected_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_current_page_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_manual_capabilities_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_page_setup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_get_backend_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_is_default_LIB "libgtk-x11-2.0.so.0"
-#define FcConfigAppFontAddFile_LIB "libfontconfig.so.1"
+#define atk_object_add_relationship_LIB LIB_ATK
+#define atk_object_remove_relationship_LIB LIB_ATK
+#define pango_attr_underline_color_new_LIB LIB_PANGO
+#define pango_attr_strikethrough_color_new_LIB LIB_PANGO
+#define pango_font_metrics_get_underline_thickness_LIB LIB_PANGO
+#define pango_font_metrics_get_underline_position_LIB LIB_PANGO
+#define pango_font_metrics_get_strikethrough_thickness_LIB LIB_PANGO
+#define pango_font_metrics_get_strikethrough_position_LIB LIB_PANGO
+#define pango_layout_set_auto_dir_LIB LIB_PANGO
+#define pango_cairo_create_layout_LIB LIB_PANGOCAIRO
+#define pango_cairo_context_set_font_options_LIB LIB_PANGOCAIRO
+#define pango_cairo_context_get_font_options_LIB LIB_PANGOCAIRO
+#define pango_cairo_layout_path_LIB LIB_PANGOCAIRO
+#define pango_cairo_show_layout_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_create_context_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_new_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_get_default_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_set_resolution_LIB LIB_PANGOCAIRO
+#define gdk_cairo_set_source_color_LIB LIB_GDK
+#define gdk_cairo_region_LIB LIB_GDK
+#define gdk_cairo_create_LIB LIB_GDK
+#define gtk_enumerate_printers_LIB LIB_GTK
+#define gtk_page_setup_get_bottom_margin_LIB LIB_GTK
+#define gtk_page_setup_get_left_margin_LIB LIB_GTK
+#define gtk_page_setup_get_orientation_LIB LIB_GTK
+#define gtk_page_setup_get_page_height_LIB LIB_GTK
+#define gtk_page_setup_get_page_width_LIB LIB_GTK
+#define gtk_page_setup_get_paper_height_LIB LIB_GTK
+#define gtk_page_setup_get_paper_size_LIB LIB_GTK
+#define gtk_page_setup_get_paper_width_LIB LIB_GTK
+#define gtk_page_setup_get_right_margin_LIB LIB_GTK
+#define gtk_page_setup_get_top_margin_LIB LIB_GTK
+#define gtk_page_setup_new_LIB LIB_GTK
+#define gtk_page_setup_set_bottom_margin_LIB LIB_GTK
+#define gtk_page_setup_set_left_margin_LIB LIB_GTK
+#define gtk_page_setup_set_orientation_LIB LIB_GTK
+#define gtk_page_setup_set_paper_size_LIB LIB_GTK
+#define gtk_page_setup_set_right_margin_LIB LIB_GTK
+#define gtk_page_setup_set_top_margin_LIB LIB_GTK
+#define gtk_paper_size_free_LIB LIB_GTK
+#define gtk_paper_size_get_display_name_LIB LIB_GTK
+#define gtk_paper_size_get_name_LIB LIB_GTK
+#define gtk_paper_size_get_ppd_name_LIB LIB_GTK
+#define gtk_paper_size_get_height_LIB LIB_GTK
+#define gtk_paper_size_get_width_LIB LIB_GTK
+#define gtk_paper_size_is_custom_LIB LIB_GTK
+#define gtk_paper_size_new_LIB LIB_GTK
+#define gtk_paper_size_new_custom_LIB LIB_GTK
+#define gtk_paper_size_new_from_ppd_LIB LIB_GTK
+#define gtk_print_job_get_printer_LIB LIB_GTK
+#define gtk_print_job_get_settings_LIB LIB_GTK
+#define gtk_print_job_get_status_LIB LIB_GTK
+#define gtk_print_job_get_surface_LIB LIB_GTK
+#define gtk_print_job_get_title_LIB LIB_GTK
+#define gtk_print_job_new_LIB LIB_GTK
+#define gtk_print_job_send_LIB LIB_GTK
+#define gtk_print_job_set_source_file_LIB LIB_GTK
+#define gtk_print_settings_foreach_LIB LIB_GTK
+#define gtk_print_settings_get_LIB LIB_GTK
+#define gtk_print_settings_get_collate_LIB LIB_GTK
+#define gtk_print_settings_get_n_copies_LIB LIB_GTK
+#define gtk_print_settings_get_orientation_LIB LIB_GTK
+#define gtk_print_settings_get_page_ranges_LIB LIB_GTK
+#define gtk_print_settings_get_paper_height_LIB LIB_GTK
+#define gtk_print_settings_get_paper_width_LIB LIB_GTK
+#define gtk_print_settings_get_print_pages_LIB LIB_GTK
+#define gtk_print_settings_get_printer_LIB LIB_GTK
+#define gtk_print_settings_get_resolution_LIB LIB_GTK
+#define gtk_print_settings_new_LIB LIB_GTK
+#define gtk_print_settings_set_LIB LIB_GTK
+#define gtk_print_settings_set_collate_LIB LIB_GTK
+#define gtk_print_settings_set_n_copies_LIB LIB_GTK
+#define gtk_print_settings_set_orientation_LIB LIB_GTK
+#define gtk_print_settings_set_page_ranges_LIB LIB_GTK
+#define gtk_print_settings_set_print_pages_LIB LIB_GTK
+#define gtk_print_settings_set_printer_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_current_page_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_page_setup_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_selected_printer_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_settings_LIB LIB_GTK
+#define gtk_print_unix_dialog_new_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_current_page_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_manual_capabilities_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_page_setup_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_settings_LIB LIB_GTK
+#define gtk_printer_get_backend_LIB LIB_GTK
+#define gtk_printer_get_name_LIB LIB_GTK
+#define gtk_printer_is_default_LIB LIB_GTK
+#define FcConfigAppFontAddFile_LIB LIB_FONTCONFIG
-#define g_app_info_create_from_commandline_LIB "libgio-2.0.so.0"
-#define g_app_info_get_all_LIB "libgio-2.0.so.0"
-#define g_app_info_get_executable_LIB "libgio-2.0.so.0"
-#define g_app_info_get_icon_LIB "libgio-2.0.so.0"
-#define g_app_info_get_id_LIB "libgio-2.0.so.0"
-#define g_app_info_get_name_LIB "libgio-2.0.so.0"
-#define g_app_info_launch_LIB "libgio-2.0.so.0"
-#define g_app_info_get_default_for_type_LIB "libgio-2.0.so.0"
-#define g_app_info_launch_default_for_uri_LIB "libgio-2.0.so.0"
-#define g_app_info_supports_uris_LIB "libgio-2.0.so.0"
-#define g_app_info_should_show_LIB "libgio-2.0.so.0"
-#define g_data_input_stream_new_LIB "libgio-2.0.so.0"
-#define g_data_input_stream_read_line_LIB "libgio-2.0.so.0"
-#define g_content_type_equals_LIB "libgio-2.0.so.0"
-#define g_content_type_get_mime_type_LIB "libgio-2.0.so.0"
-#define g_content_type_is_a_LIB "libgio-2.0.so.0"
-#define g_content_types_get_registered_LIB "libgio-2.0.so.0"
-#define g_desktop_app_info_new_from_filename_LIB "libgio-2.0.so.0"
-#define g_file_get_path_LIB "libgio-2.0.so.0"
-#define g_file_get_uri_LIB "libgio-2.0.so.0"
-#define g_file_icon_get_file_LIB "libgio-2.0.so.0"
-#define g_file_info_get_content_type_LIB "libgio-2.0.so.0"
-#define g_file_info_get_modification_time_LIB "libgio-2.0.so.0"
-#define g_file_new_for_path_LIB "libgio-2.0.so.0"
-#define g_file_new_for_uri_LIB "libgio-2.0.so.0"
-#define g_file_read_LIB "libgio-2.0.so.0"
-#define g_file_test_LIB "libgio-2.0.so.0"
-#define g_icon_to_string_LIB "libgio-2.0.so.0"
-#define g_icon_new_for_string_LIB "libgio-2.0.so.0"
-#define g_file_query_info_LIB "libgio-2.0.so.0"
+#define g_app_info_create_from_commandline_LIB LIB_GIO
+#define g_app_info_get_all_LIB LIB_GIO
+#define g_app_info_get_executable_LIB LIB_GIO
+#define g_app_info_get_icon_LIB LIB_GIO
+#define g_app_info_get_id_LIB LIB_GIO
+#define g_app_info_get_name_LIB LIB_GIO
+#define g_app_info_launch_LIB LIB_GIO
+#define g_app_info_get_default_for_type_LIB LIB_GIO
+#define g_app_info_launch_default_for_uri_LIB LIB_GIO
+#define g_app_info_supports_uris_LIB LIB_GIO
+#define g_app_info_should_show_LIB LIB_GIO
+#define g_data_input_stream_new_LIB LIB_GIO
+#define g_data_input_stream_read_line_LIB LIB_GIO
+#define g_content_type_equals_LIB LIB_GIO
+#define g_content_type_get_mime_type_LIB LIB_GIO
+#define g_content_type_is_a_LIB LIB_GIO
+#define g_content_types_get_registered_LIB LIB_GIO
+#define g_desktop_app_info_new_from_filename_LIB LIB_GIO
+#define g_file_get_path_LIB LIB_GIO
+#define g_file_get_uri_LIB LIB_GIO
+#define g_file_icon_get_file_LIB LIB_GIO
+#define g_file_info_get_content_type_LIB LIB_GIO
+#define g_file_info_get_modification_time_LIB LIB_GIO
+#define g_file_new_for_path_LIB LIB_GIO
+#define g_file_new_for_uri_LIB LIB_GIO
+#define g_file_read_LIB LIB_GIO
+#define g_file_test_LIB LIB_GIO
+#define g_icon_to_string_LIB LIB_GIO
+#define g_icon_new_for_string_LIB LIB_GIO
+#define g_file_query_info_LIB LIB_GIO
/* Field accessors */
#define G_OBJECT_CLASS_CONSTRUCTOR(arg0) (arg0)->constructor
diff --git a/os_stats.c b/os_stats.c
index 7f522de..9e17829 100644
--- a/os_stats.c
+++ b/os_stats.c
@@ -18,8 +18,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 1366;
-int OS_nativeFunctionCallCount[1366];
+int OS_nativeFunctionCount = 1370;
+int OS_nativeFunctionCallCount[1370];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -120,6 +120,9 @@ char * OS_nativeFunctionNames[] = {
"PangoLayoutRun_1sizeof",
"PangoLogAttr_1sizeof",
"PangoRectangle_1sizeof",
+ "RTLD_1GLOBAL",
+ "RTLD_1LAZY",
+ "RTLD_1NOW",
"XAnyEvent_1sizeof",
"XClientMessageEvent_1sizeof",
"XCrossingEvent_1sizeof",
@@ -364,6 +367,7 @@ char * OS_nativeFunctionNames[] = {
"_1g_1signal_1lookup",
"_1g_1signal_1remove_1emission_1hook",
"_1g_1signal_1stop_1emission_1by_1name",
+ "_1g_1slist_1append",
"_1g_1slist_1data",
"_1g_1slist_1free",
"_1g_1slist_1length",
diff --git a/os_stats.h b/os_stats.h
index aa4c4d3..6901aa2 100644
--- a/os_stats.h
+++ b/os_stats.h
@@ -128,6 +128,9 @@ typedef enum {
PangoLayoutRun_1sizeof_FUNC,
PangoLogAttr_1sizeof_FUNC,
PangoRectangle_1sizeof_FUNC,
+ RTLD_1GLOBAL_FUNC,
+ RTLD_1LAZY_FUNC,
+ RTLD_1NOW_FUNC,
XAnyEvent_1sizeof_FUNC,
XClientMessageEvent_1sizeof_FUNC,
XCrossingEvent_1sizeof_FUNC,
@@ -372,6 +375,7 @@ typedef enum {
_1g_1signal_1lookup_FUNC,
_1g_1signal_1remove_1emission_1hook_FUNC,
_1g_1signal_1stop_1emission_1by_1name_FUNC,
+ _1g_1slist_1append_FUNC,
_1g_1slist_1data_FUNC,
_1g_1slist_1free_FUNC,
_1g_1slist_1length_FUNC,
diff --git a/swt.h b/swt.h
index b955471..55756a6 100644
--- a/swt.h
+++ b/swt.h
@@ -119,11 +119,16 @@ extern int IS_JNI_1_2;
}
#else
#define CALLING_CONVENTION
+#ifdef AIX
+#define LOAD_FLAGS RTLD_LAZY | RTLD_MEMBER
+#else
+#define LOAD_FLAGS RTLD_LAZY
+#endif
#define LOAD_FUNCTION(var, name) \
static int initialized = 0; \
static void *var = NULL; \
if (!initialized) { \
- void* handle = dlopen(name##_LIB, RTLD_LAZY); \
+ void* handle = dlopen(name##_LIB, LOAD_FLAGS); \
if (handle) var = dlsym(handle, #name); \
initialized = 1; \
}
diff --git a/version.txt b/version.txt
index 5a7cbe9..2e1a874 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-version 3.655
\ No newline at end of file
+version 3.659
\ No newline at end of file
diff --git a/webkitgtk.c b/webkitgtk.c
index 1d6037a..3ce68d9 100644
--- a/webkitgtk.c
+++ b/webkitgtk.c
@@ -526,12 +526,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies)
#endif
#ifndef NO__1soup_1cookie_1jar_1get_1type
-JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC);
- rc = (jint)soup_cookie_jar_get_type();
+ rc = (jintLong)soup_cookie_jar_get_type();
WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC);
return rc;
}
@@ -604,7 +604,7 @@ fail:
#ifndef NO__1soup_1session_1add_1feature_1by_1type
JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC);
soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1);
@@ -634,7 +634,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach)
#ifndef NO__1soup_1session_1get_1feature
JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC);
@@ -855,12 +855,12 @@ fail:
#endif
#ifndef NO__1webkit_1soup_1auth_1dialog_1get_1type
-JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC);
- rc = (jint)webkit_soup_auth_dialog_get_type();
+ rc = (jintLong)webkit_soup_auth_dialog_get_type();
WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC);
return rc;
}
hooks/post-receive
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list