Index: org/eclipse/swt/browser/PromptDialog.java
===================================================================
--- org/eclipse/swt/browser/PromptDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/PromptDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -223,7 +223,7 @@
 		data.horizontalAlignment = GridData.FILL;
 		data.grabExcessHorizontalSpace = true;
 		label.setLayoutData (data);
-
+		
 		final Button[] buttons = new Button[4];
 		Listener listener = new Listener() {
 			public void handleEvent(Event event) {
@@ -312,7 +312,7 @@
 		data.horizontalAlignment = GridData.FILL;
 		data.grabExcessHorizontalSpace = true;
 		valueText.setLayoutData(data);
-
+				
 		final Button[] buttons = new Button[3];
 		Listener listener = new Listener() {
 			public void handleEvent(Event event) {
Index: org/eclipse/swt/browser/MozillaDelegate.java
===================================================================
--- org/eclipse/swt/browser/MozillaDelegate.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/MozillaDelegate.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -123,25 +123,25 @@
 	File libsDir = new File (getProfilePath () + "/libs/" + Mozilla.OS() + '/' + Mozilla.Arch ()); //$NON-NLS-1$
 	File file = new File (libsDir, libName);
 	if (!file.exists()) {
-		java.io.InputStream is = Library.class.getResourceAsStream ('/' + libName);
-		if (is != null) {
-			if (!libsDir.exists ()) {
-				libsDir.mkdirs ();
+	java.io.InputStream is = Library.class.getResourceAsStream ('/' + libName);
+	if (is != null) {
+		if (!libsDir.exists ()) {
+			libsDir.mkdirs ();
+		}
+		int read;
+		byte [] buffer = new byte [4096];
+		try {
+			FileOutputStream os = new FileOutputStream (file);
+			while ((read = is.read (buffer)) != -1) {
+				os.write(buffer, 0, read);
 			}
-			int read;
-			byte [] buffer = new byte [4096];
-			try {
-				FileOutputStream os = new FileOutputStream (file);
-				while ((read = is.read (buffer)) != -1) {
-					os.write(buffer, 0, read);
-				}
-				os.close ();
-				is.close ();
-			} catch (FileNotFoundException e) {
-			} catch (IOException e) {
-			}
+			os.close ();
+			is.close ();
+		} catch (FileNotFoundException e) {
+		} catch (IOException e) {
 		}
 	}
+	}
 	if (file.exists ()) {
 		byte[] bytes = Converter.wcsToMbcs (null, file.getAbsolutePath (), true);
 		OS.dlopen (bytes, OS.RTLD_NOW | OS.RTLD_GLOBAL);
@@ -210,8 +210,8 @@
 		public void handleEvent (Event event) {
 			if (event.widget == browser) return;
 			if (event.type != SWT.Dispose) {
-				((Mozilla)browser.webBrowser).Deactivate ();
-				hasFocus = false;
+			((Mozilla)browser.webBrowser).Deactivate ();
+			hasFocus = false;
 			}
 			eventShell.getDisplay ().removeFilter (SWT.FocusIn, this);
 			eventShell.removeListener (SWT.Deactivate, this);
Index: org/eclipse/swt/browser/WindowCreator2.java
===================================================================
--- org/eclipse/swt/browser/WindowCreator2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/WindowCreator2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -131,8 +131,8 @@
 		int /*long*/[] result = new int /*long*/[1];
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 		if (rc != XPCOM.NS_OK) {
-			rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+		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);
 		webBrowser.Release ();
Index: org/eclipse/swt/browser/PromptService2Factory.java
===================================================================
--- org/eclipse/swt/browser/PromptService2Factory.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/PromptService2Factory.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -91,10 +91,10 @@
 	nsID guid = new nsID ();
 	XPCOM.memmove (guid, iid, nsID.sizeof);
 	if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) {
-		PromptService2 promptService = new PromptService2 ();
-		promptService.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
-		return XPCOM.NS_OK;
+	PromptService2 promptService = new PromptService2 ();
+	promptService.AddRef ();
+	XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+	return XPCOM.NS_OK;
 	}
 	if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) {
 		PromptFactory promptFactory = new PromptFactory();
Index: org/eclipse/swt/browser/FilePicker_10.java
===================================================================
--- org/eclipse/swt/browser/FilePicker_10.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/FilePicker_10.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,49 +1,49 @@
-/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.browser;
-
-import org.eclipse.swt.internal.mozilla.*;
-
-class FilePicker_10 extends FilePicker_1_8 {
-
-void createCOMInterfaces () {
-	/* Create each of the interfaces that this object implements */
-	supports = new XPCOMObject (new int[] {2, 0, 0}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-	};
-
-	filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-		public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-		public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-		public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-		public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-		public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-		public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-		public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-		public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-		public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-		public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-		public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-		public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-		public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-		public int /*long*/ method17 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-		public int /*long*/ method19 (int /*long*/[] args) {return Show (args[0]);}
-	};
-}
-
-}
+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.browser;
+
+import org.eclipse.swt.internal.mozilla.*;
+
+class FilePicker_10 extends FilePicker_1_8 {
+
+void createCOMInterfaces () {
+	/* Create each of the interfaces that this object implements */
+	supports = new XPCOMObject (new int[] {2, 0, 0}) {
+		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+	};
+
+	filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
+		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+		public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+		public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
+		public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
+		public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
+		public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
+		public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
+		public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
+		public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+		public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
+		public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
+		public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
+		public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
+		public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
+		public int /*long*/ method17 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+		public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+		public int /*long*/ method19 (int /*long*/[] args) {return Show (args[0]);}
+	};
+}
+
+}
Index: org/eclipse/swt/browser/WebKit.java
===================================================================
--- org/eclipse/swt/browser/WebKit.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/WebKit.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -103,115 +103,115 @@
 		if (LibraryLoaded) {
 			WebViewType = WebKitGTK.webkit_web_view_get_type ();
 
-			Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$
-			if (Proc2.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			Proc3 = new Callback (WebKit.class, "Proc", 3); //$NON-NLS-1$
-			if (Proc3.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			Proc4 = new Callback (WebKit.class, "Proc", 4); //$NON-NLS-1$
-			if (Proc4.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			Proc5 = new Callback (WebKit.class, "Proc", 5); //$NON-NLS-1$
-			if (Proc5.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			Proc6 = new Callback (WebKit.class, "Proc", 6); //$NON-NLS-1$
-			if (Proc6.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			JSObjectHasPropertyProc = new Callback (WebKit.class, "JSObjectHasPropertyProc", 3); //$NON-NLS-1$
-			if (JSObjectHasPropertyProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			JSObjectGetPropertyProc = new Callback (WebKit.class, "JSObjectGetPropertyProc", 4); //$NON-NLS-1$
-			if (JSObjectGetPropertyProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-			JSObjectCallAsFunctionProc = new Callback (WebKit.class, "JSObjectCallAsFunctionProc", 6); //$NON-NLS-1$
-			if (JSObjectCallAsFunctionProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$
+		if (Proc2.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		Proc3 = new Callback (WebKit.class, "Proc", 3); //$NON-NLS-1$
+		if (Proc3.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		Proc4 = new Callback (WebKit.class, "Proc", 4); //$NON-NLS-1$
+		if (Proc4.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		Proc5 = new Callback (WebKit.class, "Proc", 5); //$NON-NLS-1$
+		if (Proc5.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		Proc6 = new Callback (WebKit.class, "Proc", 6); //$NON-NLS-1$
+		if (Proc6.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		JSObjectHasPropertyProc = new Callback (WebKit.class, "JSObjectHasPropertyProc", 3); //$NON-NLS-1$
+		if (JSObjectHasPropertyProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		JSObjectGetPropertyProc = new Callback (WebKit.class, "JSObjectGetPropertyProc", 4); //$NON-NLS-1$
+		if (JSObjectGetPropertyProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+		JSObjectCallAsFunctionProc = new Callback (WebKit.class, "JSObjectCallAsFunctionProc", 6); //$NON-NLS-1$
+		if (JSObjectCallAsFunctionProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 			JSDOMEventProc = new Callback (WebKit.class, "JSDOMEventProc", 3); //$NON-NLS-1$
 			if (JSDOMEventProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
-			NativeClearSessions = new Runnable () {
-				public void run () {
-					if (!LibraryLoaded) return;
-					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
+		NativeClearSessions = new Runnable () {
+			public void run () {
+				if (!LibraryLoaded) return;
+				int /*long*/ session = WebKitGTK.webkit_get_default_session ();
 					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
-					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
-					if (jar == 0) return;
-					int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
-					int length = OS.g_slist_length (cookies);
-					int /*long*/ current = cookies;
-					for (int i = 0; i < length; i++) {
-						int /*long*/ cookie = OS.g_slist_data (current);
-						int /*long*/ expires = WebKitGTK.SoupCookie_expires (cookie);
-						if (expires == 0) {
-							/* indicates a session cookie */
-							WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
-						}
+				int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+				if (jar == 0) return;
+				int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
+				int length = OS.g_slist_length (cookies);
+				int /*long*/ current = cookies;
+				for (int i = 0; i < length; i++) {
+					int /*long*/ cookie = OS.g_slist_data (current);
+					int /*long*/ expires = WebKitGTK.SoupCookie_expires (cookie);
+					if (expires == 0) {
+						/* indicates a session cookie */
+						WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
+					}
 						WebKitGTK.soup_cookie_free (cookie);
-						current = OS.g_slist_next (current);
-					}
+					current = OS.g_slist_next (current);
+				}
 					OS.g_slist_free (cookies);
-				}
-			};
+			}
+		};
 
-			NativeGetCookie = new Runnable () {
-				public void run () {
-					if (!LibraryLoaded) return;
-					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
+		NativeGetCookie = new Runnable () {
+			public void run () {
+				if (!LibraryLoaded) return;
+				int /*long*/ session = WebKitGTK.webkit_get_default_session ();
 					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
-					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
-					if (jar == 0) return;
-					byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
-					int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
-					if (uri == 0) return;
-					int /*long*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
-					WebKitGTK.soup_uri_free (uri);
-					if (cookies == 0) return;
-					int length = OS.strlen (cookies);
-					bytes = new byte[length];
-					C.memmove (bytes, cookies, length);
-					OS.g_free (cookies);
-					String allCookies = new String (Converter.mbcsToWcs (null, bytes));
-					StringTokenizer tokenizer = new StringTokenizer (allCookies, ";"); //$NON-NLS-1$
-					while (tokenizer.hasMoreTokens ()) {
-						String cookie = tokenizer.nextToken ();
-						int index = cookie.indexOf ('=');
-						if (index != -1) {
-							String name = cookie.substring (0, index).trim ();
-							if (name.equals (CookieName)) {
-								CookieValue = cookie.substring (index + 1).trim ();
-								return;
-							}
+				int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+				if (jar == 0) return;
+				byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
+				int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+				if (uri == 0) return;
+				int /*long*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
+				WebKitGTK.soup_uri_free (uri);
+				if (cookies == 0) return;
+				int length = OS.strlen (cookies);
+				bytes = new byte[length];
+				C.memmove (bytes, cookies, length);
+				OS.g_free (cookies);
+				String allCookies = new String (Converter.mbcsToWcs (null, bytes));
+				StringTokenizer tokenizer = new StringTokenizer (allCookies, ";"); //$NON-NLS-1$
+				while (tokenizer.hasMoreTokens ()) {
+					String cookie = tokenizer.nextToken ();
+					int index = cookie.indexOf ('=');
+					if (index != -1) {
+						String name = cookie.substring (0, index).trim ();
+						if (name.equals (CookieName)) {
+							CookieValue = cookie.substring (index + 1).trim ();
+							return;
 						}
 					}
 				}
-			};
+			}
+		};
 
-			NativeSetCookie = new Runnable () {
-				public void run () {
-					if (!LibraryLoaded) return;
-					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
+		NativeSetCookie = new Runnable () {
+			public void run () {
+				if (!LibraryLoaded) return;
+				int /*long*/ session = WebKitGTK.webkit_get_default_session ();
 					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
-					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
-					if (jar == 0) {
-						/* this happens if a navigation has not occurred yet */
-						WebKitGTK.soup_session_add_feature_by_type (session, type);
-						jar = WebKitGTK.soup_session_get_feature (session, type);
-					}
-					if (jar == 0) return;
-					byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
-					int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
-					if (uri == 0) return;
-					bytes = Converter.wcsToMbcs (null, CookieValue, true);
-					int /*long*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
-					if (cookie != 0) {
-						WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
-						// the following line is intentionally commented
-						// WebKitGTK.soup_cookie_free (cookie);
-						CookieResult = true;
-					}
-					WebKitGTK.soup_uri_free (uri);
+				int /*long*/ 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);
+					jar = WebKitGTK.soup_session_get_feature (session, type);
 				}
-			};
+				if (jar == 0) return;
+				byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
+				int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+				if (uri == 0) return;
+				bytes = Converter.wcsToMbcs (null, CookieValue, true);
+				int /*long*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
+				if (cookie != 0) {
+					WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
+					// the following line is intentionally commented
+					// WebKitGTK.soup_cookie_free (cookie);
+					CookieResult = true;
+				}
+				WebKitGTK.soup_uri_free (uri);
+			}
+		};
 
-			if (NativePendingCookies != null) {
-				SetPendingCookies (NativePendingCookies);
-				NativePendingCookies = null;
-			}
+		if (NativePendingCookies != null) {
+			SetPendingCookies (NativePendingCookies);
+			NativePendingCookies = null;
 		}
 	}
+	}
 
 static Browser FindBrowser (int /*long*/ webView) {
 	if (webView == 0) return null;
@@ -487,9 +487,9 @@
 public void create (Composite parent, int style) {
 	if (ExternalClass == 0) {
 		if (Device.DEBUG) {
-			int major = WebKitGTK.webkit_major_version ();
-			int minor = WebKitGTK.webkit_minor_version ();
-			int micro = WebKitGTK.webkit_micro_version ();
+		int major = WebKitGTK.webkit_major_version ();
+		int minor = WebKitGTK.webkit_minor_version ();
+		int micro = WebKitGTK.webkit_micro_version ();
 			System.out.println("WebKit version " + major + "." + minor + "." + micro); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 		JSClassDefinition jsClassDefinition = new JSClassDefinition ();
@@ -507,14 +507,14 @@
 		C.memmove (PostString, bytes, bytes.length);
 	}
 
-	scrolledWindow = OS.gtk_scrolled_window_new (0, 0);
-	OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
-	webView = WebKitGTK.webkit_web_view_new ();
-	webViewData = C.malloc (C.PTR_SIZEOF);
-	C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
-	OS.gtk_container_add (scrolledWindow, webView);
-	OS.gtk_container_add (browser.handle, scrolledWindow);
-	OS.gtk_widget_show (scrolledWindow);
+    scrolledWindow = OS.gtk_scrolled_window_new (0, 0);
+    OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
+    webView = WebKitGTK.webkit_web_view_new ();
+    webViewData = C.malloc (C.PTR_SIZEOF);
+    C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
+    OS.gtk_container_add (scrolledWindow, webView);
+    OS.gtk_container_add (browser.handle, scrolledWindow);
+    OS.gtk_widget_show (scrolledWindow);
 	OS.gtk_widget_show (webView);
 	OS.g_signal_connect (webView, WebKitGTK.close_web_view, Proc2.getAddress (), CLOSE_WEB_VIEW);
 	OS.g_signal_connect (webView, WebKitGTK.console_message, Proc5.getAddress (), CONSOLE_MESSAGE);
@@ -523,14 +523,14 @@
 	OS.g_signal_connect (webView, WebKitGTK.hovering_over_link, Proc4.getAddress (), HOVERING_OVER_LINK);
 	OS.g_signal_connect (webView, WebKitGTK.mime_type_policy_decision_requested, Proc6.getAddress (), MIME_TYPE_POLICY_DECISION_REQUESTED);
 	OS.g_signal_connect (webView, WebKitGTK.navigation_policy_decision_requested, Proc6.getAddress (), NAVIGATION_POLICY_DECISION_REQUESTED);
-	OS.g_signal_connect (webView, WebKitGTK.notify_load_status, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
-	OS.g_signal_connect (webView, WebKitGTK.notify_progress, Proc3.getAddress (), NOTIFY_PROGRESS);
-	OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);
-	OS.g_signal_connect (webView, WebKitGTK.populate_popup, Proc3.getAddress (), POPULATE_POPUP);
-	OS.g_signal_connect (webView, WebKitGTK.resource_request_starting, Proc6.getAddress (), RESOURCE_REQUEST_STARTING);
-	OS.g_signal_connect (webView, WebKitGTK.status_bar_text_changed, Proc3.getAddress (), STATUS_BAR_TEXT_CHANGED);
-	OS.g_signal_connect (webView, WebKitGTK.web_view_ready, Proc2.getAddress (), WEB_VIEW_READY);
-	OS.g_signal_connect (webView, WebKitGTK.window_object_cleared, Proc5.getAddress (), WINDOW_OBJECT_CLEARED);
+    OS.g_signal_connect (webView, WebKitGTK.notify_load_status, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
+    OS.g_signal_connect (webView, WebKitGTK.notify_progress, Proc3.getAddress (), NOTIFY_PROGRESS);
+    OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);
+    OS.g_signal_connect (webView, WebKitGTK.populate_popup, Proc3.getAddress (), POPULATE_POPUP);
+    OS.g_signal_connect (webView, WebKitGTK.resource_request_starting, Proc6.getAddress (), RESOURCE_REQUEST_STARTING);
+    OS.g_signal_connect (webView, WebKitGTK.status_bar_text_changed, Proc3.getAddress (), STATUS_BAR_TEXT_CHANGED);
+    OS.g_signal_connect (webView, WebKitGTK.web_view_ready, Proc2.getAddress (), WEB_VIEW_READY);
+    OS.g_signal_connect (webView, WebKitGTK.window_object_cleared, Proc5.getAddress (), WINDOW_OBJECT_CLEARED);
 
 	/* Callback to get events before WebKit receives and consumes them */
 	OS.g_signal_connect (webView, OS.button_press_event, JSDOMEventProc.getAddress (), 0);
@@ -553,13 +553,13 @@
 	OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
 	OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
 
-	int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
-	OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
-	OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
-	byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
-	OS.g_object_set (settings, WebKitGTK.default_encoding, bytes, 0);
+    int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+    OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
+    OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
+    byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
+    OS.g_object_set (settings, WebKitGTK.default_encoding, bytes, 0);
 
-	Listener listener = new Listener () {
+    Listener listener = new Listener () {
 		public void handleEvent (Event event) {
 			switch (event.type) {
 				case SWT.Dispose: {
@@ -693,8 +693,8 @@
 	}
 
 	/* install the JS call-out to the registered BrowserFunction */
-	StringBuffer buffer = new StringBuffer ("window.SWTkeyhandler = function SWTkeyhandler(e) {"); //$NON-NLS-1$
-	buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.keyCode, e.charCode, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey);} catch (e) {}};"); //$NON-NLS-1$
+		StringBuffer buffer = new StringBuffer ("window.SWTkeyhandler = function SWTkeyhandler(e) {"); //$NON-NLS-1$
+		buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.keyCode, e.charCode, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey);} catch (e) {}};"); //$NON-NLS-1$
 	execute (buffer.toString ());
 	buffer = new StringBuffer ("window.SWTmousehandler = function SWTmousehandler(e) {"); //$NON-NLS-1$
 	buffer.append ("try {e.returnValue = HandleWebKitEvent(e.type, e.screenX, e.screenY, e.detail, e.button, e.altKey, e.ctrlKey, e.shiftKey, e.metaKey, e.relatedTarget != null);} catch (e) {}};"); //$NON-NLS-1$
@@ -725,18 +725,18 @@
 
 	/* add JS event listener in frames */
 	buffer = new StringBuffer ("for (var i = 0; i < frames.length; i++) {"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('keydown', window.SWTkeyhandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('keypress', window.SWTkeyhandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('keyup', window.SWTkeyhandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mousedown', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mouseup', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mousemove', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mouseover', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mouseout', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('mousewheel', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ("frames[i].document.addEventListener('dragstart', window.SWTmousehandler, true);"); //$NON-NLS-1$
-	buffer.append ('}');
-	execute (buffer.toString ());
+		buffer.append ("frames[i].document.addEventListener('keydown', window.SWTkeyhandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('keypress', window.SWTkeyhandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('keyup', window.SWTkeyhandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mousedown', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mouseup', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mousemove', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mouseover', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mouseout', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('mousewheel', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ("frames[i].document.addEventListener('dragstart', window.SWTmousehandler, true);"); //$NON-NLS-1$
+		buffer.append ('}');
+		execute (buffer.toString ());
 }
 
 public boolean back () {
@@ -945,7 +945,7 @@
 	* handleKeyEvent()/handleMouseEvent() event handler methods.
 	*/
 
-	/* 
+	/*
 	* The arguments for key events are:
 	* 	argument 0: type (String)
 	* 	argument 1: keyCode (Double)
@@ -1095,33 +1095,33 @@
 	/* keyup */
 
 	keyCode = translateKey (keyCode);
-	if (keyCode == 0) {
-		/* indicates a key for which key events are not sent */
-		return true;
-	}
-	if (keyCode != lastKeyCode) {
-		/* keyup does not correspond to the last keydown */
-		lastKeyCode = keyCode;
-		lastCharCode = 0;
-	}
+		if (keyCode == 0) {
+			/* indicates a key for which key events are not sent */
+			return true;
+		}
+		if (keyCode != lastKeyCode) {
+			/* keyup does not correspond to the last keydown */
+			lastKeyCode = keyCode;
+			lastCharCode = 0;
+		}
 
-	Event keyEvent = new Event ();
-	keyEvent.widget = browser;
-	keyEvent.type = SWT.KeyUp;
-	keyEvent.keyCode = lastKeyCode;
-	keyEvent.character = (char)lastCharCode;
+		Event keyEvent = new Event ();
+		keyEvent.widget = browser;
+		keyEvent.type = SWT.KeyUp;
+		keyEvent.keyCode = lastKeyCode;
+		keyEvent.character = (char)lastCharCode;
 	keyEvent.stateMask = (altKey ? SWT.ALT : 0) | (ctrlKey ? SWT.CTRL : 0) | (shiftKey ? SWT.SHIFT : 0) | (metaKey ? SWT.COMMAND : 0);
-	switch (lastKeyCode) {
-		case SWT.SHIFT:
-		case SWT.CONTROL:
-		case SWT.ALT:
-		case SWT.COMMAND: {
-			keyEvent.stateMask |= lastKeyCode;
+		switch (lastKeyCode) {
+			case SWT.SHIFT:
+			case SWT.CONTROL:
+			case SWT.ALT:
+			case SWT.COMMAND: {
+				keyEvent.stateMask |= lastKeyCode;
+			}
 		}
-	}
-	browser.notifyListeners (keyEvent.type, keyEvent);
-	lastKeyCode = lastCharCode = 0;
-	return keyEvent.doit && !browser.isDisposed ();
+		browser.notifyListeners (keyEvent.type, keyEvent);
+		lastKeyCode = lastCharCode = 0;
+		return keyEvent.doit && !browser.isDisposed ();
 }
 
 boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int button, boolean altKey, boolean ctrlKey, boolean shiftKey, boolean metaKey, boolean hasRelatedTarget) {
@@ -1213,9 +1213,9 @@
 		*/
 		if (!IsWebKit14orNewer) {
 			browser.notifyListeners (mouseEvent.type, mouseEvent);
-			return false;
-		}
+		return false;
 	}
+	}
 
 	browser.notifyListeners (mouseEvent.type, mouseEvent);
 	return true;
@@ -1361,7 +1361,7 @@
 		((BrowserFunction)elements.nextElement ()).dispose (false);
 	}
 	functions = null;
-	
+
 	if (eventFunction != null) {
 		eventFunction.dispose (false);
 		eventFunction = null;
@@ -1631,14 +1631,14 @@
 		public void run () {
 			if (!browser.isDisposed ()) {
 				FileDialog dialog = new FileDialog (browser.getShell (), SWT.SAVE);
-				dialog.setFileName (nameString);
-				String title = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
-				dialog.setText (title);
-				String path = dialog.open ();
-				if (path != null) {
-					path = URI_FILEROOT + path;
+	dialog.setFileName (nameString);
+	String title = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
+	dialog.setText (title);
+	String path = dialog.open ();
+	if (path != null) {
+		path = URI_FILEROOT + path;
 					int /*long*/ newDownload = WebKitGTK.webkit_download_new (request);
-					byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
+		byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
 					WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes);
 					openDownloadWindow (newDownload);
 					WebKitGTK.webkit_download_start (newDownload);
@@ -1646,7 +1646,7 @@
 				}
 			}
 			OS.g_object_unref (request);
-		}
+	}
 	});
 
 	return 1;
@@ -1864,10 +1864,10 @@
 					}
 				}
 				if (!found) {
-					String[] temp = new String[headers.length + 1];
-					System.arraycopy (headers, 0, temp, 0, headers.length);
+				String[] temp = new String[headers.length + 1];
+				System.arraycopy (headers, 0, temp, 0, headers.length);
 					temp[headers.length] = HEADER_CONTENTTYPE + ':' + MIMETYPE_FORMURLENCODED;
-					headers = temp;
+				headers = temp;
 				}
 				postData = null;
 			}
@@ -1985,7 +1985,7 @@
 		if (type == WebKitGTK.kJSTypeNumber) {
 			int index = ((Double)convertToJava (ctx, result[0])).intValue ();
 			result[0] = 0;
-			Object key = new Integer (index);
+				Object key = new Integer (index);
 			C.memmove (result, arguments + C.PTR_SIZEOF, C.PTR_SIZEOF);
 			type = WebKitGTK.JSValueGetType (ctx, result[0]);
 			if (type == WebKitGTK.kJSTypeString) {
Index: org/eclipse/swt/browser/FilePickerFactory.java
===================================================================
--- org/eclipse/swt/browser/FilePickerFactory.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/FilePickerFactory.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -97,9 +97,9 @@
 		picker.AddRef ();
 		XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
 	} else {
-		FilePicker picker = new FilePicker ();
-		picker.AddRef ();
-		XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+	FilePicker picker = new FilePicker ();
+	picker.AddRef ();
+	XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
 	}
 	return XPCOM.NS_OK;
 }
Index: org/eclipse/swt/browser/Mozilla.java
===================================================================
--- org/eclipse/swt/browser/Mozilla.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/Mozilla.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -60,7 +60,7 @@
 	static AppFileLocProvider LocationProvider;
 	static WindowCreator2 WindowCreator;
 	static int BrowserCount, NextJSFunctionIndex = 1;
-	static Hashtable AllFunctions = new Hashtable ();
+	static Hashtable AllFunctions = new Hashtable (); 
 	static Listener DisplayListener;
 	static boolean Initialized, IsPre_1_8, IsPre_1_9, IsPre_4, IsXULRunner, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
 	static boolean IsGettingSiteWindow;
@@ -462,7 +462,7 @@
 					}
 				}
 				if (!XPCOM.NS_Free (pathBytes_NSFree, cookieString)) {
-					C.free (cookieString);
+				C.free (cookieString);
 				}
 
 				String allCookies = new String (MozillaDelegate.mbcsToWcs (null, bytes));
@@ -556,119 +556,119 @@
 }
 
 static void LoadLibraries () {
-	boolean initLoaded = false;
+		boolean initLoaded = false;
 
 	if (Boolean.getBoolean (GRE_INITIALIZED)) {
-		/* 
-		 * Another browser has already initialized xulrunner in this process,
-		 * so just bind to it instead of trying to initialize a new one.
-		 */
-		Initialized = true;
-	}
+			/* 
+			 * Another browser has already initialized xulrunner in this process,
+			 * so just bind to it instead of trying to initialize a new one.
+			 */
+			Initialized = true;
+		}
 
 	MozillaPath = System.getProperty (XULRUNNER_PATH);
-	/*
-	* Browser clients that ship XULRunner in a plug-in must have an opportunity 
-	* to set the org.eclipse.swt.browser.XULRunnerPath system property to point
-	* at their XULRunner before the first Mozilla-based Browser is created.  To
-	* facilitate this, reflection is used to reference non-existent class
-	* org.eclipse.swt.browser.XULRunnerInitializer the first time a Mozilla-
-	* based Browser is created.   A client wishing to use this hook can do so
-	* by creating a fragment of org.eclipse.swt that implements this class and
-	* sets the system property in its static initializer.
-	*/
+		/*
+		* Browser clients that ship XULRunner in a plug-in must have an opportunity 
+		* to set the org.eclipse.swt.browser.XULRunnerPath system property to point
+		* at their XULRunner before the first Mozilla-based Browser is created.  To
+		* facilitate this, reflection is used to reference non-existent class
+		* org.eclipse.swt.browser.XULRunnerInitializer the first time a Mozilla-
+		* based Browser is created.   A client wishing to use this hook can do so
+		* by creating a fragment of org.eclipse.swt that implements this class and
+		* sets the system property in its static initializer.
+		*/
 	if (MozillaPath == null) {
-		try {
-			Class.forName ("org.eclipse.swt.browser.XULRunnerInitializer"); //$NON-NLS-1$
+			try {
+				Class.forName ("org.eclipse.swt.browser.XULRunnerInitializer"); //$NON-NLS-1$
 			MozillaPath = System.getProperty (XULRUNNER_PATH);
-		} catch (ClassNotFoundException e) {
-			/* no fragment is providing this class, which is the typical case */
+			} catch (ClassNotFoundException e) {
+				/* no fragment is providing this class, which is the typical case */
+			}
 		}
-	}
 
 	if (MozillaPath == null) {
-		try {
+			try {
 			String libName = MozillaDelegate.getSWTInitLibraryName ();
-			Library.loadLibrary (libName);
-			initLoaded = true;
-		} catch (UnsatisfiedLinkError e) {
-			/* 
-			* If this library failed to load then do not attempt to detect a
-			* xulrunner to use.  The Browser may still be usable if MOZILLA_FIVE_HOME
-			* points at a GRE. 
-			*/
-		}
-	} else {
-		/* ensure that client-supplied path is using correct separators */
-		if (SEPARATOR_OS == '/') {
+				Library.loadLibrary (libName);
+				initLoaded = true;
+			} catch (UnsatisfiedLinkError e) {
+				/* 
+				* If this library failed to load then do not attempt to detect a
+				* xulrunner to use.  The Browser may still be usable if MOZILLA_FIVE_HOME
+				* points at a GRE. 
+				*/
+			}
+		} else {
+			/* ensure that client-supplied path is using correct separators */
+			if (SEPARATOR_OS == '/') {
 			MozillaPath = MozillaPath.replace ('\\', SEPARATOR_OS);
-		} else {
+			} else {
 			MozillaPath = MozillaPath.replace ('/', SEPARATOR_OS);
-		}
+			}
 
 		MozillaPath += SEPARATOR_OS + MozillaDelegate.getLibraryName ();
 		IsXULRunner = true;
-	}
+		}
 
-	if (initLoaded) {
-		/* attempt to discover a XULRunner to use as the GRE */
+		if (initLoaded) {
+			/* attempt to discover a XULRunner to use as the GRE */
 		MozillaPath = InitDiscoverXULRunner ();
 		IsXULRunner = MozillaPath.length () > 0;
 
-		/*
-		 * Test whether the detected XULRunner can be used as the GRE before loading swt's
-		 * XULRunner library.  If it cannot be used then fall back to attempting to use
-		 * the GRE pointed to by MOZILLA_FIVE_HOME.
-		 * 
-		 * One case where this will fail is attempting to use a 64-bit xulrunner while swt
-		 * is running in 32-bit mode, or vice versa.
-		 */
+				/*
+				 * Test whether the detected XULRunner can be used as the GRE before loading swt's
+				 * XULRunner library.  If it cannot be used then fall back to attempting to use
+				 * the GRE pointed to by MOZILLA_FIVE_HOME.
+				 * 
+				 * One case where this will fail is attempting to use a 64-bit xulrunner while swt
+				 * is running in 32-bit mode, or vice versa.
+				 */
 		if (IsXULRunner) {
 			byte[] bytes = MozillaDelegate.wcsToMbcs (null, MozillaPath, true);
 			int rc = XPCOMInit.XPCOMGlueStartup (bytes);
-			if (rc != XPCOM.NS_OK) {
+					if (rc != XPCOM.NS_OK) {
 				MozillaPath = MozillaPath.substring (0, MozillaPath.lastIndexOf (SEPARATOR_OS));
 				if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + MozillaPath); //$NON-NLS-1$
 
-				/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
-				int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
-				if (ptr == 0) {
+						/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
+						int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+						if (ptr == 0) {
 					IsXULRunner = false;
-				} else {
-					int length = C.strlen (ptr);
+						} else {
+						int length = C.strlen (ptr);
 					bytes = new byte[length];
 					C.memmove (bytes, ptr, length);
 					MozillaPath = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-					/*
-					 * Attempting to XPCOMGlueStartup a mozilla-based GRE != xulrunner can
-					 * crash, so don't attempt unless the GRE appears to be xulrunner.
-					 */
+							/*
+							 * Attempting to XPCOMGlueStartup a mozilla-based GRE != xulrunner can
+							 * crash, so don't attempt unless the GRE appears to be xulrunner.
+							 */
 					if (MozillaPath.indexOf ("xulrunner") == -1) { //$NON-NLS-1$
 						IsXULRunner = false;	
-					} else {
+							} else {
 						MozillaPath += SEPARATOR_OS + MozillaDelegate.getLibraryName ();
 						bytes = MozillaDelegate.wcsToMbcs (null, MozillaPath, true);
 						rc = XPCOMInit.XPCOMGlueStartup (bytes);
-						if (rc == XPCOM.NS_OK) {
-							/* ensure that client-supplied path is using correct separators */
-							if (SEPARATOR_OS == '/') {
+							if (rc == XPCOM.NS_OK) {
+								/* ensure that client-supplied path is using correct separators */
+								if (SEPARATOR_OS == '/') {
 								MozillaPath = MozillaPath.replace ('\\', SEPARATOR_OS);
+								} else {
+								MozillaPath = MozillaPath.replace ('/', SEPARATOR_OS);
+								}
 							} else {
-								MozillaPath = MozillaPath.replace ('/', SEPARATOR_OS);
-							}
-						} else {
 							IsXULRunner = false;
 							MozillaPath = MozillaPath.substring (0, MozillaPath.lastIndexOf (SEPARATOR_OS));
 							if (Device.DEBUG) System.out.println ("failed to start as XULRunner: " + MozillaPath); //$NON-NLS-1$
-						}
+								}
+							}
+						} 
 					}
-				} 
-			}
 			if (IsXULRunner) {
-				XPCOMInitWasGlued = true;
+						XPCOMInitWasGlued = true;
+					}
+				}
 			}
-		}
-	}
 }
 
 public void create (Composite parent, int style) {
@@ -686,7 +686,7 @@
 			/*
 			* If style SWT.MOZILLA was specified then this initialization has already
 			* failed, because SWT.MOZILLA-style Browsers must utilize XULRunner.
-			*/
+			 */ 
 			if ((style & SWT.MOZILLA) != 0) {
 				browser.dispose ();
 				String errorString = (MozillaPath != null && MozillaPath.length () > 0) ?
@@ -711,7 +711,7 @@
 
 			/* invoke appropriate Init function (based on mozilla version) */
 			initXPCOM (MozillaPath, IsXULRunner);
-		}
+				}
 
 		/* attempt to initialize JavaXPCOM in the detected XULRunner */
 		if (IsXULRunner) initJavaXPCOM (MozillaPath);
@@ -721,21 +721,21 @@
 		if (rc != XPCOM.NS_OK) {
 			browser.dispose ();
 			error (rc);
-		}
+				}
 		if (result[0] == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
-		}
+			}
 		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 		result[0] = 0;
 
 		rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
+			if (rc != XPCOM.NS_OK) {
+				browser.dispose ();
+				error (rc);
+			}
 		if (result[0] == 0) {
-			browser.dispose ();
+				browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
 		}
 		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
@@ -752,7 +752,7 @@
 
 		/* init our WindowCreator, which mozilla uses for the creation of child browsers in external Shells */
 		if (!factoriesRegistered) {
-			initWindowCreator (serviceManager);
+		initWindowCreator (serviceManager);
 		}
 
 		/* notify mozilla that the profile directory has been changed from its default value */
@@ -761,7 +761,7 @@
 		/* init preference values that give desired mozilla behaviours */ 
 		initPreferences (serviceManager, componentManager);
 
-		/* init our various factories that mozilla can invoke as needed */
+		/* init our various factories that mozilla can invoke as needed */ 
 		if (!factoriesRegistered) {
 			initFactories (serviceManager, componentManager, IsXULRunner);
 		}
@@ -776,7 +776,7 @@
 		MozillaPendingCookies = null;
 
 		Initialized = true;
-	}
+			}
 
 	BrowserCount++;
 
@@ -783,34 +783,34 @@
 	if (display.getData (DISPOSE_LISTENER_HOOKED) == null) {
 		display.setData (DISPOSE_LISTENER_HOOKED, DISPOSE_LISTENER_HOOKED);
 		display.addListener (SWT.Dispose, DisplayListener);
-	}
+		}
 
 	/* get the nsIComponentManager, used throughout initialization */
-	int rc = XPCOM.NS_GetComponentManager (result);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);
-	}
-	nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-	result[0] = 0;
+		int rc = XPCOM.NS_GetComponentManager (result);
+		if (rc != XPCOM.NS_OK) {
+			browser.dispose ();
+			error (rc);
+		}
+		if (result[0] == 0) {
+			browser.dispose ();
+			error (XPCOM.NS_NOINTERFACE);
+		}
+		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
+		result[0] = 0;
 
 	/* create the nsIWebBrowser instance */
 	rc = componentManager.CreateInstance (XPCOM.NS_IWEBBROWSER_CID, 0, nsIWebBrowser.NS_IWEBBROWSER_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = componentManager.CreateInstance (XPCOM.NS_IWEBBROWSER_CID, 0, nsIWebBrowser.NS_IWEBBROWSER_IID, result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
+			if (rc != XPCOM.NS_OK) {
+				browser.dispose ();
+				error (rc);
+			}
 	}
-	if (result[0] == 0) {
-		browser.dispose ();
-		error (XPCOM.NS_NOINTERFACE);	
-	}
+			if (result[0] == 0) {
+				browser.dispose ();
+				error (XPCOM.NS_NOINTERFACE);
+			}
 	webBrowser = new nsIWebBrowser (result[0]);
 	result[0] = 0;
 
@@ -823,7 +823,7 @@
 
 	if (!PerformedVersionCheck) {
 		PerformedVersionCheck = true;
-
+		
 		rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result);
 		if (rc != XPCOM.NS_OK) {
 			browser.dispose ();
@@ -834,12 +834,12 @@
 			error (XPCOM.NS_NOINTERFACE);
 		}
 		nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
-		result[0] = 0;
+		result[0] = 0;		
 
 		/*
-		* Check for the property indicating that factories have already been registered,
-		* in which case this browser should not overwrite them with its own.
-		*/
+		 * Check for the property indicating that factories have already been registered,
+		 * in which case this browser should not overwrite them with its own.
+		 */
 		boolean factoriesRegistered = Boolean.getBoolean (FACTORIES_REGISTERED);
 
 		/*
@@ -847,14 +847,14 @@
 		* to determine if the GRE's version is < 1.8.
 		*/
 		rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
+			if (rc != XPCOM.NS_OK) {
+				browser.dispose ();
 			error (XPCOM.NS_ERROR_FAILURE);
-		}
-		if (result[0] == 0) {
-			browser.dispose ();
+			}
+			if (result[0] == 0) {
+				browser.dispose ();
 			error (XPCOM.NS_ERROR_NO_INTERFACE);
-		}
+			}
 		nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
 		result[0] = 0;
 
@@ -865,7 +865,7 @@
 		}
 		IsPre_1_9 = true;
 		IsPre_4 = true;
-		result[0] = 0;
+			result[0] = 0;
 
 		/*
 		* A Download factory for contract "Transfer" must be registered iff the GRE's version is 1.8.x.
@@ -883,16 +883,16 @@
 				result[0] = 0;
 
 				if (!factoriesRegistered) {
-					DownloadFactory_1_8 downloadFactory_1_8 = new DownloadFactory_1_8 ();
-					downloadFactory_1_8.AddRef ();
+				DownloadFactory_1_8 downloadFactory_1_8 = new DownloadFactory_1_8 ();
+				downloadFactory_1_8.AddRef ();
 					byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_TRANSFER_CONTRACTID, true);
 					byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "swtTransfer", true); //$NON-NLS-1$
-					rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory_1_8.getAddress ());
-					if (rc != XPCOM.NS_OK) {
-						browser.dispose ();
-						error (rc);
-					}
-					downloadFactory_1_8.Release ();
+				rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory_1_8.getAddress ());
+	            	if (rc != XPCOM.NS_OK) {
+	            		browser.dispose ();
+	            		error (rc);
+	            	}
+				downloadFactory_1_8.Release ();
 				}
 			} else { /* >= 1.9 */
 				IsPre_1_9 = false;
@@ -903,7 +903,7 @@
 					new nsISupports (result[0]).Release();
 				}
 			}
-		}
+				}
 		result[0] = 0;
 		interfaceRequestor.Release ();
 		componentRegistrar.Release ();
@@ -922,10 +922,10 @@
 		}
 		
 		System.setProperty (FACTORIES_REGISTERED, TRUE);
-	}
+	        }
 	componentManager.Release ();
 
-	/*
+		/*
 	 * Bug in XULRunner 1.9.  On win32, Mozilla does not clear its background before content has
 	 * been set into it.  As a result, embedders appear broken if they do not immediately display
 	 * a URL or text.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=453523.
@@ -932,7 +932,7 @@
 	 * 
 	 * The workaround is to subclass the Mozilla window and clear it whenever WM_ERASEBKGND is received.
 	 * This subclass should be removed once content has been set into the browser.
-	 */
+		 */
 	if (!IsPre_1_9) {
 		delegate.addWindowSubclass ();
 	}
@@ -939,15 +939,15 @@
 
 	/* add listeners for progress and content */
 	rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
+		if (rc != XPCOM.NS_OK) {
+			browser.dispose ();
+			error (rc);
+		}
 	rc = webBrowser.SetParentURIContentListener (uriContentListener.getAddress ());
-	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
-	}
+		if (rc != XPCOM.NS_OK) {
+			browser.dispose ();
+			error (rc);
+		}
 
 	delegate.init ();
 
@@ -959,13 +959,13 @@
 					if (ignoreDispose) {
 						ignoreDispose = false;
 						break;
-					}
+			}
 					ignoreDispose = true;
 					browser.notifyListeners (event.type, event);
 					event.type = SWT.NONE;
 					onDispose (event.display);
 					break;
-				}
+			}
 				case SWT.Resize: onResize (); break;
 				case SWT.FocusIn: {
 					Activate ();
@@ -1022,25 +1022,25 @@
 					Display display = event.display;
 					if (Mozilla.this.browser == display.getFocusControl ()) Deactivate ();
 					break;
-				}
+			}
 				case SWT.Show: {
-					/*
+		/*
 					* Feature in GTK Mozilla.  Mozilla does not show up when
 					* its container (a GTK fixed handle) is made visible
 					* after having been hidden.  The workaround is to reset
 					* its size after the container has been made visible. 
-					*/
+		 */
 					Display display = event.display;
 					display.asyncExec(new Runnable () {
 						public void run() {
 							if (browser.isDisposed ()) return;
 							onResize ();
-						}
+			}
 					});
 					break;
-				}
 			}
 		}
+				}
 	};	
 	int[] folderEvents = new int[] {
 		SWT.Dispose,
@@ -1053,7 +1053,7 @@
 	};
 	for (int i = 0; i < folderEvents.length; i++) {
 		browser.addListener (folderEvents[i], listener);
-	}
+		}
 }
 
 public boolean back () {
@@ -1063,7 +1063,7 @@
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	
+
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);		 	
 	rc = webNavigation.GoBack ();	
 	webNavigation.Release ();
@@ -1079,7 +1079,7 @@
 				/* implies that the user did not veto the page unload */
 				result[0] = true;
 			}
-		} 
+		}
 	};
 	execute ("window.location.replace('about:blank');"); //$NON-NLS-1$
 	locationListeners = oldListeners;
@@ -1093,7 +1093,7 @@
 		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
 		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
 	};
-	
+
 	weakReference = new XPCOMObject (new int[] {2, 0, 0, 2}) {
 		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
 		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
@@ -1111,7 +1111,7 @@
 		public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
 		public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
 	};
-	
+
 	webBrowserChrome = new XPCOMObject (new int[] {2, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 1, 1}) {
 		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
 		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
@@ -1265,15 +1265,15 @@
 	if (badCertListener != null) {
 		badCertListener.dispose ();
 		badCertListener = null;
-	}
+		}
 }
 
 public boolean execute (String script) {
-	/*
+		/*
 	* This could be the first content that is set into the browser, so
 	* ensure that the custom subclass that works around Mozilla bug
 	* https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
-	*/
+		*/
 	delegate.removeWindowSubclass ();
 
 	/*
@@ -1298,7 +1298,7 @@
 			result[0] = 0;
 			rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_191_IID, result);
 			if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
-				result[0] = 0;
+			result[0] = 0;
 				rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_IID, result);
 				if (rc == XPCOM.NS_OK && result[0] != 0) {
 					isXULRunner190x = true;
@@ -1306,53 +1306,53 @@
 			}
 		}
 
-		if (rc == XPCOM.NS_OK && result[0] != 0) {
+			if (rc == XPCOM.NS_OK && result[0] != 0) {
 			nsIScriptSecurityManager securityManager = new nsIScriptSecurityManager (result[0]);
-			result[0] = 0;
-			rc = securityManager.GetSystemPrincipal (result);
-			securityManager.Release ();
+				result[0] = 0;
+				rc = securityManager.GetSystemPrincipal (result);
+				securityManager.Release ();
 
 			if (rc == XPCOM.NS_OK && result[0] != 0) {
 				nsIPrincipal principal = new nsIPrincipal (result[0]);
 				result[0] = 0;
-				rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
-				if (rc != XPCOM.NS_OK) error (rc);
+			rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
+			if (rc != XPCOM.NS_OK) error (rc);
 				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
-				nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
-				result[0] = 0;
+			nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
+			result[0] = 0;
 				nsID scriptGlobalObjectNSID_10 = new nsID ("08f73284-26e3-4fa6-bf89-8326f92a94b3"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
 				rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_10, result);
-				if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
-					result[0] = 0;
-					nsID scriptGlobalObjectNSID_1_9_2 = new nsID ("e9f3f2c1-2d94-4722-bbd4-2bf6fdf42f48"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
-					rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9_2, result);
+			if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
+				result[0] = 0;
+				nsID scriptGlobalObjectNSID_1_9_2 = new nsID ("e9f3f2c1-2d94-4722-bbd4-2bf6fdf42f48"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
+				rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9_2, result);
 					if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
 						result[0] = 0;
 						nsID scriptGlobalObjectNSID_1_9 = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
 						rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9, result);
 					}
-				}
-				interfaceRequestor.Release ();
-
-				if (rc == XPCOM.NS_OK && result[0] != 0) {
-					int /*long*/ scriptGlobalObject = result[0];
-					result[0] = 0;
-					rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+		}
+			interfaceRequestor.Release ();
+		
+			if (rc == XPCOM.NS_OK && result[0] != 0) {
+				int /*long*/ scriptGlobalObject = result[0];
+		result[0] = 0;
+				rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
 					if (rc != XPCOM.NS_OK) {
 						new nsISupports (scriptGlobalObject).Release ();
 					} else {
-						int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
-						new nsISupports (scriptGlobalObject).Release ();
+				int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+				new nsISupports (scriptGlobalObject).Release ();
 
 						if (scriptContext != 0) {
-							/* ensure that the received nsIScriptContext implements the expected interface */
+					/* ensure that the received nsIScriptContext implements the expected interface */
 							nsISupports supports = new nsISupports (scriptContext);
 							nsID scriptContextNSID_10 = new nsID ("2e583bf4-3c1f-432d-8283-8dee7eccc88b"); /* nsIScriptContext */ //$NON-NLS-1$					
 							rc = supports.QueryInterface (scriptContextNSID_10, result);
-							if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
-								result[0] = 0;
-								nsID scriptContextNSID_1_9_2 = new nsID ("87482b5e-e019-4df5-9bc2-b2a51b1f2d28"); /* nsIScriptContext */ //$NON-NLS-1$					
+					if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
+						result[0] = 0;
+						nsID scriptContextNSID_1_9_2 = new nsID ("87482b5e-e019-4df5-9bc2-b2a51b1f2d28"); /* nsIScriptContext */ //$NON-NLS-1$					
 								rc = supports.QueryInterface (scriptContextNSID_1_9_2, result);
 								if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
 									result[0] = 0;
@@ -1359,57 +1359,57 @@
 									nsID scriptContextNSID_1_9 = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$					
 									rc = supports.QueryInterface (scriptContextNSID_1_9, result);
 								}
-							}
+		}
+		
+					if (rc == XPCOM.NS_OK && result[0] != 0) {
+						new nsISupports (result[0]).Release ();
+						result[0] = 0;
 
+						int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+						if (nativeContext != 0) {
+							int length = script.length ();
+							char[] scriptChars = new char[length];
+							script.getChars(0, length, scriptChars, 0);
+							byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
+							rc = principal.GetJSPrincipals (nativeContext, result);
 							if (rc == XPCOM.NS_OK && result[0] != 0) {
-								new nsISupports (result[0]).Release ();
+								int /*long*/ principals = result[0];
 								result[0] = 0;
 
-								int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
-								if (nativeContext != 0) {
-									int length = script.length ();
-									char[] scriptChars = new char[length];
-									script.getChars(0, length, scriptChars, 0);
-									byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
-									rc = principal.GetJSPrincipals (nativeContext, result);
-									if (rc == XPCOM.NS_OK && result[0] != 0) {
-										int /*long*/ principals = result[0];
-										result[0] = 0;
-
 										byte[] jsLibPath = getJSLibPathBytes ();
 										int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
 										if (globalJSObject != 0) {
-											aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
-											rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
+								aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
+								rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
 											if (rc == XPCOM.NS_OK && result[0] != 0) {
-												nsIJSContextStack stack = new nsIJSContextStack (result[0]);
-												result[0] = 0;
-												rc = stack.Push (nativeContext);
+								nsIJSContextStack stack = new nsIJSContextStack (result[0]);
+		result[0] = 0;
+								rc = stack.Push (nativeContext);
 												if (rc != XPCOM.NS_OK) {
 													stack.Release ();
 												} else {
 													boolean success = XPCOM.JS_EvaluateUCScriptForPrincipals (jsLibPath, nativeContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, isXULRunner190x ? result : null) != 0;
-													result[0] = 0;
-													rc = stack.Pop (result);
-													stack.Release ();
+		result[0] = 0;
+								rc = stack.Pop (result);
+								stack.Release ();
 													// should principals be Release()d too?
 													principal.Release ();
 													serviceManager.Release ();
-													return success;
-												}
-											}
-										}
-									}
-								}
+								return success;
 							}
 						}
 					}
 				}
-				principal.Release ();
 			}
+							}
+						}
+					}
+				}
+			principal.Release ();
 		}
+		}
 		serviceManager.Release ();
-	}
+		}
 
 	/* fall back to the pre-1.9 approach */
 
@@ -1432,13 +1432,13 @@
 }
 
 static Browser getBrowser (int /*long*/ aDOMWindow) {
-	int /*long*/[] result = new int /*long*/[1];
-	int rc = XPCOM.NS_GetServiceManager (result);
+				int /*long*/[] result = new int /*long*/[1];
+				int rc = XPCOM.NS_GetServiceManager (result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
 
-	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-	result[0] = 0;
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;		
 	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
 	rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
 	if (rc != XPCOM.NS_OK) Mozilla.error(rc);
@@ -1453,7 +1453,7 @@
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
 	int /*long*/ topDOMWindow = result[0];
-	result[0] = 0;
+				result[0] = 0;
 	rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	new nsISupports (topDOMWindow).Release ();
@@ -1463,16 +1463,16 @@
 	nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
 	result[0] = 0;
 	rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
 	webBrowserChrome.Release ();
 
 	nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
-	result[0] = 0;
+					result[0] = 0;
 	IsGettingSiteWindow = true;
 	rc = embeddingSiteWindow.GetSiteWindow (result);
 	IsGettingSiteWindow = false;
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
 	embeddingSiteWindow.Release ();
 
@@ -1484,9 +1484,9 @@
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
+					if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	
+
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
 	rc = webNavigation.GoForward ();
 	webNavigation.Release ();
@@ -1574,13 +1574,13 @@
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 	window.Release ();
-
+	
 	int /*long*/ document = result[0];
 	result[0] = 0;
 	rc = XPCOM.NS_GetComponentManager (result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
+	
 	nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 	result[0] = 0;
 	byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOMSERIALIZER_CONTRACTID, true);
@@ -1595,7 +1595,7 @@
 		int /*long*/ string = XPCOM.nsEmbedString_new ();
 		rc = serializer.SerializeToString (document, string);
 		serializer.Release ();
-
+			
 		int length = XPCOM.nsEmbedString_Length (string);
 		int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
 		chars = new char[length];
@@ -1605,9 +1605,9 @@
 		rc = componentManager.CreateInstanceByContractID (contractID, 0, nsIDOMSerializer.NS_IDOMSERIALIZER_IID, result);
 		if (rc != XPCOM.NS_OK) error (rc);
 		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
+	
 		nsIDOMSerializer serializer = new nsIDOMSerializer (result[0]);
-		result[0] = 0;
+	result[0] = 0;
 		rc = serializer.SerializeToString (document, result);
 		serializer.Release ();
 
@@ -1645,14 +1645,14 @@
 		XPCOM.memmove (dest, buffer, length);
 		XPCOM.nsEmbedCString_delete (aSpec);
 		uri.Release ();
-	}
+		}
 	if (dest == null) return ""; //$NON-NLS-1$
 
 	String location = new String (dest);
-	/*
+		/*
 	 * If the URI indicates that the page is being rendered from memory
 	 * (via setText()) then set it to about:blank to be consistent with IE.
-	 */
+		*/
 	if (location.equals (URI_FILEROOT)) {
 		location = ABOUT_BLANK;
 	} else {
@@ -1659,8 +1659,8 @@
 		int length = URI_FILEROOT.length ();
 		if (location.startsWith (URI_FILEROOT) && location.charAt (length) == '#') {
 			location = ABOUT_BLANK + location.substring (length);
-		}
-	}
+				}
+			}
 	return location;
 }
 
@@ -1674,10 +1674,10 @@
 		Object mozilla = method.invoke (null, new Object[0]);
 		method = clazz.getMethod ("wrapXPCOMObject", new Class[] {Long.TYPE, String.class}); //$NON-NLS-1$
 		webBrowserObject = method.invoke (mozilla, new Object[] {new Long (webBrowser.getAddress ()), !IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_10_IID_STR : nsIWebBrowser.NS_IWEBBROWSER_IID_STR});
-		/*
+	/*
 		 * The following AddRef() is needed to offset the automatic Release() that
 		 * will be performed by JavaXPCOM when webBrowserObject is finalized.
-		 */
+	 */
 		webBrowser.AddRef ();
 		return webBrowserObject;
 	} catch (ClassNotFoundException e) {
@@ -1733,14 +1733,14 @@
 		rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 0, greBuffer, length); /* note: propertiesLength is 0 */
 		if (rc != XPCOM.NS_OK) {
 			/* Fall back to attempt #3 */
-			C.free (lower);
-			bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
-			lower = C.malloc (bytes.length);
-			C.memmove (lower, bytes, bytes.length);
-			range.lower = lower;
+		C.free (lower);
+		bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
+		lower = C.malloc (bytes.length);
+		C.memmove (lower, bytes, bytes.length);
+		range.lower = lower;
 			rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 0, greBuffer, length); /* note: propertiesLength is 0 */
 		}
-	}
+						}
 	C.free (value);
 	C.free (name);
 	C.free (lower);
@@ -1755,7 +1755,7 @@
 		result = new String (MozillaDelegate.mbcsToWcs (null, bytes));
 	} else {
 		result = ""; //$NON-NLS-1$
-	}
+				}
 	C.free (greBuffer);
 	return result;
 }
@@ -1766,7 +1766,7 @@
 	if (is != null) {
 		if (!componentsDir.exists ()) {
 			componentsDir.mkdirs ();
-		}
+			}
 		int read;
 		byte [] buffer = new byte [4096];
 		File file = new File (componentsDir, "external.xpt"); //$NON-NLS-1$
@@ -1774,13 +1774,13 @@
 			FileOutputStream os = new FileOutputStream (file);
 			while ((read = is.read (buffer)) != -1) {
 				os.write(buffer, 0, read);
-			}
+		}
 			os.close ();
 			is.close ();
 		} catch (FileNotFoundException e) {
 		} catch (IOException e) {
-		}
-	}
+			}
+		} 
 }
 
 void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
@@ -1826,10 +1826,10 @@
 		}
 	}
 	factory.Release();
-
+	
 	ExternalFactory externalFactory = new ExternalFactory ();
 	externalFactory.AddRef ();
-	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXTERNAL_CONTRACTID, true);
+	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXTERNAL_CONTRACTID, true); 
 	aClassName = MozillaDelegate.wcsToMbcs (null, "External", true); //$NON-NLS-1$
 	rc = componentRegistrar.RegisterFactory (XPCOM.EXTERNAL_CID, aClassName, aContractID, externalFactory.getAddress ());
 	if (rc != XPCOM.NS_OK) {
@@ -1837,11 +1837,11 @@
 		error (rc);
 	}
 	externalFactory.Release ();
-
+	
 	rc = serviceManager.GetService (XPCOM.NS_CATEGORYMANAGER_CID, nsICategoryManager.NS_ICATEGORYMANAGER_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-
+		
 	nsICategoryManager categoryManager = new nsICategoryManager (result[0]);
 	result[0] = 0;
 	byte[] entry = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
@@ -1857,7 +1857,7 @@
 	result[0] = 0;
 
 	categoryManager.Release ();
-
+	
 	/*
 	* This Download factory will be used if the GRE version is < 1.8.
 	* If the GRE version is 1.8.x then the Download factory that is registered later for
@@ -1866,18 +1866,18 @@
 	*   functionality is provided by the GRE.
 	*/
 	if (IsPre_4) {
-		DownloadFactory downloadFactory = new DownloadFactory ();
-		downloadFactory.AddRef ();
-		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOWNLOAD_CONTRACTID, true);
-		aClassName = MozillaDelegate.wcsToMbcs (null, "swtDownload", true); //$NON-NLS-1$
-		rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory.getAddress ());
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
-		downloadFactory.Release ();
+	DownloadFactory downloadFactory = new DownloadFactory ();
+	downloadFactory.AddRef ();
+	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOWNLOAD_CONTRACTID, true);
+	aClassName = MozillaDelegate.wcsToMbcs (null, "swtDownload", true); //$NON-NLS-1$
+	rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName, aContractID, downloadFactory.getAddress ());
+	if (rc != XPCOM.NS_OK) {
+		browser.dispose ();
+		error (rc);
 	}
-
+	downloadFactory.Release ();
+	}
+		
 	FilePickerFactory pickerFactory = new FilePickerFactory ();
 	pickerFactory.AddRef ();
 	aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_FILEPICKER_CONTRACTID, true);
@@ -1885,10 +1885,10 @@
 	rc = componentRegistrar.RegisterFactory (XPCOM.NS_FILEPICKER_CID, aClassName, aContractID, pickerFactory.getAddress ());
 	/* a failure here is fine, it likely indicates that the OS has provided a default implementation */
 	pickerFactory.Release ();
-
+	
 	componentRegistrar.Release ();
 }
-
+	
 void initJavaXPCOM (String mozillaPath) {
 	try {
 		Class clazz = Class.forName ("org.mozilla.xpcom.Mozilla"); //$NON-NLS-1$
@@ -1915,7 +1915,7 @@
 	} catch (InstantiationException e) {
 	}
 }
-
+	
 String initMozilla (String mozillaPath) {
 	/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
 	int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
@@ -1984,7 +1984,7 @@
 	if (result[0] == 0) {
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_NULL_POINTER);
-	}
+	}	
 
 	nsILocalFile localFile = new nsILocalFile (result[0]);
 	result[0] = 0;
@@ -2034,15 +2034,15 @@
 		if (functionPtr == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_ERROR_NULL_POINTER);
-		}
+	}
 		if (IsPre_4) {
-			rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0);
+		rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0);
 		} else {
 			rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress ());
 		}
 		if (rc == XPCOM.NS_OK) {
 			System.setProperty (XULRUNNER_PATH, mozillaPath);
-		}
+	}
 	} else {
 		rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
 	}
@@ -2071,7 +2071,7 @@
 	if (result[0] == 0) {
 		browser.dispose ();
 		error (XPCOM.NS_NOINTERFACE);
-	}
+	}		
 
 	nsIPrefService prefService = new nsIPrefService (result[0]);
 	result[0] = 0;
@@ -2081,7 +2081,7 @@
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (rc);
-	}
+	}	
 	if (result[0] == 0) {
 		browser.dispose ();
 		error (XPCOM.NS_NOINTERFACE);
@@ -2107,7 +2107,7 @@
 		if (result[0] == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
-		}
+	}
 		localizedString = new nsIPrefLocalizedString (result[0]);
 		result[0] = 0;
 		rc = localizedString.ToString (result);
@@ -2114,11 +2114,11 @@
 		if (rc != XPCOM.NS_OK) {
 			browser.dispose ();
 			error (rc);
-		}
+	}
 		if (result[0] == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
-		}
+	}
 		int length = XPCOM.strlen_PRUnichar (result[0]);
 		char[] dest = new char[length];
 		XPCOM.memmove (dest, result[0], length * 2);
@@ -2192,26 +2192,26 @@
 	String prefCharset = null;
 	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_CHARSET, true);
 	rc = prefBranch.GetComplexValue (buffer, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, result);
-	/* 
+	/*
 	 * Feature of Debian.  For some reason attempting to query for the current charset
 	 * preference fails on Debian.  The workaround for this is to assume a value of
 	 * "ISO-8859-1" since this is typically the default value when mozilla is used
 	 * without a profile.
-	 */
+	*/
 	if (rc != XPCOM.NS_OK) {
 		prefCharset = "ISO-8859-1";	//$NON-NLS-1$
-	} else {
+		} else {
 		if (result[0] == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
 		}
 		localizedString = new nsIPrefLocalizedString (result[0]);
-		result[0] = 0;
+				result[0] = 0;
 		rc = localizedString.ToString (result);
 		if (rc != XPCOM.NS_OK) {
 			browser.dispose ();
 			error (rc);
-		}
+			}
 		if (result[0] == 0) {
 			browser.dispose ();
 			error (XPCOM.NS_NOINTERFACE);
@@ -2220,8 +2220,8 @@
 		char[] dest = new char[length];
 		XPCOM.memmove (dest, result[0], length * 2);
 		prefCharset = new String (dest);
-	}
-	result[0] = 0;
+			}
+				result[0] = 0;
 
 	String newCharset = System.getProperty ("file.encoding");	// $NON-NLS-1$
 	if (!newCharset.equals (prefCharset)) {
@@ -2241,8 +2241,8 @@
 				error (XPCOM.NS_NOINTERFACE);
 			}
 			localizedString = new nsIPrefLocalizedString (result[0]);
-			result[0] = 0;
-		}
+						result[0] = 0;
+					}
 		localizedString.SetDataWithLength (length, charBuffer);
 		rc = prefBranch.SetComplexValue (buffer, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, localizedString.getAddress ());
 	}
@@ -2260,11 +2260,11 @@
 	if (proxyHost != null) {
 		byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
 		rc = componentManager.CreateInstanceByContractID (contractID, 0, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+								if (rc != XPCOM.NS_OK) error (rc);
+								if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
 		localizedString = new nsIPrefLocalizedString (result[0]);
-		result[0] = 0;
+								result[0] = 0;
 		
 		int length = proxyHost.length ();
 		char[] charBuffer = new char[length];
@@ -2310,7 +2310,7 @@
 		}
 		result[0] = 0;
 		rc = prefBranch.SetComplexValue (buffer, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, localizedString.getAddress ());
-		if (rc != XPCOM.NS_OK) error (rc);
+								if (rc != XPCOM.NS_OK) error (rc);
 
 		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_SSL, true);
 		rc = prefBranch.GetComplexValue (buffer, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, result);
@@ -2330,7 +2330,7 @@
 		}
 		result[0] = 0;
 		rc = prefBranch.SetComplexValue (buffer, nsIPrefLocalizedString.NS_IPREFLOCALIZEDSTRING_IID, localizedString.getAddress ());
-		if (rc != XPCOM.NS_OK) error (rc);
+								if (rc != XPCOM.NS_OK) error (rc);
 
 		localizedString.Release ();
 	}
@@ -2360,7 +2360,7 @@
 		intResult[0] = 0;
 		rc = prefBranch.SetIntPref (buffer, port);
 		if (rc != XPCOM.NS_OK) error (rc);
-	}
+							}
 
 	if (proxyHost != null || port != -1) {
 		buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYTYPE, true);
@@ -2370,7 +2370,7 @@
 		intResult[0] = 0;
 		rc = prefBranch.SetIntPref (buffer, 1);
 		if (rc != XPCOM.NS_OK) error (rc);
-	}
+						}
 
 	/*
 	* Ensure that windows that are shown during page loads are not blocked.  Firefox may
@@ -2384,7 +2384,7 @@
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (rc);
-	}
+					}
 
 	/* Ensure that the status text can be set through means like javascript */ 
 	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_DISABLEWINDOWSTATUSCHANGE, true);
@@ -2392,7 +2392,7 @@
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (rc);
-	}
+				}
 
 	/* Ensure that the status line can be hidden when opening a window from javascript */ 
 	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_DISABLEOPENWINDOWSTATUSHIDE, true);
@@ -2400,7 +2400,7 @@
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (rc);
-	}
+			}
 
 	/* Ensure that javascript execution is enabled since this is the Browser's default behaviour */ 
 	buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_JAVASCRIPTENABLED, true);
@@ -2461,7 +2461,7 @@
 		XPCOM.XPCOMGlueLoadXULFunctions (ptr);
 		C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
 		int /*long*/ functionPtr = result[0];
-		result[0] = 0;
+	result[0] = 0;
 		C.free (functionLoad.function);
 		C.free (functionLoad.functionName);
 		C.free (ptr);
@@ -2478,8 +2478,8 @@
 
 void initSpinup (nsIComponentManager componentManager) {
 	if (MozillaDelegate.needsSpinup ()) {
-		int /*long*/[] result = new int /*long*/[1];
-
+	int /*long*/[] result = new int /*long*/[1];
+	
 		/* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
 		int rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.NS_IAPPSHELL_IID, result);
 		if (rc != XPCOM.NS_ERROR_NO_INTERFACE) {
@@ -2518,17 +2518,17 @@
 	int /*long*/[] result = new int /*long*/[1];
 	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
-		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-		if (rc != XPCOM.NS_OK) {
-			browser.dispose ();
-			error (rc);
-		}
+	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+	if (rc != XPCOM.NS_OK) {
+		browser.dispose ();
+		error (rc);
 	}
+	}
 	if (result[0] == 0) {
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_NO_INTERFACE);
 	}
-	
+
 	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
 	result[0] = 0;
 	Rectangle rect = browser.getClientArea ();
@@ -2560,7 +2560,7 @@
 void initWindowCreator (nsIServiceManager serviceManager) {
 	WindowCreator = new WindowCreator2 ();
 	WindowCreator.AddRef ();
-	
+
 	int /*long*/[] result = new int /*long*/[1];
 	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
 	int rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
@@ -2574,7 +2574,7 @@
 	}
 
 	nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
-	result[0] = 0;
+		result[0] = 0;
 	rc = windowWatcher.SetWindowCreator (WindowCreator.getAddress());
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
@@ -2603,7 +2603,7 @@
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (rc);
-	}
+		}
 	XPCOMWasGlued = true;
 
 	return mozillaDirPath;
@@ -2668,8 +2668,8 @@
 	int /*long*/[] result = new int /*long*/[1];
 	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
-		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-		if (rc != XPCOM.NS_OK) error (rc);
+	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);
 
@@ -2724,7 +2724,7 @@
 	if (rc != XPCOM.NS_OK) error (rc);
 	webBrowserFocus.Release ();
 }
-
+	
 void Deactivate () {
 	isActive = false;
 	int /*long*/[] result = new int /*long*/[1];
@@ -2891,7 +2891,7 @@
 	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-		if (rc != XPCOM.NS_OK) error (rc);
+	if (rc != XPCOM.NS_OK) error (rc);
 	}
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 
@@ -2916,7 +2916,7 @@
 
 	/*
 	* The following error conditions do not indicate unrecoverable problems:
-	* 
+	*
 	* - NS_ERROR_INVALID_POINTER: happens when Reload is called immediately
 	* after calling LoadURI.
 	* - NS_ERROR_FILE_NOT_FOUND: happens when attempting to reload a file that
@@ -3002,8 +3002,8 @@
 		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 		nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
 		result[0] = 0;
-		char[] uri = new char[ABOUT_BLANK.length () + 1];
-		ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+	    char[] uri = new char[ABOUT_BLANK.length () + 1];
+	    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
 		rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
 		if (rc != XPCOM.NS_OK) error (rc);
 		webNavigation.Release ();
@@ -3037,7 +3037,7 @@
 		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 		XPCOM.nsEmbedCString_delete (aSpec);
 		ioService.Release ();
-
+		
 		nsIURI uri = new nsIURI (result[0]);
 		result[0] = 0;
 
@@ -3065,7 +3065,7 @@
 		docShell.Release ();
 
 		inputStream.Release ();
-		interfaceRequestor.Release ();
+	interfaceRequestor.Release ();
 		uri.Release ();
 		XPCOM.nsEmbedCString_delete (aContentType);
 		XPCOM.nsEmbedCString_delete (aContentCharset);
@@ -3098,27 +3098,27 @@
 
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
 	result[0] = 0;
-	char[] uri = new char[url.length () + 1];
-	url.getChars (0, url.length (), uri, 0);
+    char[] uri = new char[url.length () + 1];
+    url.getChars (0, url.length (), uri, 0);
 
-	nsIMIMEInputStream postDataStream = null;
-	InputStream dataStream = null;
+    nsIMIMEInputStream postDataStream = null;
+    InputStream dataStream = null;
 	if (postData != null) {
-		rc = XPCOM.NS_GetComponentManager (result);
-		if (rc != XPCOM.NS_OK) error (rc);
-		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-		result[0] = 0;
-		byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MIMEINPUTSTREAM_CONTRACTID, true);
-		rc = componentManager.CreateInstanceByContractID (contractID, 0, nsIMIMEInputStream.NS_IMIMEINPUTSTREAM_IID, result);
-		componentManager.Release();
+    	rc = XPCOM.NS_GetComponentManager (result);
+    	if (rc != XPCOM.NS_OK) error (rc);
+    	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+    	nsIComponentManager componentManager = new nsIComponentManager (result[0]);
+    	result[0] = 0;
+    	byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MIMEINPUTSTREAM_CONTRACTID, true);
+    	rc = componentManager.CreateInstanceByContractID (contractID, 0, nsIMIMEInputStream.NS_IMIMEINPUTSTREAM_IID, result);
+    	componentManager.Release();
 
-		if (rc == XPCOM.NS_OK && result[0] != 0) { /* nsIMIMEInputStream is not in mozilla 1.4 */
+    	if (rc == XPCOM.NS_OK && result[0] != 0) { /* nsIMIMEInputStream is not in mozilla 1.4 */
 			dataStream = new InputStream (postData);
-			dataStream.AddRef ();
-			postDataStream = new nsIMIMEInputStream (result[0]);
-			rc = postDataStream.SetData (dataStream.getAddress ());
-			if (rc != XPCOM.NS_OK) error (rc);
+    		dataStream.AddRef ();
+    		postDataStream = new nsIMIMEInputStream (result[0]);
+    		rc = postDataStream.SetData (dataStream.getAddress ());
+    		if (rc != XPCOM.NS_OK) error (rc);
 
 			boolean foundLength = false;
 			boolean foundType = false;
@@ -3136,18 +3136,18 @@
 				}
 			}
 			rc = postDataStream.SetAddContentLength (foundLength ? 0 : 1);
-			if (rc != XPCOM.NS_OK) error (rc);
+    		if (rc != XPCOM.NS_OK) error (rc);
 			if (!foundType) {
-				byte[] name = MozillaDelegate.wcsToMbcs (null, HEADER_CONTENTTYPE, true);
-				byte[] value = MozillaDelegate.wcsToMbcs (null, MIMETYPE_FORMURLENCODED, true);
-				rc = postDataStream.AddHeader (name, value);
-				if (rc != XPCOM.NS_OK) error (rc);
-			}
+    		byte[] name = MozillaDelegate.wcsToMbcs (null, HEADER_CONTENTTYPE, true);
+    		byte[] value = MozillaDelegate.wcsToMbcs (null, MIMETYPE_FORMURLENCODED, true);
+    		rc = postDataStream.AddHeader (name, value);
+    		if (rc != XPCOM.NS_OK) error (rc);
+    	}
 		}
-		result[0] = 0;
+    	result[0] = 0;
 	}
 
-	InputStream headersStream = null;
+    InputStream headersStream = null;
     if (headers != null) {
 		StringBuffer buffer = new StringBuffer ();
 		for (int i = 0; i < headers.length; i++) {
@@ -3166,9 +3166,9 @@
 				}
 			}
 		}
-		byte[] bytes = MozillaDelegate.wcsToMbcs (null, buffer.toString (), true);
-		headersStream = new InputStream (bytes);
-		headersStream.AddRef ();
+    	byte[] bytes = MozillaDelegate.wcsToMbcs (null, buffer.toString (), true);
+    	headersStream = new InputStream (bytes);
+    	headersStream.AddRef ();
     }
 
 	rc = webNavigation.LoadURI (
@@ -3453,10 +3453,10 @@
 		while (elements.hasMoreElements ()) {
 			BrowserFunction function = (BrowserFunction)elements.nextElement ();
 			if (!function.isEvaluate) {
-				execute (function.functionString);
-			}
+			execute (function.functionString);
 		}
 	}
+	}
 
 	/*
 	* Feature of Mozilla.  When a redirect occurs to a site with an invalid
@@ -3503,7 +3503,7 @@
 			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
 			if (rc != XPCOM.NS_OK) {
 				rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
-				if (rc != XPCOM.NS_OK) error (rc);
+			if (rc != XPCOM.NS_OK) error (rc);
 			}
 			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
@@ -3686,9 +3686,9 @@
 				while (elements.hasMoreElements ()) {
 					BrowserFunction function = (BrowserFunction)elements.nextElement ();
 					if (!function.isEvaluate) {
-						execute (function.functionString);
-					}
+					execute (function.functionString);
 				}
+				}
 				/* 
 				* For Mozilla >= 1.9.2, when content is being set via nsIWebBrowserStream,
 				* registered functions must be re-installed in the subsequent Start Request
@@ -3778,10 +3778,10 @@
 			Runnable runnable = new Runnable () {
 				public void run () {
 					if (browser.isDisposed ()) return;
-					for (int i = 0; i < progressListeners.length; i++) {
-						progressListeners[i].completed (event2);
-					}
-				}
+			for (int i = 0; i < progressListeners.length; i++) {
+				progressListeners[i].completed (event2);
+			}
+		}
 			};
 			if (deferCompleted) {
 				display.asyncExec (runnable);
@@ -3804,27 +3804,27 @@
 				rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
 			}
 			if (rc == XPCOM.NS_OK && result[0] != 0) {
-				nsIChannel channel = new nsIChannel (result[0]);
-				result[0] = 0;
-				rc = channel.GetURI (result);
-				if (rc != XPCOM.NS_OK) error (rc);
-				if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
-				channel.Release ();
+			nsIChannel channel = new nsIChannel (result[0]);
+			result[0] = 0;
+			rc = channel.GetURI (result);
+			if (rc != XPCOM.NS_OK) error (rc);
+			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+			channel.Release ();
 
-				nsIURI uri = new nsIURI (result[0]);
-				result[0] = 0;
-				int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
-				rc = uri.GetSpec (aSpec);
-				if (rc != XPCOM.NS_OK) error (rc);
-				int length = XPCOM.nsEmbedCString_Length (aSpec);
-				int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-				byte[] bytes = new byte[length];
-				XPCOM.memmove (bytes, buffer, length);
-				lastNavigateURL = new String (bytes);
-				XPCOM.nsEmbedCString_delete (aSpec);
-				uri.Release ();
-			}
+			nsIURI uri = new nsIURI (result[0]);
+			result[0] = 0;
+			int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+			rc = uri.GetSpec (aSpec);
+			if (rc != XPCOM.NS_OK) error (rc);
+			int length = XPCOM.nsEmbedCString_Length (aSpec);
+			int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+			byte[] bytes = new byte[length];
+			XPCOM.memmove (bytes, buffer, length);
+			lastNavigateURL = new String (bytes);
+			XPCOM.nsEmbedCString_delete (aSpec);
+			uri.Release ();
 		}
+		}
 
 		/*
 		* Hook DOM listeners to the page's nsIDOMWindow here because this is
@@ -4033,7 +4033,7 @@
 	browser.dispose ();
 	return XPCOM.NS_OK;
 }
-
+   	
 int SizeBrowserTo (int aCX, int aCY) {
 	size = new Point (aCX, aCY);
 	boolean isChrome = (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) != 0;
@@ -4085,7 +4085,7 @@
 	return XPCOM.NS_OK;
 }
 
-/* nsIEmbeddingSiteWindow */
+/* nsIEmbeddingSiteWindow */ 
 
 int SetDimensions (int flags, int x, int y, int cx, int cy) {
 	boolean isChrome = (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) != 0;
@@ -4092,22 +4092,22 @@
 	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
 		location = new Point (x, y);
 		if (isChrome) {
-			browser.getShell ().setLocation (x, y);
-		}
+		browser.getShell ().setLocation (x, y);
 	}
+	}
 	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_INNER) != 0) {
 		size = new Point (cx, cy);
 		if (isChrome) {
-			browser.setSize (cx, cy);
-		}
+		browser.setSize (cx, cy);
 	}
+	}
 	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_OUTER) != 0) {
 		if (isChrome) {
-			browser.getShell ().setSize (cx, cy);
-		}
+		browser.getShell ().setSize (cx, cy);
 	}
-	return XPCOM.NS_OK;
-}
+	}
+	return XPCOM.NS_OK;   	
+}	
 
 int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, int /*long*/ cy) {
 	if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
@@ -4125,8 +4125,8 @@
 		if (cx != 0) C.memmove (cx, new int[] {size.x}, 4); /* PRInt32 */
 		if (cy != 0) C.memmove (cy, new int[] {size.y}, 4); /* PRInt32 */
 	}
-	return XPCOM.NS_OK;
-}
+	return XPCOM.NS_OK;     	
+}	
 
 int SetFocus () {
 	int /*long*/[] result = new int /*long*/[1];
@@ -4133,7 +4133,7 @@
 	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-		if (rc != XPCOM.NS_OK) error (rc);
+	if (rc != XPCOM.NS_OK) error (rc);
 	}
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 	
@@ -4232,7 +4232,7 @@
 	int /*long*/ siteWindow = delegate.getSiteWindow ();
 	XPCOM.memmove (aSiteWindow, new int /*long*/[] {siteWindow}, C.PTR_SIZEOF);
 	return XPCOM.NS_OK;     	
-}
+}  
  
 /* nsIWebBrowserChromeFocus */
 
@@ -4339,14 +4339,14 @@
 		 */
 		if (!value.startsWith (PREFIX_JAVASCRIPT)) {
 			if (locationListeners.length > 0) {
-				LocationEvent event = new LocationEvent (browser);
-				event.display = browser.getDisplay();
-				event.widget = browser;
-				event.location = value;
-				/*
-				 * If the URI indicates that the page is being rendered from memory
-				 * (via setText()) then set it to about:blank to be consistent with IE.
-				 */
+		LocationEvent event = new LocationEvent (browser);
+		event.display = browser.getDisplay();
+		event.widget = browser;
+		event.location = value;
+		/*
+		 * If the URI indicates that the page is being rendered from memory
+		 * (via setText()) then set it to about:blank to be consistent with IE.
+		 */
 				if (event.location.equals (URI_FILEROOT)) {
 					event.location = ABOUT_BLANK;
 				} else {
@@ -4355,12 +4355,12 @@
 						event.location = ABOUT_BLANK + event.location.substring (length);
 					}
 				}
-				event.doit = doit;
-				for (int i = 0; i < locationListeners.length; i++) {
-					locationListeners[i].changing (event);
-				}
-				doit = event.doit && !browser.isDisposed();
-			}
+		event.doit = doit;
+		for (int i = 0; i < locationListeners.length; i++) {
+			locationListeners[i].changing (event);
+		}
+			doit = event.doit && !browser.isDisposed();
+		}
 
 			if (doit) {
 				if (jsEnabled != jsEnabledOnNextPage) {
@@ -4608,15 +4608,15 @@
 							Event keyEvent = new Event ();
 							keyEvent.widget = browser;
 							keyEvent.type = SWT.KeyDown;
-							keyEvent.keyCode = lastKeyCode;
+					keyEvent.keyCode = lastKeyCode;
 							keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0? SWT.CTRL : 0) | (aShiftKey[0] != 0? SWT.SHIFT : 0) | (aMetaKey[0] != 0? SWT.COMMAND : 0);
-							browser.notifyListeners (keyEvent.type, keyEvent);
+					browser.notifyListeners (keyEvent.type, keyEvent);
 							if (!keyEvent.doit || browser.isDisposed ()) {
 								domEvent.PreventDefault ();
 							}
 						}
-					}
 				}
+				}
 			}
 		}
 
@@ -4688,7 +4688,7 @@
 		if (delegate.sendTraverse ()) {
 			doit = sendKeyEvent (keyEvent);
 		} else {
-			browser.notifyListeners (keyEvent.type, keyEvent);
+		browser.notifyListeners (keyEvent.type, keyEvent);
 			doit = keyEvent.doit; 
 		}
 		if (!doit || browser.isDisposed ()) {
@@ -4891,7 +4891,7 @@
 	int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
-		if (rc != XPCOM.NS_OK) error (rc);
+	if (rc != XPCOM.NS_OK) error (rc);
 	}
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
@@ -4988,31 +4988,31 @@
 		public void run() {
 			if (browser.isDisposed ()) return;
 			if (url.equals (lastNavigateURL)) {
-				String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
-				if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
-					int /*long*/[] result = new int /*long*/[1];
-					int rc = XPCOM.NS_GetServiceManager (result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-			
-					nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-					result[0] = 0;
-					byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTOVERRIDE_CONTRACTID, true);
-					rc = serviceManager.GetServiceByContractID (aContractID, nsICertOverrideService.NS_ICERTOVERRIDESERVICE_IID, result);
-					if (rc != XPCOM.NS_OK) error (rc);
-					if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-					serviceManager.Release ();
-			
-					nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
-					result[0] = 0;
-					byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
-					int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
-					rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
+			String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
+			if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
+				int /*long*/[] result = new int /*long*/[1];
+				int rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;
+				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTOVERRIDE_CONTRACTID, true);
+				rc = serviceManager.GetServiceByContractID (aContractID, nsICertOverrideService.NS_ICERTOVERRIDESERVICE_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release ();
+		
+				nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
+				result[0] = 0;
+				byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
+				int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+				rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
 					navigate (badCertRequest);
-					XPCOM.nsEmbedCString_delete (hostString);
-					overrideService.Release ();
-				}
+				XPCOM.nsEmbedCString_delete (hostString);
+				overrideService.Release ();
 			}
+			}
 			cert.Release ();
 			new nsISupports (badCertRequest).Release ();
 			badCertRequest = 0;
Index: org/eclipse/swt/browser/WebBrowser.java
===================================================================
--- org/eclipse/swt/browser/WebBrowser.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/WebBrowser.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -29,7 +29,7 @@
 	boolean jsEnabledOnNextPage = true, jsEnabled = true;
 	int nextFunctionIndex = 1;
 	Object evaluateResult;
-
+	
 	static final String ERROR_ID = "org.eclipse.swt.browser.error"; // $NON-NLS-1$
 	static final String EXECUTE_ID = "SWTExecuteTemporaryFunction"; // $NON-NLS-1$
 
Index: org/eclipse/swt/browser/External.java
===================================================================
--- org/eclipse/swt/browser/External.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/External.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -28,7 +28,7 @@
 	XPCOMObject securityCheckedComponent;
 	XPCOMObject scriptObjectOwner;
 	int refCount = 0;
-	
+
 	static Callback CallJavaProc;
 	static {
 		CallJavaProc = new Callback (External.class, "callJava", 3); //$NON-NLS-1$
@@ -60,7 +60,7 @@
 	result[0] = 0;
 	rc = serviceManager.GetService (XPCOM.NS_IXPCONNECT_CID, nsIXPConnect.NS_IXPCONNECT_IID, result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
 
 	nsIXPConnect connect = new nsIXPConnect (result[0]);
 	result[0] = 0;
@@ -107,8 +107,8 @@
 	/* if the BrowserFunction could not be invoked for some reason then return null to JS */
 	if (resultVariant == null) {
 		rc = XPCOM.NS_GetComponentManager (result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-		if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
 		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 		result[0] = 0;
 		resultVariant = convertToJS (null, componentManager);
@@ -119,7 +119,7 @@
 	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
 	rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
 	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
 	serviceManager.Release();
 
 	nsIMemory memory = new nsIMemory (result[0]);
@@ -196,21 +196,21 @@
 			XPCOM.memmove (id, iid, nsID.sizeof);
 			C.free (iid);
 
-			int /*long*/[] result = new int /*long*/[1];
+	int /*long*/[] result = new int /*long*/[1];
 			rc = XPCOM.NS_GetServiceManager (result);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
 
-			nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-			result[0] = 0;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-			if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
-			serviceManager.Release ();
+	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+	result[0] = 0;
+	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+	rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
+	serviceManager.Release ();
 
-			nsIMemory memory = new nsIMemory (result[0]);
-			result[0] = 0;
+	nsIMemory memory = new nsIMemory (result[0]);
+	result[0] = 0;
 
 			if (id.Equals (nsIVariant.NS_IVARIANT_IID) || id.Equals (nsIVariant.NS_IVARIANT_10_IID)) {
 				arrayReturn = new Object[count[0]];
@@ -219,14 +219,14 @@
 					C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
 					nsISupports supports = new nsISupports (arrayPtr[0]);
 					rc = supports.QueryInterface (id, result);
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-					if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
 
 					nsIVariant currentVariant = new nsIVariant (result[0]);
-					result[0] = 0;
+	result[0] = 0;
 					currentType[0] = 0;
 					rc = currentVariant.GetDataType (currentType);
-					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 					try {
 						arrayReturn[i] = convertToJava (currentVariant, currentType[0]);
 						currentVariant.Release ();
@@ -268,7 +268,7 @@
 						arrayReturn = new Object[count[0]];
 						for (int i = 0; i < count[0]; i++) {
 							int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
-							int /*long*/[] stringPtr = new int /*long*/[1];
+							int /*long*/[] stringPtr = new int /*long*/[1]; 
 							C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
 							int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
 							char[] dest = new char[length];
@@ -356,8 +356,8 @@
 			C.free (arrayPtr);
 			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 		}
-		return variant;
-	}
+			return variant;
+		}
 
 	variant.Release ();
 	SWT.error (SWT.ERROR_INVALID_RETURN_VALUE);
@@ -371,10 +371,10 @@
 
 	if (function != null) {
 		try {
-			short[] type = new short[1]; /* PRUint16 */
+		short[] type = new short[1]; /* PRUint16 */
 			nsIVariant variant = new nsIVariant (tokenVariant);
-			int rc = variant.GetDataType (type);
-			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+		int rc = variant.GetDataType (type);
+		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 			Object temp = convertToJava (variant, type[0]);
 			type[0] = 0;
 			if (temp instanceof String) {
@@ -384,17 +384,17 @@
 					rc = variant.GetDataType (type);
 					if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 					temp = convertToJava (variant, type[0]);
-					if (temp instanceof Object[]) {
-						Object[] arguments = (Object[])temp;
-						try {
-							returnValue = function.function (arguments);
-						} catch (Exception e) {
-							/* exception during function invocation */
-							returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
-						}
-					}
+			if (temp instanceof Object[]) {
+				Object[] arguments = (Object[])temp;
+				try {
+					returnValue = function.function (arguments);
+				} catch (Exception e) {
+					/* exception during function invocation */
+					returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
 				}
 			}
+				}
+			}
 		} catch (IllegalArgumentException e) {
 			/* invalid argument value type */
 			if (function.isEvaluate) {
Index: org/eclipse/swt/browser/Browser.java
===================================================================
--- org/eclipse/swt/browser/Browser.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/Browser.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -94,13 +94,13 @@
 
 	style = getStyle ();
 	webBrowser = new BrowserFactory ().createWebBrowser (style);
-	if (webBrowser != null) {
-		webBrowser.setBrowser (this);
+			if (webBrowser != null) {
+				webBrowser.setBrowser (this);
 		webBrowser.create (parent, style);
 		return;
 	}
-	dispose ();
-	SWT.error (SWT.ERROR_NO_HANDLES);
+		dispose ();
+		SWT.error (SWT.ERROR_NO_HANDLES);
 }
 
 static Composite checkParent (Composite parent) {
@@ -204,7 +204,7 @@
 	WebBrowser.clearSessions ();
 }
 
-/**
+/**	 
  * Returns the value of a cookie that is associated with a URL.
  * Note that cookies are shared amongst all Browser instances.
  * 
Index: org/eclipse/swt/browser/PromptService2.java
===================================================================
--- org/eclipse/swt/browser/PromptService2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/PromptService2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -20,7 +20,7 @@
 	XPCOMObject promptService;
 	XPCOMObject promptService2;
 	int refCount = 0;
-	
+
 PromptService2 () {
 	createCOMInterfaces ();
 }
@@ -164,8 +164,8 @@
 	* If mozilla is re-navigating to a page with a bad certificate in order
 	* to get its certificate info then do not show cert error message alerts.
 	*/
-	if (browser != null) {
-		Mozilla mozilla = (Mozilla)browser.webBrowser;
+			if (browser != null) {
+				Mozilla mozilla = (Mozilla)browser.webBrowser;
 		if (mozilla.isRetrievingBadCert) return XPCOM.NS_OK;
 	}
 
@@ -210,7 +210,7 @@
 
 int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {
 	Browser browser = getBrowser (aParent);
-
+	
 	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
 		XPCOM.memmove (_retval, new boolean[] {true});
 		return XPCOM.NS_OK;
@@ -332,22 +332,22 @@
 		* value that we override must be freed using the nsIMemory service.
 		*/
 		if (valueLabel[0] != null) {
-			int /*long*/[] result2 = new int /*long*/[1];
-			int rc = XPCOM.NS_GetServiceManager (result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+		int /*long*/[] result2 = new int /*long*/[1];
+				int rc = XPCOM.NS_GetServiceManager (result2);
+				if (rc != XPCOM.NS_OK) SWT.error (rc);
+				if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+			
+				nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
+				result2[0] = 0;
+				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+				rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
+				if (rc != XPCOM.NS_OK) SWT.error (rc);
+				if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
+				serviceManager.Release ();
+				
+				nsIMemory memory = new nsIMemory (result2[0]);
+				result2[0] = 0;
 
-			nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
-			result2[0] = 0;
-			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
-			rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
-			if (rc != XPCOM.NS_OK) SWT.error (rc);
-			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
-			serviceManager.Release ();
-
-			nsIMemory memory = new nsIMemory (result2[0]);
-			result2[0] = 0;
-
 			int cnt = valueLabel[0].length ();
 			char[] buffer = new char[cnt + 1];
 			valueLabel[0].getChars (0, cnt, buffer, 0);
@@ -359,9 +359,9 @@
 			if (valueAddr[0] != 0) {
 				memory.Free (valueAddr[0]);
 			}
-			memory.Release ();
+				memory.Release ();
+			}
 		}
-	}
 	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	return XPCOM.NS_OK;
 }
@@ -533,57 +533,57 @@
 	if (user == null) {
 		/* no listener handled the challenge, so show an authentication dialog */
 
-		String titleLabel, textLabel, checkLabel = null;
-		String[] userLabel = new String[1], passLabel = new String[1];
-		char[] dest;
-		int length;
-		if (aDialogTitle != 0) {
-			length = XPCOM.strlen_PRUnichar (aDialogTitle);
-			dest = new char[length];
-			XPCOM.memmove (dest, aDialogTitle, length * 2);
-			titleLabel = new String (dest);
-		} else {
-			titleLabel = SWT.getMessage ("SWT_Authentication_Required");	//$NON-NLS-1$
-		}
-		
-		length = XPCOM.strlen_PRUnichar (aText);
+	String titleLabel, textLabel, checkLabel = null;
+	String[] userLabel = new String[1], passLabel = new String[1];
+	char[] dest;
+	int length;
+	if (aDialogTitle != 0) {
+		length = XPCOM.strlen_PRUnichar (aDialogTitle);
 		dest = new char[length];
-		XPCOM.memmove (dest, aText, length * 2);
-		textLabel = new String (dest);
-
-		int /*long*/[] userAddr = new int /*long*/[1];
-		XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
-		if (userAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (userAddr[0]);
+		XPCOM.memmove (dest, aDialogTitle, length * 2);
+		titleLabel = new String (dest);
+	} else {
+		titleLabel = SWT.getMessage ("SWT_Authentication_Required");	//$NON-NLS-1$
+	}
+	
+	length = XPCOM.strlen_PRUnichar (aText);
+	dest = new char[length];
+	XPCOM.memmove (dest, aText, length * 2);
+	textLabel = new String (dest);
+	
+	int /*long*/[] userAddr = new int /*long*/[1];
+	XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
+	if (userAddr[0] != 0) {
+		length = XPCOM.strlen_PRUnichar (userAddr[0]);
+		dest = new char[length];
+		XPCOM.memmove (dest, userAddr[0], length * 2);
+		userLabel[0] = new String (dest);		
+	}
+	
+	int /*long*/[] passAddr = new int /*long*/[1];
+	XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
+	if (passAddr[0] != 0) {
+		length = XPCOM.strlen_PRUnichar (passAddr[0]);
+		dest = new char[length];
+		XPCOM.memmove (dest, passAddr[0], length * 2);
+		passLabel[0] = new String (dest);		
+	}
+	
+	if (aCheckMsg != 0) {
+		length = XPCOM.strlen_PRUnichar (aCheckMsg);
+		if (length > 0) {
 			dest = new char[length];
-			XPCOM.memmove (dest, userAddr[0], length * 2);
-			userLabel[0] = new String (dest);		
+			XPCOM.memmove (dest, aCheckMsg, length * 2);
+			checkLabel = new String (dest);
 		}
+	}
 
-		int /*long*/[] passAddr = new int /*long*/[1];
-		XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
-		if (passAddr[0] != 0) {
-			length = XPCOM.strlen_PRUnichar (passAddr[0]);
-			dest = new char[length];
-			XPCOM.memmove (dest, passAddr[0], length * 2);
-			passLabel[0] = new String (dest);		
-		}
-		
-		if (aCheckMsg != 0) {
-			length = XPCOM.strlen_PRUnichar (aCheckMsg);
-			if (length > 0) {
-				dest = new char[length];
-				XPCOM.memmove (dest, aCheckMsg, length * 2);
-				checkLabel = new String (dest);
-			}
-		}
-	
-		Shell shell = browser == null ? new Shell () : browser.getShell ();
-		PromptDialog dialog = new PromptDialog (shell);
+	Shell shell = browser == null ? new Shell () : browser.getShell ();
+	PromptDialog dialog = new PromptDialog (shell);
 		boolean[] check = new boolean[1], result = new boolean[1];
 		if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
-		dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
-	
+	dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
+
 		XPCOM.memmove (_retval, result);
 		if (result[0]) {
 			/* User selected OK */
@@ -605,22 +605,22 @@
 
 		int /*long*/[] result = new int /*long*/[1];
 		int rc = XPCOM.NS_GetServiceManager (result);
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
+				if (rc != XPCOM.NS_OK) SWT.error (rc);
 		if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
+			
 		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
 		result[0] = 0;
-		byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
 		rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
-		if (rc != XPCOM.NS_OK) SWT.error (rc);
-		if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
-		serviceManager.Release ();
-
+				if (rc != XPCOM.NS_OK) SWT.error (rc);
+				if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
+				serviceManager.Release ();
+				
 		nsIMemory memory = new nsIMemory (result[0]);
 		result[0] = 0;
 		if (userAddr[0] != 0) memory.Free (userAddr[0]);
 		if (passAddr[0] != 0) memory.Free (passAddr[0]);
-		memory.Release ();
+				memory.Release ();
 
 		/* write the name and password values */
 
@@ -633,14 +633,14 @@
 		XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
 
 		cnt = password.length ();
-		buffer = new char[cnt + 1];
+			buffer = new char[cnt + 1];
 		password.getChars (0, cnt, buffer, 0);
-		size = buffer.length * 2;
-		ptr = C.malloc (size);
-		XPCOM.memmove (ptr, buffer, size);
-		XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+			size = buffer.length * 2;
+			ptr = C.malloc (size);
+			XPCOM.memmove (ptr, buffer, size);
+			XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
 	}
-
+			
 	return XPCOM.NS_OK;
 }
 
Index: org/eclipse/swt/browser/AppFileLocProvider.java
===================================================================
--- org/eclipse/swt/browser/AppFileLocProvider.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/browser/AppFileLocProvider.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -23,7 +23,7 @@
 	String mozillaPath, profilePath, cacheParentPath;
 	String[] pluginDirs;
 	boolean isXULRunner;
-
+	
 	static final String SEPARATOR_OS = System.getProperty ("file.separator"); //$NON-NLS-1$
 	static final String CHROME_DIR = "chrome"; //$NON-NLS-1$
 	static final String COMPONENTS_DIR = "components"; //$NON-NLS-1$
@@ -33,7 +33,7 @@
 	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
 	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
 	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
-
+	
 	static boolean IsSparc;
 	static {
 		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
@@ -196,7 +196,7 @@
 			* to not add the directory containing this plug-in to the plug-in search path. 
 			*/
 			if (!IsSparc) {
-				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+			pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
 			}
 
 			/* set the next value to the home directory + "/.mozilla/plugins" */
@@ -215,17 +215,17 @@
 			int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
 			if (rc != XPCOM.NS_ERROR_FILE_UNRECOGNIZED_PATH) {
 				/* value appears to be a valid pathname */
-				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-				if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
+			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+			if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
 
-				nsILocalFile localFile = new nsILocalFile (result[0]);
-				result[0] = 0;
-				rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); 
-				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+			nsILocalFile localFile = new nsILocalFile (result[0]);
+			result[0] = 0;
+		    rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); 
+			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
 				if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-				localFile.Release ();
+			localFile.Release ();
 
-				nsIFile file = new nsIFile (result[0]);
+			nsIFile file = new nsIFile (result[0]);
 				files[index++] = file;
 			}
 			pathString.dispose ();
Index: org/eclipse/swt/accessibility/ACC.java
===================================================================
--- org/eclipse/swt/accessibility/ACC.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/accessibility/ACC.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -20,12 +20,12 @@
  * @since 2.0
  */
 public class ACC {
-	public static final int STATE_NORMAL = 			0x00000000;
-	public static final int STATE_SELECTED = 		0x00000002;
-	public static final int STATE_SELECTABLE = 		0x00200000;
+	public static final int STATE_NORMAL = 0x00000000;
+	public static final int STATE_SELECTED = 0x00000002;
+	public static final int STATE_SELECTABLE = 0x00200000;
 	public static final int STATE_MULTISELECTABLE = 0x01000000;
-	public static final int STATE_FOCUSED = 		0x00000004;
-	public static final int STATE_FOCUSABLE = 		0x00100000;
+	public static final int STATE_FOCUSED = 0x00000004;
+	public static final int STATE_FOCUSABLE = 0x00100000;
 	public static final int STATE_PRESSED = 		0x00000008;
 	public static final int STATE_CHECKED = 		0x00000010;
 	public static final int STATE_EXPANDED = 		0x00000200;
@@ -133,7 +133,7 @@
 	public static final int CHILDID_SELF = -1;
 	public static final int CHILDID_NONE = -2;
 	public static final int CHILDID_MULTIPLE = -3;
-
+	
 	/**
 	 * An AT is requesting the accessible child object at the specified index.
 	 * 
@@ -406,7 +406,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_VALUE_CHANGED = 0x800E;
-
+	
 	/**
 	 * Send when the loading of a document has completed.
 	 * 
@@ -413,7 +413,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_DOCUMENT_LOAD_COMPLETE = 0x105;
-
+	
 	/**
 	 * Send when the loading of a document was interrupted.
 	 * 
@@ -420,14 +420,14 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_DOCUMENT_LOAD_STOPPED = 0x106;
-
+	
 	/**
 	 * Send when the document contents are being reloaded.
 	 * 
-	 * @since 3.6
+	 *  @since 3.6
 	 */
 	public static final int EVENT_DOCUMENT_RELOAD = 0x107;
-
+	
 	/**
 	 * Send when a slide changed in a presentation document
 	 * or a page boundary was crossed in a word processing document. 
@@ -435,7 +435,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_PAGE_CHANGED = 0x111;
-
+	
 	/**
 	 * Send when the caret moved from one section to the next.
 	 * 
@@ -442,7 +442,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_SECTION_CHANGED = 0x112;
-
+	
 	/**
 	 * Send when the count or attributes of an accessible object's actions have changed.
 	 * 
@@ -449,7 +449,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_ACTION_CHANGED = 0x100;
-
+	
 	/**
 	 * Send when the starting index of this link within the containing string has changed.
 	 * 
@@ -456,7 +456,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERLINK_START_INDEX_CHANGED = 0x10d;
-
+	
 	/**
 	 * Send when the ending index of this link within the containing string has changed.
 	 * 
@@ -463,7 +463,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERLINK_END_INDEX_CHANGED = 0x108;
-
+	
 	/**
 	 * Send when the number of anchors associated with this hyperlink object has changed.
 	 * 
@@ -470,7 +470,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERLINK_ANCHOR_COUNT_CHANGED = 0x109;
-
+	
 	/**
 	 * Send when the hyperlink selected state changed from selected to unselected
 	 * or from unselected to selected.
@@ -478,7 +478,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERLINK_SELECTED_LINK_CHANGED = 0x10a;
-
+	
 	/**
 	 * Send when the hyperlink has been activated.
 	 * 
@@ -485,7 +485,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERLINK_ACTIVATED = 0x10b;
-
+	
 	/**
 	 * Send when one of the links associated with the hypertext object has been selected.
 	 * <p>
@@ -496,7 +496,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERTEXT_LINK_SELECTED = 0x10c;
-
+	
 	/**
 	 * Send when the number of hyperlinks associated with a hypertext object has changed.
 	 * 
@@ -503,7 +503,7 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_HYPERTEXT_LINK_COUNT_CHANGED = 0x10f;
-
+	
 	/**
 	 * Send when an object's attributes have changed.
 	 * 
@@ -578,13 +578,13 @@
 	 * @since 3.6
 	 */
 	public static final int EVENT_TEXT_ATTRIBUTE_CHANGED = 0x20a;
-	 
+
 	/**
 	 * Send when the caret has moved to a new position.
 	 * 
 	 * @since 3.6
 	 */
-	public static final int EVENT_TEXT_CARET_MOVED = 0x11b;
+	public static final int EVENT_TEXT_CARET_MOVED = 0x11b; 
 
 	/**
 	 * Send when the caret has moved from one column to the next.
@@ -718,5 +718,5 @@
 	 * 
 	 * @since 3.6
 	 */
-	public static final int RELATION_SUBWINDOW_OF = 14;	
+	public static final int RELATION_SUBWINDOW_OF = 14;
 }
Index: org/eclipse/swt/accessibility/AccessibleObject.java
===================================================================
--- org/eclipse/swt/accessibility/AccessibleObject.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/accessibility/AccessibleObject.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -38,7 +38,7 @@
 	static int /*long*/ namePtr = -1;
 	static final Hashtable AccessibleObjects = new Hashtable (9);
 	static final boolean DEBUG = Device.DEBUG;
-	
+
 	static final int ROW_ROLE, COLUMN_ROLE;
 	static {
 		ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "row", true)); //$NON-NLS-1$
@@ -116,7 +116,7 @@
 		}
 		return parentResult; 	
 	}
-	
+
 	static int /*long*/ atkAction_get_description (int /*long*/ atkObject, int /*long*/ index) {
 		if (DEBUG) print ("-->atkAction_get_description");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -166,13 +166,13 @@
 				if (event.result != null) {
 					if (keybindingPtr != -1) OS.g_free (keybindingPtr);
 					return keybindingPtr = getStringPtr (event.result); 
-				}
 			}
+		}
 			listeners = accessible.accessibleListeners;
 			length = listeners.size();
 			if (length > 0) {
 				AccessibleEvent event = new AccessibleEvent (accessible);
-				event.childID = object.id;
+		event.childID = object.id;
 				if (parentResult != 0) event.result = getString (parentResult);
 				for (int i = 0; i < length; i++) {
 					AccessibleListener listener = (AccessibleListener) listeners.elementAt(i);
@@ -182,8 +182,8 @@
 					if (keybindingPtr != -1) OS.g_free (keybindingPtr);
 					return keybindingPtr = getStringPtr (event.result); 
 				}
-			}
 		}
+		} 
 		return parentResult;
 	}
 
@@ -209,14 +209,14 @@
 				if (event.result != null) {
 					if (actionNamePtr != -1) OS.g_free (actionNamePtr);
 					return actionNamePtr = getStringPtr (event.result);
-				}
 			}
+		}
 			if (index == 0) {
 				listeners = accessible.accessibleControlListeners;
 				length = listeners.size();
 				if (length > 0) {
 					AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-					event.childID = object.id;
+		event.childID = object.id;
 					if (parentResult != 0) event.result = getString (parentResult);
 					for (int i = 0; i < length; i++) {
 						AccessibleControlListener listener = (AccessibleControlListener) listeners.elementAt(i);
@@ -230,7 +230,7 @@
 			}
 		}
 		return parentResult;
-	}
+		}
 	
 	static AtkComponentIface getComponentIface (int /*long*/ atkObject) {
 		if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_COMPONENT())) {
@@ -237,9 +237,9 @@
 			AtkComponentIface iface = new AtkComponentIface ();
 			ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject)));
 			return iface;
-		}
+		} 
 		return null;
-	}
+	}	
 
 	static int /*long*/ atkComponent_get_extents (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) {
 		if (DEBUG) print ("-->atkComponent_get_extents: " + atkObject);
@@ -251,40 +251,40 @@
 		AtkComponentIface iface = getComponentIface (atkObject);
 		if (iface != null && iface.get_extents != 0) {
 			ATK.call (iface.get_extents, atkObject, x, y, width, height, coord_type);
-		}
+			}
 		if (object != null) {
 			Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleControlListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				int[] parentX = new int [1], parentY = new int [1];
-				int[] parentWidth = new int [1], parentHeight = new int [1];
-				OS.memmove (parentX, x, 4);
-				OS.memmove (parentY, y, 4);
-				OS.memmove (parentWidth, width, 4);
-				OS.memmove (parentHeight, height, 4);
+		int[] parentX = new int [1], parentY = new int [1];
+		int[] parentWidth = new int [1], parentHeight = new int [1];
+		OS.memmove (parentX, x, 4);
+		OS.memmove (parentY, y, 4);
+		OS.memmove (parentWidth, width, 4);
+		OS.memmove (parentHeight, height, 4);
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.x = parentX [0]; event.y = parentY [0];
-				event.width = parentWidth [0]; event.height = parentHeight [0];
+		event.childID = object.id;
+		event.x = parentX [0]; event.y = parentY [0];
+		event.width = parentWidth [0]; event.height = parentHeight [0];
 				int[] topWindowX = new int [1], topWindowY = new int [1];
-				if (coord_type == ATK.ATK_XY_WINDOW) {
+		if (coord_type == ATK.ATK_XY_WINDOW) {
 					windowPoint (object, topWindowX, topWindowY);
-					event.x += topWindowX [0];
-					event.y += topWindowY [0]; 
-				}
+			event.x += topWindowX [0];
+			event.y += topWindowY [0]; 
+		}
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getLocation (event);
-				}
-				if (coord_type == ATK.ATK_XY_WINDOW) {
-					event.x -= topWindowX [0];
-					event.y -= topWindowY [0];
-				}
-				OS.memmove (x, new int[] {event.x}, 4);
-				OS.memmove (y, new int[] {event.y}, 4);
-				OS.memmove (width, new int[] {event.width}, 4);
-				OS.memmove (height, new int[] {event.height}, 4);
+		}
+		if (coord_type == ATK.ATK_XY_WINDOW) {
+			event.x -= topWindowX [0];
+			event.y -= topWindowY [0];
+		}
+		OS.memmove (x, new int[] {event.x}, 4);
+		OS.memmove (y, new int[] {event.y}, 4);
+		OS.memmove (width, new int[] {event.width}, 4);
+		OS.memmove (height, new int[] {event.height}, 4);
 				if (DEBUG) print("--->" + event.x + "," + event.y + "," + event.width + "x" + event.height);
 			}
 		}
@@ -299,34 +299,34 @@
 		AtkComponentIface iface = getComponentIface (atkObject);
 		if (iface != null && iface.get_position != 0) {
 			ATK.call (iface.get_position, atkObject, x, y, coord_type);
-		}
+			}
 		if (object != null) {
 			Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleControlListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				int[] parentX = new int [1], parentY = new int [1];
-				OS.memmove (parentX, x, 4);
-				OS.memmove (parentY, y, 4);
+		int[] parentX = new int [1], parentY = new int [1];
+		OS.memmove (parentX, x, 4);
+		OS.memmove (parentY, y, 4);
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.x = parentX [0]; event.y = parentY [0];
+		event.childID = object.id;
+		event.x = parentX [0]; event.y = parentY [0];
 				int[] topWindowX = new int [1], topWindowY = new int [1];
-				if (coord_type == ATK.ATK_XY_WINDOW) {
+		if (coord_type == ATK.ATK_XY_WINDOW) {
 					windowPoint (object, topWindowX, topWindowY);
-					event.x += topWindowX [0];
-					event.y += topWindowY [0]; 
-				}
+			event.x += topWindowX [0];
+			event.y += topWindowY [0]; 
+		}
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getLocation (event);
-				}
-				if (coord_type == ATK.ATK_XY_WINDOW) {
-					event.x -= topWindowX [0];
-					event.y -= topWindowY [0];
-				}
-				OS.memmove (x, new int[] {event.x}, 4);
-				OS.memmove (y, new int[] {event.y}, 4);
+		}
+		if (coord_type == ATK.ATK_XY_WINDOW) {
+			event.x -= topWindowX [0];
+			event.y -= topWindowY [0];
+		}
+		OS.memmove (x, new int[] {event.x}, 4);
+		OS.memmove (y, new int[] {event.y}, 4);
 			}
 		}
 		return 0;
@@ -340,24 +340,24 @@
 		AtkComponentIface iface = getComponentIface (atkObject);
 		if (iface != null && iface.get_size != 0) {
 			ATK.call (iface.get_size, atkObject, width, height, coord_type);
-		}
+			}
 		if (object != null) {
 			Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleControlListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				int[] parentWidth = new int [1], parentHeight = new int [1];
-				OS.memmove (parentWidth, width, 4);
-				OS.memmove (parentHeight, height, 4);
+		int[] parentWidth = new int [1], parentHeight = new int [1];
+		OS.memmove (parentWidth, width, 4);
+		OS.memmove (parentHeight, height, 4);
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.width = parentWidth [0]; event.height = parentHeight [0];
+		event.childID = object.id;
+		event.width = parentWidth [0]; event.height = parentHeight [0];
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getLocation (event);
-				}
-				OS.memmove (width, new int[] {event.width}, 4);
-				OS.memmove (height, new int[] {event.height}, 4);
+		}
+		OS.memmove (width, new int[] {event.width}, 4);
+		OS.memmove (height, new int[] {event.height}, 4);
 			}
 		}
 		return 0;
@@ -372,22 +372,22 @@
 			int length = listeners.size();
 			if (length > 0) {
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.x = (int)/*64*/x; event.y = (int)/*64*/y;
+		event.childID = object.id;
+		event.x = (int)/*64*/x; event.y = (int)/*64*/y;
 				int[] topWindowX = new int [1], topWindowY = new int [1];
-				if (coord_type == ATK.ATK_XY_WINDOW) {
+		if (coord_type == ATK.ATK_XY_WINDOW) {
 					windowPoint (object, topWindowX, topWindowY);
-					event.x += topWindowX [0];
-					event.y += topWindowY [0]; 
-				}
+			event.x += topWindowX [0];
+			event.y += topWindowY [0]; 
+		}
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getChildAtPoint (event);				
-				}
-				if (event.childID == object.id) event.childID = ACC.CHILDID_SELF;
+		}
+		if (event.childID == object.id) event.childID = ACC.CHILDID_SELF;
 				Accessible result = event.accessible;
 				AccessibleObject accObj = result != null ? result.getAccessibleObject() : object.getChildByID (event.childID);
-				if (accObj != null) {
+		if (accObj != null) {
 					return OS.g_object_ref (accObj.handle);	
 				}
 			}
@@ -846,15 +846,15 @@
 			int length = listeners.size();
 			if (length > 0) {
 				AccessibleEvent event = new AccessibleEvent (accessible);
-				event.childID = object.id;
+		event.childID = object.id;
 				if (parentResult != 0) event.result = getString (parentResult);
 				for (int i = 0; i < length; i++) {
 					AccessibleListener listener = (AccessibleListener)listeners.elementAt (i);
 					listener.getDescription (event);
-				}
+		} 
 				if (DEBUG) print ("---> " + event.result);
-				if (event.result == null) return parentResult;
-				if (descriptionPtr != -1) OS.g_free (descriptionPtr);
+		if (event.result == null) return parentResult;
+		if (descriptionPtr != -1) OS.g_free (descriptionPtr);
 				return descriptionPtr = getStringPtr (event.result);
 			}
 		}
@@ -965,15 +965,15 @@
 			int length = listeners.size();
 			if (length > 0) {
 				AccessibleEvent event = new AccessibleEvent (accessible);
-				event.childID = object.id;
+		event.childID = object.id;
 				if (parentResult != 0) event.result = getString (parentResult);
 				for (int i = 0; i < length; i++) {
 					AccessibleListener listener = (AccessibleListener)listeners.elementAt (i);
 					listener.getName (event);				
-				}
+		} 
 				if (DEBUG) print ("---> " + event.result);
-				if (event.result == null) return parentResult;
-				if (namePtr != -1) OS.g_free (namePtr);
+		if (event.result == null) return parentResult;
+		if (namePtr != -1) OS.g_free (namePtr);
 				return namePtr = getStringPtr (event.result);
 			}
 		}
@@ -994,15 +994,15 @@
 			int length = listeners.size();
 			if (length > 0) {
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.detail = (int)/*64*/parentResult;
+		event.childID = object.id;
+		event.detail = (int)/*64*/parentResult;
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getChildCount (event);
-				}
+		} 
 				if (DEBUG) print ("--->" + event.detail);
-				return event.detail;
-			}
+		return event.detail;
+	}
 		}
 		return parentResult;
 	}
@@ -1061,36 +1061,36 @@
 			int length = listeners.size();
 			if (length > 0) {
 				AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-				event.childID = object.id;
-				event.detail = -1;
+			event.childID = object.id;
+			event.detail = -1;
 				for (int i = 0; i < length; i++) {
 					AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 					listener.getRole (event);				
-				}
+			} 
 				if (DEBUG) print ("---> " + event.detail);
-				if (event.detail != -1) {
-					switch (event.detail) {
-						/* Convert from win32 role values to atk role values */
-						case ACC.ROLE_CHECKBUTTON: return ATK.ATK_ROLE_CHECK_BOX;
-						case ACC.ROLE_CLIENT_AREA: return ATK.ATK_ROLE_DRAWING_AREA;
-						case ACC.ROLE_COMBOBOX: return ATK.ATK_ROLE_COMBO_BOX;
-						case ACC.ROLE_DIALOG: return ATK.ATK_ROLE_DIALOG;
-						case ACC.ROLE_LABEL: return ATK.ATK_ROLE_LABEL;
-						case ACC.ROLE_LINK: return ATK.ATK_ROLE_TEXT;
-						case ACC.ROLE_LIST: return ATK.ATK_ROLE_LIST;
-						case ACC.ROLE_LISTITEM: return ATK.ATK_ROLE_LIST_ITEM;
-						case ACC.ROLE_MENU: return ATK.ATK_ROLE_MENU;
-						case ACC.ROLE_MENUBAR: return ATK.ATK_ROLE_MENU_BAR;
-						case ACC.ROLE_MENUITEM: return ATK.ATK_ROLE_MENU_ITEM;
-						case ACC.ROLE_PROGRESSBAR: return ATK.ATK_ROLE_PROGRESS_BAR;
-						case ACC.ROLE_PUSHBUTTON: return ATK.ATK_ROLE_PUSH_BUTTON;
-						case ACC.ROLE_SCROLLBAR: return ATK.ATK_ROLE_SCROLL_BAR;
-						case ACC.ROLE_SEPARATOR: return ATK.ATK_ROLE_SEPARATOR;
-						case ACC.ROLE_SLIDER: return ATK.ATK_ROLE_SLIDER;
+			if (event.detail != -1) {
+				switch (event.detail) {
+					/* Convert from win32 role values to atk role values */
+					case ACC.ROLE_CHECKBUTTON: return ATK.ATK_ROLE_CHECK_BOX;
+					case ACC.ROLE_CLIENT_AREA: return ATK.ATK_ROLE_DRAWING_AREA;
+					case ACC.ROLE_COMBOBOX: return ATK.ATK_ROLE_COMBO_BOX;
+					case ACC.ROLE_DIALOG: return ATK.ATK_ROLE_DIALOG;
+					case ACC.ROLE_LABEL: return ATK.ATK_ROLE_LABEL;
+					case ACC.ROLE_LINK: return ATK.ATK_ROLE_TEXT;
+					case ACC.ROLE_LIST: return ATK.ATK_ROLE_LIST;
+					case ACC.ROLE_LISTITEM: return ATK.ATK_ROLE_LIST_ITEM;
+					case ACC.ROLE_MENU: return ATK.ATK_ROLE_MENU;
+					case ACC.ROLE_MENUBAR: return ATK.ATK_ROLE_MENU_BAR;
+					case ACC.ROLE_MENUITEM: return ATK.ATK_ROLE_MENU_ITEM;
+					case ACC.ROLE_PROGRESSBAR: return ATK.ATK_ROLE_PROGRESS_BAR;
+					case ACC.ROLE_PUSHBUTTON: return ATK.ATK_ROLE_PUSH_BUTTON;
+					case ACC.ROLE_SCROLLBAR: return ATK.ATK_ROLE_SCROLL_BAR;
+					case ACC.ROLE_SEPARATOR: return ATK.ATK_ROLE_SEPARATOR;
+					case ACC.ROLE_SLIDER: return ATK.ATK_ROLE_SLIDER;
 						case ACC.ROLE_TABLE: return ATK.ATK_ROLE_TABLE;
 						case ACC.ROLE_TABLECELL: return ATK.ATK_ROLE_TABLE_CELL;
-						case ACC.ROLE_TABLECOLUMNHEADER: return ATK.ATK_ROLE_TABLE_COLUMN_HEADER;
-						case ACC.ROLE_TABLEROWHEADER: return ATK.ATK_ROLE_TABLE_ROW_HEADER;
+					case ACC.ROLE_TABLECOLUMNHEADER: return ATK.ATK_ROLE_TABLE_COLUMN_HEADER;
+					case ACC.ROLE_TABLEROWHEADER: return ATK.ATK_ROLE_TABLE_ROW_HEADER;
 						case ACC.ROLE_TABFOLDER: return ATK.ATK_ROLE_PAGE_TAB_LIST;
 						case ACC.ROLE_TABITEM: return ATK.ATK_ROLE_PAGE_TAB;
 						case ACC.ROLE_TEXT: return ATK.ATK_ROLE_TEXT;
@@ -1303,21 +1303,21 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				event.column = (int)/*64*/column;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			event.column = (int)/*64*/column;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getCell(event);
-				}
-				Accessible result = event.accessible;
-				if (result != null) {
-					AccessibleObject accessibleObject = result.getAccessibleObject();
-					OS.g_object_ref(accessibleObject.handle);
-					return accessibleObject.handle;
-				}
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getCell(event);
 			}
+			Accessible result = event.accessible;
+			if (result != null) {
+				AccessibleObject accessibleObject = result.getAccessibleObject();
+				OS.g_object_ref(accessibleObject.handle);
+				return accessibleObject.handle;
+			}
 		}
+		}
 		int /*long*/ parentResult = 0;
 		AtkTableIface iface = getTableIface (atkObject);
 		if (iface != null && iface.ref_at != 0) {
@@ -1334,23 +1334,23 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				event.column = (int)/*64*/column;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			event.column = (int)/*64*/column;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getCell(event);
-				}
-				Accessible result = event.accessible;
-				if (result == null) return -1;
-				event = new AccessibleTableEvent(accessible);
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getCell(event);
+			}
+			Accessible result = event.accessible;
+			if (result == null) return -1;
+			event = new AccessibleTableEvent(accessible);
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getColumnCount(event);
-				}
-				return row * event.count + column;
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getColumnCount(event);
 			}
+			return row * event.count + column;
 		}
+		}
 		int /*long*/ parentResult = 0;
 		AtkTableIface iface = getTableIface (atkObject);
 		if (iface != null && iface.get_index_at != 0) {
@@ -1367,11 +1367,11 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getColumnCount(event);
-				}
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getColumnCount(event);
+			}
 				int /*long*/ result = event.count == 0 ? -1 : index % event.count;
 				if (DEBUG) print ("---> " + result);
 				return result;
@@ -1393,11 +1393,11 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getColumnCount(event);
-				}
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getColumnCount(event);
+			}
 				int /*long*/ result = event.count == 0 ? -1 : index / event.count;
 				if (DEBUG) print ("---> " + result);
 				return result;
@@ -1424,15 +1424,15 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.count = (int)/*64*/parentResult;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.count = (int)/*64*/parentResult;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getColumnCount(event);
-					parentResult = event.count;
-				}
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getColumnCount(event);
+				parentResult = event.count;
 			}
 		}
+		}
 		return parentResult;
 	}
 
@@ -1449,15 +1449,15 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.count = (int)/*64*/parentResult;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.count = (int)/*64*/parentResult;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getRowCount(event);
-					parentResult = event.count;
-				}
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getRowCount(event);
+				parentResult = event.count;
 			}
 		}
+		}
 		return parentResult;
 	}
 
@@ -1474,29 +1474,29 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				event.column = (int)/*64*/column;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			event.column = (int)/*64*/column;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getCell(event);
-				}
-				Accessible result = event.accessible;
-				if (result != null) {
-					listeners = result.accessibleTableCellListeners;
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getCell(event);
+			}
+			Accessible result = event.accessible;
+			if (result != null) {
+				listeners = result.accessibleTableCellListeners;
 					length = listeners.size();
 					if (length > 0) {
-						AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
-						cellEvent.count = (int)/*64*/parentResult;
+				AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
+				cellEvent.count = (int)/*64*/parentResult;
 						for (int i = 0; i < length; i++) {
-							AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
-							listener.getColumnSpan(cellEvent);
-						}
-						return cellEvent.count;
-					}
+					AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
+					listener.getColumnSpan(cellEvent);
 				}
+				return cellEvent.count;
 			}
 		}
+			}
+		}
 		return parentResult;
 	}
 
@@ -1509,33 +1509,33 @@
 			parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column);
 		}
 		if (object != null) {
-			Accessible accessible = object.accessible;
+		Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				event.column = (int)/*64*/column;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			event.column = (int)/*64*/column;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getCell(event);
-				}
-				Accessible result = event.accessible;
-				if (result != null) {
-					listeners = result.accessibleTableCellListeners;
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getCell(event);
+			}
+			Accessible result = event.accessible;
+			if (result != null) {
+				listeners = result.accessibleTableCellListeners;
 					length = listeners.size();
 					if (length > 0) {
-						AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
-						cellEvent.count = (int)/*64*/parentResult;
+				AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
+				cellEvent.count = (int)/*64*/parentResult;
 						for (int i = 0; i < length; i++) {
-							AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
-							listener.getRowSpan(cellEvent);
-						}
-						return cellEvent.count;
-					}
+					AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
+					listener.getRowSpan(cellEvent);
 				}
+				return cellEvent.count;
 			}
 		}
+			}
+		}
 		return parentResult;
 	}
 
@@ -1602,18 +1602,18 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.column = (int)/*64*/column;
-				if (parentResult != 0) event.result = getString (parentResult);
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.column = (int)/*64*/column;
+			if (parentResult != 0) event.result = getString (parentResult);
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getColumnDescription(event);
-				}
-				if (event.result == null) return parentResult;
-				if (descriptionPtr != -1) OS.g_free (descriptionPtr);
-				return descriptionPtr = getStringPtr (event.result);
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getColumnDescription(event);
 			}
+			if (event.result == null) return parentResult;
+			if (descriptionPtr != -1) OS.g_free (descriptionPtr);
+			return descriptionPtr = getStringPtr (event.result);
 		}
+		}
 		return parentResult;
 	}
 	
@@ -1659,18 +1659,18 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				if (parentResult != 0) event.result = getString (parentResult);
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			if (parentResult != 0) event.result = getString (parentResult);
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getRowDescription(event);
-				}
-				if (event.result == null) return parentResult;
-				if (descriptionPtr != -1) OS.g_free (descriptionPtr);
-				return descriptionPtr = getStringPtr (event.result);
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getRowDescription(event);
 			}
+			if (event.result == null) return parentResult;
+			if (descriptionPtr != -1) OS.g_free (descriptionPtr);
+			return descriptionPtr = getStringPtr (event.result);
 		}
+		}
 		return parentResult;
 	}
 
@@ -1824,29 +1824,29 @@
 			Vector listeners = accessible.accessibleTableListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleTableEvent event = new AccessibleTableEvent(accessible);
-				event.row = (int)/*64*/row;
-				event.column = (int)/*64*/column;
+			AccessibleTableEvent event = new AccessibleTableEvent(accessible);
+			event.row = (int)/*64*/row;
+			event.column = (int)/*64*/column;
 				for (int i = 0; i < length; i++) {
-					AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
-					listener.getCell(event);
-				}
-				Accessible result = event.accessible;
-				if (result != null) {
-					listeners = result.accessibleTableCellListeners;
+				AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
+				listener.getCell(event);
+			}
+			Accessible result = event.accessible;
+			if (result != null) {
+				listeners = result.accessibleTableCellListeners;
 					length = listeners.size();
 					if (length > 0) {
-						AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
-						cellEvent.isSelected = parentResult != 0;
+				AccessibleTableCellEvent cellEvent = new AccessibleTableCellEvent(result);
+				cellEvent.isSelected = parentResult != 0;
 						for (int i = 0; i < length; i++) {
-							AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
-							listener.isSelected(cellEvent);
-						}
-						return cellEvent.isSelected ? 1 : 0;
-					}
+					AccessibleTableCellListener listener = (AccessibleTableCellListener) listeners.elementAt(i);
+					listener.isSelected(cellEvent);
 				}
+				return cellEvent.isSelected ? 1 : 0;
 			}
 		}
+			}
+		}
 		return parentResult;
 	}
 
@@ -1990,9 +1990,9 @@
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_character_extents != 0) {
 			ATK.call (iface.get_character_extents, atkObject, offset, x, y, width, height, coords);
-		}
+				}
 		return 0;
-	}
+			}
 	
 	static String getString (int /*long*/ strPtr) {
 		int length = OS.strlen (strPtr);
@@ -1999,7 +1999,7 @@
 		byte [] buffer = new byte [length];
 		OS.memmove (buffer, strPtr, length);
 		return new String (Converter.mbcsToWcs (null, buffer));
-	}
+		} 
 	
 	static int /*long*/ getStringPtr (String str) {
 		byte [] buffer = Converter.wcsToMbcs(null, str != null ? str : "", true); 
@@ -2007,7 +2007,7 @@
 		OS.memmove(ptr, buffer, buffer.length);
 		return ptr;
 	}
-	
+
 	static int /*long*/ atkText_get_range_extents (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset, int /*long*/ coord_type, int /*long*/ rect) {
 		if (DEBUG) print ("-->atkText_get_range_extents");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -2044,7 +2044,7 @@
 		}
 		return 0;
 	}
-	
+
 	static int /*long*/ atkText_get_run_attributes (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ start_offset, int /*long*/ end_offset) {
 		if (DEBUG) print ("-->atkText_get_run_attributes");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -2065,91 +2065,91 @@
 				int /*long*/ result = 0;
 				AtkAttribute attr = new AtkAttribute();
 				if (style != null) {
-					if (style.rise != 0) {
-						int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
-						attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE));
-						attr.value = getStringPtr (String.valueOf(style.rise));
-						ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
+				if (style.rise != 0) {
+					int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+					attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE));
+					attr.value = getStringPtr (String.valueOf(style.rise));
+					ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
 						result = OS.g_slist_append(result, attrPtr);
-					}
-					if (style.underline) {
-						int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
-						attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE));
+				}
+				if (style.underline) {
+					int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+					attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE));
 						String str = "none"; //$NON-NLS-1$
-						switch (style.underlineStyle) {
+					switch (style.underlineStyle) {
 							case SWT.UNDERLINE_DOUBLE: str = "double"; break; //$NON-NLS-1$
 							case SWT.UNDERLINE_SINGLE: str = "single"; break; //$NON-NLS-1$
 							case SWT.UNDERLINE_ERROR: str = "error"; break; //$NON-NLS-1$
 							case SWT.UNDERLINE_SQUIGGLE: str = "squiggle"; break; //$NON-NLS-1$
-						}
-						attr.value = getStringPtr (str);
-						ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
-						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);
+					attr.value = getStringPtr (str);
+					ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
 						result = OS.g_slist_append(result, attrPtr);
-					}
-					Font font = style.font;
-					if (font != null && !font.isDisposed()) {
-						//TODO language and direction
-						int /*long*/ attrPtr;
-						attrPtr = OS.g_malloc(AtkAttribute.sizeof);
-						attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME));
-						attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle));
-						ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
+				}
+				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_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);
+				}
+				Font font = style.font;
+				if (font != null && !font.isDisposed()) {
+					//TODO language and direction
+					int /*long*/ attrPtr;
+					attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+					attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME));
+					attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle));
+					ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
 						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);
+					
+					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_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);
+					
+					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_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);
+					
+					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_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);
+					
+					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_slist_append(result, attrPtr);
-					}
-					Color color = style.foreground;
-					if (color != null && !color.isDisposed()) {
-						int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
-						attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
+					
+					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_slist_append(result, attrPtr);
+				}
+				Color color = style.foreground;
+				if (color != null && !color.isDisposed()) {
+					int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+					attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
 						attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
-						ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
+					ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
 						result = OS.g_slist_append(result, attrPtr);
-					}
-					color = style.background;
-					if (color != null && !color.isDisposed()) {
-						int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
-						attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
+				}
+				color = style.background;
+				if (color != null && !color.isDisposed()) {
+					int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+					attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
 						attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
-						ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
+					ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
 						result = OS.g_slist_append(result, attrPtr);
-					}
 				}
+				}
 				if (event.attributes != null) {
 					int end = event.attributes.length / 2 * 2;
 					for (int i = 0; i < end; i+= 2) {
@@ -2169,7 +2169,7 @@
 			parentResult = ATK.call (iface.get_run_attributes, atkObject, offset, start_offset, end_offset);
 		}
 		return parentResult;
-	}
+		}
 
 	static int /*long*/ atkText_get_offset_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coords) {
 		if (DEBUG) print ("-->atkText_get_offset_at_point");
@@ -2194,7 +2194,7 @@
 				}
 				return event.offset;
 			}
-		}
+		} 
 		int /*long*/ parentResult = 0;
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_offset_at_point != 0) {
@@ -2225,10 +2225,10 @@
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.add_selection != 0) {
 			parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset);
+			}
+		return parentResult;
 		}
-		return parentResult;
-	}
-
+			
 	static int /*long*/ atkText_remove_selection (int /*long*/ atkObject, int /*long*/ selection_num) {
 		if (DEBUG) print ("-->atkText_remove_selection");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -2253,7 +2253,7 @@
 		}
 		return parentResult;
 	}
-	
+
 	static int /*long*/ atkText_set_caret_offset (int /*long*/ atkObject, int /*long*/ offset) {
 		if (DEBUG) print ("-->atkText_set_caret_offset");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -2274,10 +2274,10 @@
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.set_caret_offset != 0) {
 			return ATK.call (iface.set_caret_offset, atkObject, offset);
+			}
+		return 0;
 		}
-		return 0;
-	}
-
+			
 	static int /*long*/ atkText_set_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) {
 		if (DEBUG) print ("-->atkText_set_selection");
 		AccessibleObject object = getAccessibleObject (atkObject);
@@ -2296,7 +2296,7 @@
 				}
 				return ACC.OK.equals(event.result) ? 1 : 0;
 			}
-		}
+		} 
 		int /*long*/ parentResult = 0;
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.set_selection != 0) {
@@ -2312,7 +2312,7 @@
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_caret_offset != 0) {
 			parentResult = ATK.call (iface.get_caret_offset, atkObject);
-		}
+			}
 		if (object != null) {
 			Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleTextExtendedListeners;
@@ -2324,19 +2324,19 @@
 					listener.getCaretOffset (event);
 				}
 				return event.offset;
-			}
+		}
 			listeners = accessible.accessibleTextListeners;
 			length = listeners.size();
 			if (length > 0) {
-				AccessibleTextEvent event = new AccessibleTextEvent (object.accessible);
-				event.childID = object.id;
-				event.offset = (int)/*64*/parentResult;
+		AccessibleTextEvent event = new AccessibleTextEvent (object.accessible);
+		event.childID = object.id;
+		event.offset = (int)/*64*/parentResult;
 				for (int i = 0; i < length; i++) {
 					AccessibleTextListener listener = (AccessibleTextListener) listeners.elementAt(i);
 					listener.getCaretOffset (event);	
-				}
-				return event.offset;
-			}
+		} 
+		return event.offset; 	
+	}
 		}
 		return parentResult; 	
 	}
@@ -2421,9 +2421,9 @@
 				String text = event.result;
 				return text != null && text.length() > 0 ? text.charAt(0) : 0;
 			}
-			String text = object.getText ();
+		String text = object.getText ();
 			if (text != null && text.length() > offset) return text.charAt ((int)/*64*/offset);
-		}
+			}
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_character_at_offset != 0) {
 			return ATK.call (iface.get_character_at_offset, atkObject, offset);
@@ -2446,9 +2446,9 @@
 				}
 				return event.count;
 			}
-			String text = object.getText ();
-			if (text != null) return text.length ();
-		}
+		String text = object.getText ();
+		if (text != null) return text.length ();
+			}
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_character_count != 0) {
 			return ATK.call (iface.get_character_count, atkObject);
@@ -2500,12 +2500,12 @@
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_selection != 0) {
 			parentResult = ATK.call (iface.get_selection, atkObject, selection_num, start_offset, end_offset);
-		}
+			}
 		if (object != null) {
-			int[] parentStart = new int [1];
-			int[] parentEnd = new int [1];
-			OS.memmove (parentStart, start_offset, 4);
-			OS.memmove (parentEnd, end_offset, 4);
+		int[] parentStart = new int [1];
+		int[] parentEnd = new int [1];
+		OS.memmove (parentStart, start_offset, 4);
+		OS.memmove (parentEnd, end_offset, 4);
 			Accessible accessible = object.accessible;
 			Vector listeners = accessible.accessibleTextExtendedListeners;
 			int length = listeners.size();
@@ -2537,14 +2537,14 @@
 				if (length > 0) {
 					AccessibleTextEvent event = new AccessibleTextEvent (accessible);
 					event.childID = object.id;
-					event.offset = parentStart [0];
-					event.length = parentEnd [0] - parentStart [0];
+		event.offset = parentStart [0];
+		event.length = parentEnd [0] - parentStart [0];
 					for (int i = 0; i < length; i++) {
 						AccessibleTextListener listener = (AccessibleTextListener) listeners.elementAt(i);
 						listener.getSelectionRange (event);
-					}
-					OS.memmove (start_offset, new int[] {event.offset}, 4);
-					OS.memmove (end_offset, new int[] {event.offset + event.length}, 4);
+		}
+		OS.memmove (start_offset, new int[] {event.offset}, 4);
+		OS.memmove (end_offset, new int[] {event.offset + event.length}, 4);
 					if (parentResult != 0) OS.g_free(parentResult);
 					String text = object.getText();
 					if (text != null && text.length () > event.offset && text.length() >= event.offset + event.length) {
@@ -2553,8 +2553,8 @@
 					if (iface != null && iface.get_text != 0) {
 						return ATK.call (iface.get_text, atkObject, event.offset, event.offset + event.length);
 					}
-					return 0;
-				}
+		return 0;
+	}
 			}
 		}
 		return parentResult;
@@ -2578,15 +2578,15 @@
 				}
 				return getStringPtr (event.result);
 			}
-			String text = object.getText ();
+		String text = object.getText ();
 			if (text != null && text.length () > 0) {
-				if (end_offset == -1) {
-					end_offset = text.length ();
-				} else {
-					end_offset = Math.min (end_offset, text.length ());	
-				}
-				start_offset = Math.min (start_offset, end_offset);
-				text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset);
+			if (end_offset == -1) {
+				end_offset = text.length ();
+			} else {
+				end_offset = Math.min (end_offset, text.length ());	
+			}
+			start_offset = Math.min (start_offset, end_offset);
+			text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset);
 				return getStringPtr (text);
 			}
 		}
@@ -2641,10 +2641,10 @@
 							event.start = start;
 							event.type = ACC.TEXT_BOUNDARY_ALL;
 							event.count = 0;
-							for (int i = 0; i < length; i++) {
-								AccessibleTextExtendedListener listener = (AccessibleTextExtendedListener) listeners.elementAt(i);
-								listener.getText(event);
-							}
+				for (int i = 0; i < length; i++) {
+					AccessibleTextExtendedListener listener = (AccessibleTextExtendedListener) listeners.elementAt(i);
+					listener.getText(event);
+				}
 						}
 						break;
 					case ATK.ATK_TEXT_BOUNDARY_WORD_END: 
@@ -2674,170 +2674,170 @@
 				OS.memmove (end_offset, new int[] {event.end}, 4);
 				return getStringPtr (event.result);
 			}
-			int offset = (int)/*64*/offset_value;
-			String text = object.getText ();
+		int offset = (int)/*64*/offset_value;
+		String text = object.getText ();
 			if (text != null && text.length () > 0) {
 				length = text.length ();
-				offset = Math.min (offset, length - 1);
-				int startBounds = offset;
-				int endBounds = offset;
-				switch ((int)/*64*/boundary_type) {
-					case ATK.ATK_TEXT_BOUNDARY_CHAR: {
-						if (length > offset) endBounds++;
+			offset = Math.min (offset, length - 1);
+			int startBounds = offset;
+			int endBounds = offset;
+			switch ((int)/*64*/boundary_type) {
+				case ATK.ATK_TEXT_BOUNDARY_CHAR: {
+					if (length > offset) endBounds++;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
+					int wordStart1 = nextIndexOfChar (text, " !?.\n", offset - 1);
+					if (wordStart1 == -1) {
+						startBounds = endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
-						int wordStart1 = nextIndexOfChar (text, " !?.\n", offset - 1);
-						if (wordStart1 == -1) {
-							startBounds = endBounds = length;
-							break;
-						}
-						wordStart1 = nextIndexOfNotChar (text, " !?.\n", wordStart1);
-						if (wordStart1 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						startBounds = wordStart1;
-						int wordStart2 = nextIndexOfChar (text, " !?.\n", wordStart1);
-						if (wordStart2 == -1) {
-							endBounds = length;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, " !?.\n", wordStart2);
+					wordStart1 = nextIndexOfNotChar (text, " !?.\n", wordStart1);
+					if (wordStart1 == length) {
+						startBounds = endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
-						int previousWordEnd = previousIndexOfNotChar (text, " \n", offset); 
-						if (previousWordEnd == -1 || previousWordEnd != offset - 1) {
-							offset = nextIndexOfNotChar (text, " \n", offset);
-						}
-						if (offset == -1) {
-							startBounds = endBounds = length;
-							break;
-						}
-						int wordEnd1 = nextIndexOfChar (text, " !?.\n", (int)/*64*/offset);
-						if (wordEnd1 == -1) {
-							startBounds = endBounds = length;
-							break;
-						}
-						wordEnd1 = nextIndexOfNotChar (text, "!?.", wordEnd1);
-						if (wordEnd1 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						startBounds = wordEnd1;
-						int wordEnd2 = nextIndexOfNotChar (text, " \n", wordEnd1);
-						if (wordEnd2 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						wordEnd2 = nextIndexOfChar (text, " !?.\n", wordEnd2);
-						if (wordEnd2 == -1) {
-							endBounds = length;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, "!?.", wordEnd2);
+					startBounds = wordStart1;
+					int wordStart2 = nextIndexOfChar (text, " !?.\n", wordStart1);
+					if (wordStart2 == -1) {
+						endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
-						int previousSentenceEnd = previousIndexOfChar (text, "!?.", offset);
-						int previousText = previousIndexOfNotChar (text, " !?.\n", offset);
-						int sentenceStart1 = 0;
-						if (previousSentenceEnd >= previousText) {
-							sentenceStart1 = nextIndexOfNotChar (text, " !?.\n", offset);
-						} else {
-							sentenceStart1 = nextIndexOfChar (text, "!?.", offset);
-							if (sentenceStart1 == -1) {
-								startBounds = endBounds = length;
-								break;
-							}
-							sentenceStart1 = nextIndexOfNotChar (text, " !?.\n", sentenceStart1);
-						}
-						if (sentenceStart1 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						startBounds = sentenceStart1;
-						int sentenceStart2 = nextIndexOfChar (text, "!?.", sentenceStart1);
-						if (sentenceStart2 == -1) {
-							endBounds = length;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, " !?.\n", sentenceStart2);
+					endBounds = nextIndexOfNotChar (text, " !?.\n", wordStart2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
+					int previousWordEnd = previousIndexOfNotChar (text, " \n", offset); 
+					if (previousWordEnd == -1 || previousWordEnd != offset - 1) {
+						offset = nextIndexOfNotChar (text, " \n", offset);
+					}
+					if (offset == -1) {
+						startBounds = endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
-						int sentenceEnd1 = nextIndexOfChar (text, "!?.", offset);
-						if (sentenceEnd1 == -1) {
-							startBounds = endBounds = length;
-							break;
-						}
-						sentenceEnd1 = nextIndexOfNotChar (text, "!?.", sentenceEnd1);
-						if (sentenceEnd1 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						startBounds = sentenceEnd1;
-						int sentenceEnd2 = nextIndexOfNotChar (text, " \n", sentenceEnd1);
-						if (sentenceEnd2 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						sentenceEnd2 = nextIndexOfChar (text, "!?.", sentenceEnd2);
-						if (sentenceEnd2 == -1) {
-							endBounds = length;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, "!?.", sentenceEnd2);
+					int wordEnd1 = nextIndexOfChar (text, " !?.\n", (int)/*64*/offset);
+					if (wordEnd1 == -1) {
+						startBounds = endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
-						int lineStart1 = text.indexOf ('\n', offset - 1);
-						if (lineStart1 == -1) {
-							startBounds = endBounds = length;
-							break;
-						}
-						lineStart1 = nextIndexOfNotChar (text, "\n", lineStart1);
-						if (lineStart1 == length) {
-							startBounds = endBounds = length;
-							break;
-						}
-						startBounds = lineStart1;
-						int lineStart2 = text.indexOf ('\n', lineStart1);
-						if (lineStart2 == -1) {
-							endBounds = length;
-							break;
-						}
-						lineStart2 = nextIndexOfNotChar (text, "\n", lineStart2);
-						endBounds = lineStart2;
+					wordEnd1 = nextIndexOfNotChar (text, "!?.", wordEnd1);
+					if (wordEnd1 == length) {
+						startBounds = endBounds = length;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
-						int lineEnd1 = nextIndexOfChar (text, "\n", offset);
-						if (lineEnd1 == -1) {
+					startBounds = wordEnd1;
+					int wordEnd2 = nextIndexOfNotChar (text, " \n", wordEnd1);
+					if (wordEnd2 == length) {
+						startBounds = endBounds = length;
+						break;
+					}
+					wordEnd2 = nextIndexOfChar (text, " !?.\n", wordEnd2);
+					if (wordEnd2 == -1) {
+						endBounds = length;
+						break;
+					}
+					endBounds = nextIndexOfNotChar (text, "!?.", wordEnd2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
+					int previousSentenceEnd = previousIndexOfChar (text, "!?.", offset);
+					int previousText = previousIndexOfNotChar (text, " !?.\n", offset);
+					int sentenceStart1 = 0;
+					if (previousSentenceEnd >= previousText) {
+						sentenceStart1 = nextIndexOfNotChar (text, " !?.\n", offset);
+					} else {
+						sentenceStart1 = nextIndexOfChar (text, "!?.", offset);
+						if (sentenceStart1 == -1) {
 							startBounds = endBounds = length;
 							break;
 						}
-						startBounds = lineEnd1;
-						if (startBounds == length) {
-							endBounds = length;
-							break;
-						}
-						int lineEnd2 = nextIndexOfChar (text, "\n", lineEnd1 + 1);
-						if (lineEnd2 == -1) {
-							endBounds = length;
-							break;
-						}
-						endBounds = lineEnd2;
+						sentenceStart1 = nextIndexOfNotChar (text, " !?.\n", sentenceStart1);
+					}
+					if (sentenceStart1 == length) {
+						startBounds = endBounds = length;
 						break;
 					}
+					startBounds = sentenceStart1;
+					int sentenceStart2 = nextIndexOfChar (text, "!?.", sentenceStart1);
+					if (sentenceStart2 == -1) {
+						endBounds = length;
+						break;
+					}
+					endBounds = nextIndexOfNotChar (text, " !?.\n", sentenceStart2);
+					break;
 				}
-				OS.memmove (start_offset, new int[] {startBounds}, 4);
-				OS.memmove (end_offset, new int[] {endBounds}, 4);
-				text = text.substring (startBounds, endBounds);
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
+					int sentenceEnd1 = nextIndexOfChar (text, "!?.", offset);
+					if (sentenceEnd1 == -1) {
+						startBounds = endBounds = length;
+						break;
+					}
+					sentenceEnd1 = nextIndexOfNotChar (text, "!?.", sentenceEnd1);
+					if (sentenceEnd1 == length) {
+						startBounds = endBounds = length;
+						break;
+					}
+					startBounds = sentenceEnd1;
+					int sentenceEnd2 = nextIndexOfNotChar (text, " \n", sentenceEnd1);
+					if (sentenceEnd2 == length) {
+						startBounds = endBounds = length;
+						break;
+					}
+					sentenceEnd2 = nextIndexOfChar (text, "!?.", sentenceEnd2);
+					if (sentenceEnd2 == -1) {
+						endBounds = length;
+						break;
+					}
+					endBounds = nextIndexOfNotChar (text, "!?.", sentenceEnd2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
+					int lineStart1 = text.indexOf ('\n', offset - 1);
+					if (lineStart1 == -1) {
+						startBounds = endBounds = length;
+						break;
+					}
+					lineStart1 = nextIndexOfNotChar (text, "\n", lineStart1);
+					if (lineStart1 == length) {
+						startBounds = endBounds = length;
+						break;
+					}
+					startBounds = lineStart1;
+					int lineStart2 = text.indexOf ('\n', lineStart1);
+					if (lineStart2 == -1) {
+						endBounds = length;
+						break;
+					}
+					lineStart2 = nextIndexOfNotChar (text, "\n", lineStart2);
+					endBounds = lineStart2;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
+					int lineEnd1 = nextIndexOfChar (text, "\n", offset);
+					if (lineEnd1 == -1) {
+						startBounds = endBounds = length;
+						break;
+					}
+					startBounds = lineEnd1;
+					if (startBounds == length) {
+						endBounds = length;
+						break;
+					}
+					int lineEnd2 = nextIndexOfChar (text, "\n", lineEnd1 + 1);
+					if (lineEnd2 == -1) {
+						endBounds = length;
+						break;
+					}
+					endBounds = lineEnd2;
+					break;
+				}
+			}
+			OS.memmove (start_offset, new int[] {startBounds}, 4);
+			OS.memmove (end_offset, new int[] {endBounds}, 4);
+			text = text.substring (startBounds, endBounds);
 				return getStringPtr (text);
 			} 
-		}
+		} 
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_text_after_offset != 0) {
 			return ATK.call (iface.get_text_after_offset, atkObject, offset_value, boundary_type, start_offset, end_offset);
@@ -2903,10 +2903,10 @@
 							event.start = eventStart;
 							event.end = eventEnd;
 							event.count = -1;
-							for (int i = 0; i < length; i++) {
-								AccessibleTextExtendedListener listener = (AccessibleTextExtendedListener) listeners.elementAt(i);
-								listener.getText(event);
-							}
+				for (int i = 0; i < length; i++) {
+					AccessibleTextExtendedListener listener = (AccessibleTextExtendedListener) listeners.elementAt(i);
+					listener.getText(event);
+				}
 							event.start = event.end;
 							event.end = end;
 							event.type = ACC.TEXT_BOUNDARY_ALL;
@@ -2922,113 +2922,113 @@
 				OS.memmove (end_offset, new int[] {event.end}, 4);
 				return getStringPtr (event.result);
 			}
-			int offset = (int)/*64*/offset_value;
-			String text = object.getText ();
+		int offset = (int)/*64*/offset_value;
+		String text = object.getText ();
 			if (text != null && text.length () > 0) {
 				length = text.length ();
-				offset = Math.min (offset, length - 1);
-				int startBounds = offset;
-				int endBounds = offset;
-				switch ((int)/*64*/boundary_type) {
-					case ATK.ATK_TEXT_BOUNDARY_CHAR: {
-						if (length > offset) endBounds++;
+			offset = Math.min (offset, length - 1);
+			int startBounds = offset;
+			int endBounds = offset;
+			switch ((int)/*64*/boundary_type) {
+				case ATK.ATK_TEXT_BOUNDARY_CHAR: {
+					if (length > offset) endBounds++;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
+					int wordStart1 = previousIndexOfNotChar (text, " !?.\n", offset);
+					if (wordStart1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
-						int wordStart1 = previousIndexOfNotChar (text, " !?.\n", offset);
-						if (wordStart1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						wordStart1 = previousIndexOfChar (text, " !?.\n", wordStart1) + 1;
-						if (wordStart1 == -1) {
-							startBounds = 0;
-							break;
-						}
-						startBounds = wordStart1;
-						int wordStart2 = nextIndexOfChar (text, " !?.\n", wordStart1);
-						endBounds = nextIndexOfNotChar (text, " !?.\n", wordStart2);
+					wordStart1 = previousIndexOfChar (text, " !?.\n", wordStart1) + 1;
+					if (wordStart1 == -1) {
+						startBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
-						int wordEnd1 = previousIndexOfNotChar (text, "!?.", offset + 1);
-						wordEnd1 = previousIndexOfChar (text, " !?.\n", wordEnd1);
-						wordEnd1 = previousIndexOfNotChar (text, " \n", wordEnd1 + 1);
-						if (wordEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						startBounds = wordEnd1 + 1;
-						int wordEnd2 = nextIndexOfNotChar (text, " \n", startBounds);
-						if (wordEnd2 == length) {
-							endBounds = startBounds;
-							break;
-						}
-						wordEnd2 = nextIndexOfChar (text, " !?.\n", wordEnd2);
-						if (wordEnd2 == -1) {
-							endBounds = startBounds;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, "!?.", wordEnd2);
+					startBounds = wordStart1;
+					int wordStart2 = nextIndexOfChar (text, " !?.\n", wordStart1);
+					endBounds = nextIndexOfNotChar (text, " !?.\n", wordStart2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
+					int wordEnd1 = previousIndexOfNotChar (text, "!?.", offset + 1);
+					wordEnd1 = previousIndexOfChar (text, " !?.\n", wordEnd1);
+					wordEnd1 = previousIndexOfNotChar (text, " \n", wordEnd1 + 1);
+					if (wordEnd1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
-						int sentenceStart1 = previousIndexOfNotChar (text, " !?.\n", offset + 1);
-						if (sentenceStart1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						sentenceStart1 = previousIndexOfChar (text, "!?.", sentenceStart1) + 1;
-						startBounds = nextIndexOfNotChar (text, " \n", sentenceStart1);
-						int sentenceStart2 = nextIndexOfChar (text, "!?.", startBounds);
-						endBounds = nextIndexOfNotChar (text, " !?.\n", sentenceStart2);
+					startBounds = wordEnd1 + 1;
+					int wordEnd2 = nextIndexOfNotChar (text, " \n", startBounds);
+					if (wordEnd2 == length) {
+						endBounds = startBounds;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
-						int sentenceEnd1 = previousIndexOfNotChar (text, "!?.", offset + 1);
-						sentenceEnd1 = previousIndexOfChar (text, "!?.", sentenceEnd1);
-						sentenceEnd1 = previousIndexOfNotChar (text, " \n", sentenceEnd1 + 1);
-						if (sentenceEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						startBounds = sentenceEnd1 + 1;
-						int sentenceEnd2 = nextIndexOfNotChar (text, " \n", startBounds);
-						if (sentenceEnd2 == length) {
-							endBounds = startBounds;
-							break;
-						}
-						sentenceEnd2 = nextIndexOfChar (text, "!?.", sentenceEnd2);
-						if (sentenceEnd2 == -1) {
-							endBounds = startBounds;
-							break;
-						}
-						endBounds = nextIndexOfNotChar (text, "!?.", sentenceEnd2);
+					wordEnd2 = nextIndexOfChar (text, " !?.\n", wordEnd2);
+					if (wordEnd2 == -1) {
+						endBounds = startBounds;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
-						startBounds = previousIndexOfChar (text, "\n", offset) + 1;
-						int lineEnd2 = nextIndexOfChar (text, "\n", startBounds);
-						if (lineEnd2 < length) lineEnd2++;
-						endBounds = lineEnd2;
+					endBounds = nextIndexOfNotChar (text, "!?.", wordEnd2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
+					int sentenceStart1 = previousIndexOfNotChar (text, " !?.\n", offset + 1);
+					if (sentenceStart1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
-						int lineEnd1 = previousIndexOfChar (text, "\n", offset);
-						if (lineEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						startBounds = lineEnd1;
-						endBounds = nextIndexOfChar (text, "\n", lineEnd1 + 1);
+					sentenceStart1 = previousIndexOfChar (text, "!?.", sentenceStart1) + 1;
+					startBounds = nextIndexOfNotChar (text, " \n", sentenceStart1);
+					int sentenceStart2 = nextIndexOfChar (text, "!?.", startBounds);
+					endBounds = nextIndexOfNotChar (text, " !?.\n", sentenceStart2);
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
+					int sentenceEnd1 = previousIndexOfNotChar (text, "!?.", offset + 1);
+					sentenceEnd1 = previousIndexOfChar (text, "!?.", sentenceEnd1);
+					sentenceEnd1 = previousIndexOfNotChar (text, " \n", sentenceEnd1 + 1);
+					if (sentenceEnd1 == -1) {
+						startBounds = endBounds = 0;
+						break;
 					}
+					startBounds = sentenceEnd1 + 1;
+					int sentenceEnd2 = nextIndexOfNotChar (text, " \n", startBounds);
+					if (sentenceEnd2 == length) {
+						endBounds = startBounds;
+						break;
+					}
+					sentenceEnd2 = nextIndexOfChar (text, "!?.", sentenceEnd2);
+					if (sentenceEnd2 == -1) {
+						endBounds = startBounds;
+						break;
+					}
+					endBounds = nextIndexOfNotChar (text, "!?.", sentenceEnd2);
+					break;
 				}
-				OS.memmove (start_offset, new int[] {startBounds}, 4);
-				OS.memmove (end_offset, new int[] {endBounds}, 4);
-				text = text.substring (startBounds, endBounds);
+				case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
+					startBounds = previousIndexOfChar (text, "\n", offset) + 1;
+					int lineEnd2 = nextIndexOfChar (text, "\n", startBounds);
+					if (lineEnd2 < length) lineEnd2++;
+					endBounds = lineEnd2;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
+					int lineEnd1 = previousIndexOfChar (text, "\n", offset);
+					if (lineEnd1 == -1) {
+						startBounds = endBounds = 0;
+						break;
+					}
+					startBounds = lineEnd1;
+					endBounds = nextIndexOfChar (text, "\n", lineEnd1 + 1);
+				}
+			}
+			OS.memmove (start_offset, new int[] {startBounds}, 4);
+			OS.memmove (end_offset, new int[] {endBounds}, 4);
+			text = text.substring (startBounds, endBounds);
 				return getStringPtr (text);
 			} 
-		}
+		} 
 		AtkTextIface iface = getTextIface (atkObject);
 		if (iface != null && iface.get_text_at_offset != 0) {
 			return ATK.call (iface.get_text_at_offset, atkObject, offset_value, boundary_type, start_offset, end_offset);
@@ -3113,115 +3113,115 @@
 				}
 				return getStringPtr (event.result);
 			}
-			int offset = (int)/*64*/offset_value;
-			String text = object.getText ();
+		int offset = (int)/*64*/offset_value;
+		String text = object.getText ();
 			if (text != null && text.length () > 0) {
 				length = text.length ();
-				offset = Math.min (offset, length - 1);
-				int startBounds = offset;
-				int endBounds = offset;
-				switch ((int)/*64*/boundary_type) {
-					case ATK.ATK_TEXT_BOUNDARY_CHAR: {
-						if (length >= offset && offset > 0) startBounds--;
+			offset = Math.min (offset, length - 1);
+			int startBounds = offset;
+			int endBounds = offset;
+			switch ((int)/*64*/boundary_type) {
+				case ATK.ATK_TEXT_BOUNDARY_CHAR: {
+					if (length >= offset && offset > 0) startBounds--;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
+					int wordStart1 = previousIndexOfChar (text, " !?.\n", offset - 1);
+					if (wordStart1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_START: {
-						int wordStart1 = previousIndexOfChar (text, " !?.\n", offset - 1);
-						if (wordStart1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						int wordStart2 = previousIndexOfNotChar (text, " !?.\n", wordStart1);
-						if (wordStart2 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = wordStart1 + 1;
-						startBounds = previousIndexOfChar (text, " !?.\n", wordStart2) + 1;
+					int wordStart2 = previousIndexOfNotChar (text, " !?.\n", wordStart1);
+					if (wordStart2 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
-						int wordEnd1 =previousIndexOfChar (text, " !?.\n", offset);
-						if (wordEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						wordEnd1 = previousIndexOfNotChar (text, " \n", wordEnd1 + 1);
-						if (wordEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = wordEnd1 + 1;
-						int wordEnd2 = previousIndexOfNotChar (text, " !?.\n", endBounds);
-						wordEnd2 = previousIndexOfChar (text, " !?.\n", wordEnd2);
-						if (wordEnd2 == -1) {
-							startBounds = 0;
-							break;
-						}
-						startBounds = previousIndexOfNotChar (text, " \n", wordEnd2 + 1) + 1;
+					endBounds = wordStart1 + 1;
+					startBounds = previousIndexOfChar (text, " !?.\n", wordStart2) + 1;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_WORD_END: {
+					int wordEnd1 =previousIndexOfChar (text, " !?.\n", offset);
+					if (wordEnd1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
-						int sentenceStart1 = previousIndexOfChar (text, "!?.", offset);
-						if (sentenceStart1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						int sentenceStart2 = previousIndexOfNotChar (text, "!?.", sentenceStart1);
-						if (sentenceStart2 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = sentenceStart1 + 1;
-						startBounds = previousIndexOfChar (text, "!?.", sentenceStart2) + 1;
+					wordEnd1 = previousIndexOfNotChar (text, " \n", wordEnd1 + 1);
+					if (wordEnd1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
-						int sentenceEnd1 = previousIndexOfChar (text, "!?.", offset);
-						if (sentenceEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						sentenceEnd1 = previousIndexOfNotChar (text, " \n", sentenceEnd1 + 1);
-						if (sentenceEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = sentenceEnd1 + 1;
-						int sentenceEnd2 = previousIndexOfNotChar (text, "!?.", endBounds);
-						sentenceEnd2 = previousIndexOfChar (text, "!?.", sentenceEnd2);
-						if (sentenceEnd2 == -1) {
-							startBounds = 0;
-							break;
-						}
-						startBounds = previousIndexOfNotChar (text, " \n", sentenceEnd2 + 1) + 1;
+					endBounds = wordEnd1 + 1;
+					int wordEnd2 = previousIndexOfNotChar (text, " !?.\n", endBounds);
+					wordEnd2 = previousIndexOfChar (text, " !?.\n", wordEnd2);
+					if (wordEnd2 == -1) {
+						startBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
-						int lineStart1 = previousIndexOfChar (text, "\n", offset);
-						if (lineStart1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = lineStart1 + 1;
-						startBounds = previousIndexOfChar (text, "\n", lineStart1) + 1;
+					startBounds = previousIndexOfNotChar (text, " \n", wordEnd2 + 1) + 1;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_START: {
+					int sentenceStart1 = previousIndexOfChar (text, "!?.", offset);
+					if (sentenceStart1 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
-					case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
-						int lineEnd1 = previousIndexOfChar (text, "\n", offset);
-						if (lineEnd1 == -1) {
-							startBounds = endBounds = 0;
-							break;
-						}
-						endBounds = lineEnd1;
-						startBounds = previousIndexOfChar (text, "\n", lineEnd1);
-						if (startBounds == -1) startBounds = 0;
+					int sentenceStart2 = previousIndexOfNotChar (text, "!?.", sentenceStart1);
+					if (sentenceStart2 == -1) {
+						startBounds = endBounds = 0;
 						break;
 					}
+					endBounds = sentenceStart1 + 1;
+					startBounds = previousIndexOfChar (text, "!?.", sentenceStart2) + 1;
+					break;
 				}
-				OS.memmove (start_offset, new int[] {startBounds}, 4);
-				OS.memmove (end_offset, new int[] {endBounds}, 4);
-				text = text.substring (startBounds, endBounds);
+				case ATK.ATK_TEXT_BOUNDARY_SENTENCE_END: {
+					int sentenceEnd1 = previousIndexOfChar (text, "!?.", offset);
+					if (sentenceEnd1 == -1) {
+						startBounds = endBounds = 0;
+						break;
+					}
+					sentenceEnd1 = previousIndexOfNotChar (text, " \n", sentenceEnd1 + 1);
+					if (sentenceEnd1 == -1) {
+						startBounds = endBounds = 0;
+						break;
+					}
+					endBounds = sentenceEnd1 + 1;
+					int sentenceEnd2 = previousIndexOfNotChar (text, "!?.", endBounds);
+					sentenceEnd2 = previousIndexOfChar (text, "!?.", sentenceEnd2);
+					if (sentenceEnd2 == -1) {
+						startBounds = 0;
+						break;
+					}
+					startBounds = previousIndexOfNotChar (text, " \n", sentenceEnd2 + 1) + 1;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_LINE_START: {
+					int lineStart1 = previousIndexOfChar (text, "\n", offset);
+					if (lineStart1 == -1) {
+						startBounds = endBounds = 0;
+						break;
+					}
+					endBounds = lineStart1 + 1;
+					startBounds = previousIndexOfChar (text, "\n", lineStart1) + 1;
+					break;
+				}
+				case ATK.ATK_TEXT_BOUNDARY_LINE_END: {
+					int lineEnd1 = previousIndexOfChar (text, "\n", offset);
+					if (lineEnd1 == -1) {
+						startBounds = endBounds = 0;
+						break;
+					}
+					endBounds = lineEnd1;
+					startBounds = previousIndexOfChar (text, "\n", lineEnd1);
+					if (startBounds == -1) startBounds = 0;
+					break;
+				}
+			}
+			OS.memmove (start_offset, new int[] {startBounds}, 4);
+			OS.memmove (end_offset, new int[] {endBounds}, 4);
+			text = text.substring (startBounds, endBounds);
 				return getStringPtr (text);
 			}
 		}
@@ -3279,15 +3279,15 @@
 			Vector listeners = accessible.accessibleValueListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleValueEvent event = new AccessibleValueEvent(accessible);
-				event.value = getGValue(value);
+			AccessibleValueEvent event = new AccessibleValueEvent(accessible);
+			event.value = getGValue(value);
 				for (int i = 0; i < length; i++) {
-					AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
-					listener.getCurrentValue(event);
-				}
-				setGValue(value, event.value);
+				AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
+				listener.getCurrentValue(event);
 			}
+			setGValue(value, event.value);
 		}
+		}
 		return 0;
 	}
 
@@ -3303,15 +3303,15 @@
 			Vector listeners = accessible.accessibleValueListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleValueEvent event = new AccessibleValueEvent(accessible);
-				event.value = getGValue(value);
+			AccessibleValueEvent event = new AccessibleValueEvent(accessible);
+			event.value = getGValue(value);
 				for (int i = 0; i < length; i++) {
-					AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
-					listener.getMaximumValue(event);
-				}
-				setGValue(value, event.value);
+				AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
+				listener.getMaximumValue(event);
 			}
+			setGValue(value, event.value);
 		}
+		}
 		return 0;
 	}
 
@@ -3327,14 +3327,14 @@
 			Vector listeners = accessible.accessibleValueListeners;
 			int length = listeners.size();
 			if (length > 0) {
-				AccessibleValueEvent event = new AccessibleValueEvent(accessible);
-				event.value = getGValue(value);
+			AccessibleValueEvent event = new AccessibleValueEvent(accessible);
+			event.value = getGValue(value);
 				for (int i = 0; i < length; i++) {
-					AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
-					listener.getMinimumValue(event);
-				}
-				setGValue(value, event.value);
+				AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
+				listener.getMinimumValue(event);
 			}
+			setGValue(value, event.value);
+		} 
 		}
 		return 0;
 	}
@@ -3344,15 +3344,15 @@
 		AccessibleObject object = getAccessibleObject (atkObject);
 		if (object != null) {
 			Accessible accessible = object.accessible;
-			Vector listeners = accessible.accessibleValueListeners;
-			int length = listeners.size();
-			if (length > 0) {
-				AccessibleValueEvent event = new AccessibleValueEvent(accessible);
-				event.value = getGValue(value);
-				for (int i = 0; i < length; i++) {
-					AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
-					listener.setCurrentValue(event);
-				}
+				Vector listeners = accessible.accessibleValueListeners;
+				int length = listeners.size();
+				if (length > 0) {
+					AccessibleValueEvent event = new AccessibleValueEvent(accessible);
+					event.value = getGValue(value);
+					for (int i = 0; i < length; i++) {
+						AccessibleValueListener listener = (AccessibleValueListener) listeners.elementAt(i);
+						listener.setCurrentValue(event);
+					}
 				return event.value != null ? 1 : 0;
 			}
 		}
@@ -3394,27 +3394,27 @@
 		Vector listeners = accessible.accessibleControlListeners;
 		int length = listeners.size();
 		if (length > 0) {
-			String parentText = "";	//$NON-NLS-1$
-			AtkTextIface iface = getTextIface (handle);
-			if (iface != null && iface.get_character_count != 0) {
-				int /*long*/ characterCount = ATK.call (iface.get_character_count, handle);
-				if (characterCount > 0 && iface.get_text != 0) {
+		String parentText = "";	//$NON-NLS-1$
+		AtkTextIface iface = getTextIface (handle);
+		if (iface != null && iface.get_character_count != 0) {
+			int /*long*/ characterCount = ATK.call (iface.get_character_count, handle);
+			if (characterCount > 0 && iface.get_text != 0) {
 					int /*long*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount);
-					if (parentResult != 0) {
-						parentText = getString (parentResult);
-						OS.g_free(parentResult);
-					}
+				if (parentResult != 0) {
+					parentText = getString (parentResult);
+					OS.g_free(parentResult);
 				}
 			}
-			AccessibleControlEvent event = new AccessibleControlEvent (accessible);
-			event.childID = id;
-			event.result = parentText;
+		}
+		AccessibleControlEvent event = new AccessibleControlEvent (accessible);
+		event.childID = id;
+		event.result = parentText;
 			for (int i = 0; i < length; i++) {
 				AccessibleControlListener listener = (AccessibleControlListener)listeners.elementAt (i);
 				listener.getValue (event);				
-			}
-			return event.result;
 		}
+		return event.result;
+	}
 		return null;
 	}
 
@@ -3431,7 +3431,7 @@
 		}
 		return 0;
 	}
-
+	
 	static int toATKRelation (int relation) {
 		switch (relation) {
 			case ACC.RELATION_CONTROLLED_BY: return ATK.ATK_RELATION_CONTROLLED_BY;
@@ -3509,7 +3509,7 @@
 		}
 		return index;
 	}
-	
+
 	void addRelation (int type, Accessible target) {
 		OS.atk_object_add_relationship(handle, toATKRelation(type), target.getAccessibleObject().handle);
 	}
@@ -3752,7 +3752,7 @@
 			ATK.atk_object_notify_state_change(accObject.handle, ATK.ATK_STATE_FOCUSED, true);
 		}
 	}
-	
+
 	void textCaretMoved(int index) {
 		OS.g_signal_emit_by_name (handle, ATK.text_caret_moved, index);
 	}
@@ -3768,7 +3768,7 @@
 	void textSelectionChanged() {
 		OS.g_signal_emit_by_name (handle, ATK.text_selection_changed);
 	}
-	
+
 	void updateChildren () {
 		Vector listeners = accessible.accessibleControlListeners;
 		int length = listeners.size();
@@ -3799,22 +3799,22 @@
 						object = event.accessible.getAccessibleObject();
 						if (object != null)	OS.g_object_ref(object.handle);
 					} else {
-						object = AccessibleFactory.createChildAccessible (accessible, id);
+					object = AccessibleFactory.createChildAccessible (accessible, id);
 					}
 					object.id = id;
 				} else {
 					OS.g_object_ref(object.handle);
-				}
+					}
 			} else if (child instanceof Accessible) {
 				object = ((Accessible)child).getAccessibleObject();
 				if (object != null)	OS.g_object_ref(object.handle);
-			}
-			if (object != null) {
+					}
+					if (object != null) {
 				object.index = i;
 				object.parent = this;
 				newChildren[i] = object;
-			}
-		}
+					}
+				}
 		if (oldChildren != null) {
 			for (int i = 0; i < oldChildren.length; i++) {
 				AccessibleObject object = oldChildren [i];
Index: org/eclipse/swt/accessibility/AccessibleFactory.java
===================================================================
--- org/eclipse/swt/accessibility/AccessibleFactory.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/accessibility/AccessibleFactory.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -308,7 +308,7 @@
 		OS.memmove (buffer, typeName, widgetTypeNameLength);
 		return new String(Converter.mbcsToWcs(null, buffer));
 	}
-	
+
 	static int /*long*/ getParentType (int /*long*/ widgetType) {
 		LONG type = null;
 		while (widgetType != 0 && (type = (LONG)Factories.get(new LONG(widgetType))) == null) {
@@ -347,7 +347,7 @@
 		int /*long*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId);
 		return new AccessibleObject(childType, 0, accessible, true);
 	}
-	
+
 	static void createAccessible (Accessible accessible) {
 		int /*long*/ controlHandle = accessible.getControlHandle ();
 		OS.gtk_widget_get_accessible(controlHandle);
Index: org/eclipse/swt/accessibility/Accessible.java
===================================================================
--- org/eclipse/swt/accessibility/Accessible.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/accessibility/Accessible.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -94,7 +94,7 @@
 		if (parent.children == null) parent.children = new Vector();
 		parent.children.addElement(this);
 	}
-
+	
 	/**
 	 * @since 3.5
 	 * @deprecated
@@ -439,7 +439,7 @@
 		parent.children.removeElement(this);
 		parent = null;
 	}
-
+	
 	/**
 	 * Returns the control for this Accessible object. 
 	 *
@@ -455,7 +455,7 @@
 		if (!isValidThread ()) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
 		if (control.isDisposed ()) SWT.error (SWT.ERROR_WIDGET_DISPOSED);
 	}
-	
+
 	AccessibleObject getAccessibleObject () {
 		if (accessibleObject == null) {
 			if (parent == null) {
@@ -830,7 +830,7 @@
 		relations.remove(index);
 		if (accessibleObject != null) accessibleObject.removeRelation(type, target);
 	}
-
+	
 	/**
 	 * Sends a message with event-specific data to accessible clients
 	 * indicating that something has changed within a custom control.
Index: org/eclipse/swt/printing/Printer.java
===================================================================
--- org/eclipse/swt/printing/Printer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/printing/Printer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -74,7 +74,7 @@
 		OS.g_thread_init (0);
 	}
 	if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) {
-	    OS.gtk_set_locale();
+	OS.gtk_set_locale();
 	}
 	if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
@@ -438,8 +438,8 @@
 	if (OS.USE_CAIRO) {
 		gc = cairo;
 	} else {
-		GdkVisual visual = new GdkVisual ();
-		OS.memmove (visual, OS.gdk_visual_get_system());
+	GdkVisual visual = new GdkVisual ();
+	OS.memmove (visual, OS.gdk_visual_get_system());
 		drawable = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), 1, 1, visual.depth);
 		gc = OS.gdk_gc_new (drawable);
 	}
@@ -812,8 +812,8 @@
 		byte [] uri = uriFromFilename(data.fileName);
 		if (uri != null) {
 			OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
-		}
 	}
+	}
 	OS.gtk_print_settings_set_n_copies(settings, data.copyCount);
 	OS.gtk_print_settings_set_collate(settings, data.collate);
 	if (data.duplex != SWT.DEFAULT) {
Index: org/eclipse/swt/printing/PrintDialog.java
===================================================================
--- org/eclipse/swt/printing/PrintDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/printing/PrintDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -308,9 +308,9 @@
 		int /*long*/ settings = OS.gtk_print_settings_new();
 		int /*long*/ page_setup = OS.gtk_page_setup_new();
 		
-		if (printerData.otherData != null) {
-			Printer.restore(printerData.otherData, settings, page_setup);
-		}
+			if (printerData.otherData != null) {
+				Printer.restore(printerData.otherData, settings, page_setup);
+			}
 		
 		/* Set values of print_settings and page_setup from PrinterData. */
 		String printerName = printerData.name;
@@ -349,8 +349,8 @@
 			byte [] uri = Printer.uriFromFilename(printerData.fileName);
 			if (uri != null) {
 				OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
-			}
 		}
+		}
 		OS.gtk_print_settings_set_n_copies(settings, printerData.copyCount);
 		OS.gtk_print_settings_set_collate(settings, printerData.collate);
 		/* 
@@ -377,8 +377,8 @@
 		}
 		OS.g_object_unref(settings);
 		OS.g_object_unref(page_setup);
-		int /*long*/ group = OS.gtk_window_get_group(0);
-		OS.gtk_window_group_add_window (group, handle);
+			int /*long*/ group = OS.gtk_window_get_group(0);
+			OS.gtk_window_group_add_window (group, handle);
 		OS.gtk_window_set_modal(handle, true);
 		PrinterData data = null;
 		//TODO: Handle 'Print Preview' (GTK_RESPONSE_APPLY).
Index: org/eclipse/swt/printing/PrinterData.java
===================================================================
--- org/eclipse/swt/printing/PrinterData.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/printing/PrinterData.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -155,7 +155,7 @@
 	 * the current selection should be printed
 	 */	
 	public static final int SELECTION = 2;
-		
+	
 	/**
 	 * <code>orientation</code> field value indicating
 	 * portrait paper orientation
@@ -172,7 +172,7 @@
 	 */
 	public static final int LANDSCAPE = 2;
 	
- 	/**
+	/**
 	 * <code>duplex</code> field value indicating
 	 * single-sided printing.
 	 * <p>
Index: org/eclipse/swt/SWT.java
===================================================================
--- org/eclipse/swt/SWT.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/SWT.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt;
 
@@ -34,9 +35,9 @@
  *
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
- 
+
 /* NOTE:
- *   Good javadoc coding style is to put the values of static final 
+ *   Good javadoc coding style is to put the values of static final
  *   constants in the comments. This reinforces the fact that
  *   consumers are allowed to rely on the value (and they must
  *   since the values are compiled inline in their code). We
@@ -44,23 +45,23 @@
  *   releases.
  */
 public class SWT {
-	
+
 	/* Widget Event Constants */
-	
+
 	/**
 	 * The null event type (value is 0).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int None = 0;
-	
+
 	/**
 	 * The key down event type (value is 1).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addKeyListener
 	 * @see org.eclipse.swt.widgets.Tracker#addKeyListener
 	 * @see org.eclipse.swt.events.KeyListener#keyPressed
@@ -67,14 +68,14 @@
 	 * @see org.eclipse.swt.events.KeyEvent
 	 */
 	public static final int KeyDown = 1;
-	
+
 	/**
 	 * The key up event type (value is 2).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addKeyListener
 	 * @see org.eclipse.swt.widgets.Tracker#addKeyListener
 	 * @see org.eclipse.swt.events.KeyListener#keyReleased
@@ -81,105 +82,105 @@
 	 * @see org.eclipse.swt.events.KeyEvent
 	 */
 	public static final int KeyUp = 2;
-	
+
 	/**
 	 * The mouse down event type (value is 3).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseListener
 	 * @see org.eclipse.swt.events.MouseListener#mouseDown
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
 	public static final int MouseDown = 3;
-	
+
 	/**
 	 * The mouse up event type (value is 4).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseListener
 	 * @see org.eclipse.swt.events.MouseListener#mouseUp
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
 	public static final int MouseUp = 4;
-	
+
 	/**
 	 * The mouse move event type (value is 5).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseMoveListener
 	 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
 	public static final int MouseMove = 5;
-	
+
 	/**
 	 * The mouse enter event type (value is 6).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseTrackListener
 	 * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
-	public static final int MouseEnter = 6;		
-	
+	public static final int MouseEnter = 6;
+
 	/**
 	 * The mouse exit event type (value is 7).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseTrackListener
 	 * @see org.eclipse.swt.events.MouseTrackListener#mouseExit
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
 	public static final int MouseExit = 7;
-	
+
 	/**
 	 * The mouse double click event type (value is 8).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseListener
 	 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick
 	 * @see org.eclipse.swt.events.MouseEvent
 	 */
-	public static final int MouseDoubleClick = 8;	
-	
+	public static final int MouseDoubleClick = 8;
+
 	/**
 	 * The paint event type (value is 9).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addPaintListener
 	 * @see org.eclipse.swt.events.PaintListener#paintControl
 	 * @see org.eclipse.swt.events.PaintEvent
 	 */
-	public static final int Paint = 9;	
-	
+	public static final int Paint = 9;
+
 	/**
 	 * The move event type (value is 10).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addControlListener
 	 * @see org.eclipse.swt.widgets.TableColumn#addControlListener
 	 * @see org.eclipse.swt.widgets.Tracker#addControlListener
@@ -188,14 +189,14 @@
 	 * @see org.eclipse.swt.events.ControlEvent
 	 */
 	public static final int Move = 10;
-	
+
 	/**
 	 * The resize event type (value is 11).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addControlListener
 	 * @see org.eclipse.swt.widgets.TableColumn#addControlListener
 	 * @see org.eclipse.swt.widgets.Tracker#addControlListener
@@ -204,28 +205,28 @@
 	 * @see org.eclipse.swt.events.ControlEvent
 	 */
 	public static final int Resize = 11;
-	
+
 	/**
 	 * The dispose event type (value is 12).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addDisposeListener
 	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed
 	 * @see org.eclipse.swt.events.DisposeEvent
 	 */
 	public static final int Dispose = 12;
-	
+
 	/**
 	 * The selection event type (value is 13).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Button#addSelectionListener
 	 * @see org.eclipse.swt.widgets.Combo#addSelectionListener
 	 * @see org.eclipse.swt.widgets.CoolItem#addSelectionListener
@@ -247,14 +248,14 @@
 	 * @see org.eclipse.swt.events.SelectionEvent
 	 */
 	public static final int Selection = 13;
-	
+
 	/**
 	 * The default selection event type (value is 14).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Combo#addSelectionListener
 	 * @see org.eclipse.swt.widgets.List#addSelectionListener
 	 * @see org.eclipse.swt.widgets.Spinner#addSelectionListener
@@ -266,132 +267,132 @@
 	 * @see org.eclipse.swt.events.SelectionEvent
 	 */
 	public static final int DefaultSelection = 14;
-	
+
 	/**
 	 * The focus in event type (value is 15).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addFocusListener
 	 * @see org.eclipse.swt.events.FocusListener#focusGained
 	 * @see org.eclipse.swt.events.FocusEvent
 	 */
 	public static final int FocusIn = 15;
-	
+
 	/**
 	 * The focus out event type (value is 16).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addFocusListener
 	 * @see org.eclipse.swt.events.FocusListener#focusLost
 	 * @see org.eclipse.swt.events.FocusEvent
 	 */
 	public static final int FocusOut = 16;
-	
+
 	/**
 	 * The expand event type (value is 17).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Tree#addTreeListener
 	 * @see org.eclipse.swt.events.TreeListener#treeExpanded
 	 * @see org.eclipse.swt.events.TreeEvent
 	 */
 	public static final int Expand = 17;
-	
+
 	/**
 	 * The collapse event type (value is 18).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Tree#addTreeListener
 	 * @see org.eclipse.swt.events.TreeListener#treeCollapsed
 	 * @see org.eclipse.swt.events.TreeEvent
 	 */
 	public static final int Collapse = 18;
-	
+
 	/**
 	 * The iconify event type (value is 19).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Shell#addShellListener
 	 * @see org.eclipse.swt.events.ShellListener#shellIconified
 	 * @see org.eclipse.swt.events.ShellEvent
 	 */
 	public static final int Iconify = 19;
-	
+
 	/**
 	 * The de-iconify event type (value is 20).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Shell#addShellListener
 	 * @see org.eclipse.swt.events.ShellListener#shellDeiconified
 	 * @see org.eclipse.swt.events.ShellEvent
 	 */
 	public static final int Deiconify = 20;
-	
+
 	/**
 	 * The close event type (value is 21).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Shell#addShellListener
 	 * @see org.eclipse.swt.events.ShellListener#shellClosed
 	 * @see org.eclipse.swt.events.ShellEvent
 	 */
 	public static final int Close = 21;
-	
+
 	/**
 	 * The show event type (value is 22).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Menu#addMenuListener
 	 * @see org.eclipse.swt.events.MenuListener#menuShown
 	 * @see org.eclipse.swt.events.MenuEvent
 	 */
 	public static final int Show = 22;
-	
+
 	/**
 	 * The hide event type (value is 23).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Menu#addMenuListener
 	 * @see org.eclipse.swt.events.MenuListener#menuHidden
 	 * @see org.eclipse.swt.events.MenuEvent
 	 */
 	public static final int Hide = 23;
-	
+
 	/**
 	 * The modify event type (value is 24).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Combo#addModifyListener
 	 * @see org.eclipse.swt.widgets.Spinner#addModifyListener
 	 * @see org.eclipse.swt.widgets.Text#addModifyListener
@@ -399,14 +400,14 @@
 	 * @see org.eclipse.swt.events.ModifyEvent
 	 */
 	public static final int Modify = 24;
-	
+
 	/**
 	 * The verify event type (value is 25).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.custom.CCombo#addVerifyListener
 	 * @see org.eclipse.swt.widgets.Combo#addVerifyListener
 	 * @see org.eclipse.swt.custom.StyledText#addVerifyListener
@@ -415,40 +416,40 @@
 	 * @see org.eclipse.swt.events.VerifyEvent
 	 */
 	public static final int Verify = 25;
-	
+
 	/**
 	 * The activate event type (value is 26).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Shell#addShellListener
 	 * @see org.eclipse.swt.events.ShellListener#shellActivated
 	 * @see org.eclipse.swt.events.ShellEvent
 	 */
 	public static final int Activate = 26;
-	
+
 	/**
 	 * The deactivate event type (value is 27).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Shell#addShellListener
 	 * @see org.eclipse.swt.events.ShellListener#shellDeactivated
 	 * @see org.eclipse.swt.events.ShellEvent
 	 */
-	public static final int Deactivate = 27;	
-	
+	public static final int Deactivate = 27;
+
 	/**
 	 * The help event type (value is 28).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addHelpListener
 	 * @see org.eclipse.swt.widgets.Menu#addHelpListener
 	 * @see org.eclipse.swt.widgets.MenuItem#addHelpListener
@@ -456,14 +457,14 @@
 	 * @see org.eclipse.swt.events.HelpEvent
 	 */
 	public static final int Help = 28;
-	
+
 	/**
 	 * The drag detect event type (value is 29).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addDragDetectListener
 	 * @see org.eclipse.swt.events.DragDetectListener#dragDetected
 	 * @see org.eclipse.swt.events.DragDetectEvent
@@ -470,40 +471,40 @@
 	 * @see org.eclipse.swt.dnd.DragSource
 	 */
 	public static final int DragDetect = 29;
-	
+
 	/**
 	 * The arm event type (value is 30).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.MenuItem#addArmListener
 	 * @see org.eclipse.swt.events.ArmListener#widgetArmed
 	 * @see org.eclipse.swt.events.ArmEvent
 	 */
 	public static final int Arm = 30;
-	
+
 	/**
 	 * The traverse event type (value is 31).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addTraverseListener
 	 * @see org.eclipse.swt.events.TraverseListener#keyTraversed
 	 * @see org.eclipse.swt.events.TraverseEvent
 	 */
 	public static final int Traverse = 31;
-	
+
 	/**
 	 * The mouse hover event type (value is 32).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseTrackListener
 	 * @see org.eclipse.swt.events.MouseTrackListener#mouseHover
 	 * @see org.eclipse.swt.events.MouseEvent
@@ -512,16 +513,16 @@
 
 	/**
 	 * The hardware key down event type (value is 33).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
 	 */
 	public static final int HardKeyDown = 33;
-	
+
 	/**
 	 * The hardware key up event type (value is 34).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
@@ -530,11 +531,11 @@
 
 	/**
 	 * The menu detect event type (value is 35).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMenuDetectListener
 	 * @see org.eclipse.swt.widgets.TrayItem#addMenuDetectListener
 	 * @see org.eclipse.swt.events.MenuDetectListener#menuDetected
@@ -543,17 +544,17 @@
 	 * @since 3.0
 	 */
 	public static final int MenuDetect = 35;
-	
+
 	/**
 	 * The set data event type (value is 36).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Table
 	 * @see org.eclipse.swt.widgets.Tree
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int SetData = 36;
@@ -585,11 +586,11 @@
 	 * This is a synonym for {@link #MouseVerticalWheel} (value is 37).  
 	 * Newer applications should use {@link #MouseVerticalWheel} instead 
 	 * of {@link #MouseWheel} to make code more understandable.
-	 *  
+	 *
 	 * @see org.eclipse.swt.widgets.Control#addMouseWheelListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int MouseWheel = MouseVerticalWheel;
@@ -607,55 +608,55 @@
 	 * cached value.  The operating system automatically redraws and
 	 * lays out all widgets after this event is sent.
 	 * </p>
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Display#addListener
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.2
 	 */
 	public static final int Settings = 39;
-	
+
 	/**
 	 * The erase item event type (value is 40).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.2
 	 */
 	public static final int EraseItem = 40;
-	
+
 	/**
 	 * The measure item event type (value is 41).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.2
 	 */
 	public static final int MeasureItem = 41;
-	
+
 	/**
 	 * The paint item event type (value is 42).
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.2
 	 */
-	public static final int PaintItem = 42;	
-	
+	public static final int PaintItem = 42;
+
 	/**
-	 * The IME composition event type (value is 43).  
+	 * The IME composition event type (value is 43).
 	 * <p>
 	 * The IME composition event is sent to allow
 	 * custom text editors to implement in-line
-	 * editing of international text. 
-	 * </p> 
-	 * 
+	 * editing of international text.
+	 * </p>
+	 *
 	 * The detail field indicates the action to be taken:
 	 * <p><ul>
 	 * <li>{@link SWT#COMPOSITION_CHANGED}</li>
@@ -662,11 +663,11 @@
 	 * <li>{@link SWT#COMPOSITION_OFFSET}</li>
 	 * <li>{@link SWT#COMPOSITION_SELECTION}</li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @see org.eclipse.swt.widgets.Widget#addListener
 	 * @see org.eclipse.swt.widgets.Display#addFilter
 	 * @see org.eclipse.swt.widgets.Event
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int ImeComposition = 43;
@@ -772,47 +773,47 @@
 	public static final int Segments = 49;
 
 	/* Event Details */
-	
+
 	/**
 	 * The IME composition event detail that indicates
 	 * a change in the IME composition. The text field
-	 * of the event is the new composition text. 
+	 * of the event is the new composition text.
 	 * The start and end indicate the offsets where the
 	 * composition text should be inserted.
-	 * The styles and ranges are stored in the IME 
+	 * The styles and ranges are stored in the IME
 	 * object (value is 1).
-	 * 
+	 *
 	 * @see SWT#ImeComposition
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int COMPOSITION_CHANGED = 1;
-	
+
 	/**
 	 * The IME composition event detail that indicates
 	 * that the IME needs the offset for a given location.
-	 * The x and y fields of the event are used by the 
+	 * The x and y fields of the event are used by the
 	 * application to determine the offset.
-	 * 
-	 * The index field of the event should be set to the 
-	 * text offset at that location. The count field should 
+	 *
+	 * The index field of the event should be set to the
+	 * text offset at that location. The count field should
 	 * be set to indicate whether the location is closer to
 	 * the leading edge (0) or the trailing edge (1) (value is 2).
-	 * 
+	 *
 	 * @see SWT#ImeComposition
 	 * @see org.eclipse.swt.graphics.TextLayout#getOffset(int, int, int[])
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int COMPOSITION_OFFSET = 2;
-	
+
 	/**
 	 * The IME composition event detail that indicates
 	 * that IME needs the selected text and its start
 	 * and end offsets (value is 3).
-	 * 
+	 *
 	 * @see SWT#ImeComposition
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int COMPOSITION_SELECTION = 3;
@@ -822,7 +823,7 @@
 	 * for example dragging the thumb of a scroll bar (value is 1).
 	 */
 	public static final int DRAG = 1;
-	
+
 	/**
 	 * Event detail field that indicates a user-interface component
 	 * state is selected (value is 1&lt;&lt;1).
@@ -830,15 +831,15 @@
 	 * @since 3.2
 	 */
 	public static final int SELECTED = 1 << 1;
-	
+
 	/**
 	 * Event detail field that indicates a user-interface component
 	 * state is focused (value is 1&lt;&lt;2).
 	 *
 	 * @since 3.2
-	 */	
+	 */
 	public static final int FOCUSED = 1 << 2;
-	
+
 	/**
 	 * Event detail field that indicates a user-interface component
 	 * draws the background (value is 1&lt;&lt;3).
@@ -846,7 +847,7 @@
 	 * @since 3.2
 	 */
 	public static final int BACKGROUND = 1 << 3;
-	
+
 	/**
 	 * Event detail field that indicates a user-interface component
 	 * draws the foreground (value is 1&lt;&lt;4).
@@ -854,7 +855,7 @@
 	 * @since 3.2
 	 */
 	public static final int FOREGROUND = 1 << 4;
-	
+
 	/**
 	 * Event detail field that indicates a user-interface component
 	 * state is hot (value is 1&lt;&lt;5).
@@ -862,7 +863,7 @@
 	 * @since 3.3
 	 */
 	public static final int HOT = 1 << 5;
-	
+
 	/* This code is intentionally commented */
 	//public static final int PRESSED = 1 << 3;
 	//public static final int ACTIVE = 1 << 4;
@@ -871,14 +872,14 @@
 	//public static final int DEFAULTED = 1 << 7;
 
 	/**
-	 * Traversal event detail field value indicating that no 
+	 * Traversal event detail field value indicating that no
 	 * traversal action should be taken
 	 * (value is 0).
 	 */
 	public static final int TRAVERSE_NONE = 0;
-	
+
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that a dialog should be cancelled was
 	 * pressed; typically, this is the ESC key
 	 * (value is 1&lt;&lt;1).
@@ -894,7 +895,7 @@
 	public static final int TRAVERSE_RETURN = 1 << 2;
 
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that focus should be given to the
 	 * previous tab group was pressed; typically, this is the
 	 * SHIFT-TAB key sequence
@@ -903,7 +904,7 @@
 	public static final int TRAVERSE_TAB_PREVIOUS = 1 << 3;
 
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that focus should be given to the
 	 * next tab group was pressed; typically, this is the
 	 * TAB key
@@ -912,7 +913,7 @@
 	public static final int TRAVERSE_TAB_NEXT = 1 << 4;
 
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that focus should be given to the
 	 * previous tab item was pressed; typically, this is either
 	 * the LEFT-ARROW or UP-ARROW keys
@@ -921,7 +922,7 @@
 	public static final int TRAVERSE_ARROW_PREVIOUS = 1 << 5;
 
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that focus should be given to the
 	 * previous tab item was pressed; typically, this is either
 	 * the RIGHT-ARROW or DOWN-ARROW keys
@@ -930,7 +931,7 @@
 	public static final int TRAVERSE_ARROW_NEXT = 1 << 6;
 
 	/**
-	 * Traversal event detail field value indicating that a 
+	 * Traversal event detail field value indicating that a
 	 * mnemonic key sequence was pressed
 	 * (value is 1&lt;&lt;7).
 	 */
@@ -937,7 +938,7 @@
 	public static final int TRAVERSE_MNEMONIC = 1 << 7;
 
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that the previous page of a multi-page
 	 * window should be shown was pressed; typically, this
 	 * is the CTRL-PAGEUP key sequence
@@ -944,9 +945,9 @@
 	 * (value is 1&lt;&lt;8).
 	 */
 	public static final int TRAVERSE_PAGE_PREVIOUS = 1 << 8;
-	
+
 	/**
-	 * Traversal event detail field value indicating that the 
+	 * Traversal event detail field value indicating that the
 	 * key which designates that the next page of a multi-page
 	 * window should be shown was pressed; typically, this
 	 * is the CTRL-PAGEDOWN key sequence
@@ -1079,13 +1080,13 @@
 	 * which take bit flags to indicate that "no bits are set".
 	 */
 	public static final int NONE = 0;
-	
+
 	/**
 	 * A constant known to be zero (0), used in operations which
 	 * take pointers to indicate a null argument.
 	 */
 	public static final int NULL = 0;
-	
+
 	/**
 	 * Indicates that a default should be used (value is -1).
 	 */
@@ -1093,14 +1094,14 @@
 
 	/**
 	 * Indicates that a property is off (value is 0).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int OFF = 0;
-	
+
 	/**
 	 * Indicates that a property is on (value is 1).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int ON = 1;
@@ -1107,7 +1108,7 @@
 
 	/**
 	 * Indicates low quality (value is 1).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int LOW = 1;
@@ -1114,7 +1115,7 @@
 
 	/**
 	 * Indicates high quality (value is 2).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int HIGH = 2;
@@ -1157,7 +1158,7 @@
 	 */
 	public static final int SEPARATOR = 1 << 1;
 
-    /**
+	/**
      * Constant representing a flexible space separator in a ToolBar.
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>ToolItem.setWidth()</code></li>
@@ -1274,7 +1275,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Text</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int SEARCH = 1 << 7;
@@ -1293,11 +1294,11 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Text</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int PASSWORD = 1 << 22;
-	
+
 	/**
 	 * Style constant for shadow in behavior (value is 1&lt;&lt;2).
 	 * <br>Note that this is a <em>HINT</em>.
@@ -1354,7 +1355,7 @@
 	 * </ul></p>
 	 */
 	public static final int INDETERMINATE = 1 << 1;
-	
+
 	/**
 	 * Style constant for tool window behavior (value is 1&lt;&lt;2).
 	 * <p>
@@ -1366,7 +1367,7 @@
 	 * <li><code>Decorations</code> and subclasses</li>
 	 * </ul></p>
 	 */
-	public static final int TOOL = 1 << 2; 
+	public static final int TOOL = 1 << 2;
 
 	/**
 	 * Style constant to ensure no trimmings are used (value is 1&lt;&lt;3).
@@ -1376,7 +1377,7 @@
 	 * </ul></p>
 	 */
 	public static final int NO_TRIM = 1 << 3;
-	
+
 	/**
 	 * Style constant for resize box trim (value is 1&lt;&lt;4).
 	 * <p><b>Used By:</b><ul>
@@ -1478,7 +1479,7 @@
 	 * <li><code>Control</code> and subclasses</li>
 	 * </ul></p>
 	 */
-	public static final int CLIP_CHILDREN = 1 << 12; 
+	public static final int CLIP_CHILDREN = 1 << 12;
 
 	/**
 	 * Style constant indicating that the window manager should clip
@@ -1498,7 +1499,7 @@
 	 * </ul></p>
 	 */
 	public static final int ON_TOP = 1 << 14;
-	
+
 	/**
 	 * Style constant for sheet window behavior (value is 1&lt;&lt;28).
 	 * <p>
@@ -1586,8 +1587,8 @@
 	public static final int HIDE_SELECTION = 1 << 15;
 
 	/**
-	 * Style constant for full row selection behavior and 
-	 * selection constant indicating that a full line should be 
+	 * Style constant for full row selection behavior and
+	 * selection constant indicating that a full line should be
 	 * drawn. (value is 1&lt;&lt;16).
 	 * <br>Note that for some widgets this is a <em>HINT</em>.
 	 * <p><b>Used By:</b><ul>
@@ -1594,7 +1595,7 @@
 	 * <li><code>Table</code></li>
 	 * <li><code>Tree</code></li>
 	 * <li><code>StyledText</code></li>
-	 * <li><code>TextLayout</code></li> 
+	 * <li><code>TextLayout</code></li>
 	 * </ul></p>
 	 */
 	public static final int FULL_SELECTION = 1 << 16;
@@ -1684,7 +1685,7 @@
 	 * </ul></p>
 	 */
 	public static final int NO_RADIO_GROUP = 1 << 22;
-	
+
 	/**
 	 * Style constant for left to right orientation (value is 1&lt;&lt;25).
 	 * <p>
@@ -1698,13 +1699,13 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Control</code></li>
 	 * <li><code>Menu</code></li>
-	 * <li><code>GC</code></li> 
+	 * <li><code>GC</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 2.1.2
 	 */
 	public static final int LEFT_TO_RIGHT = 1 << 25;
-	
+
 	/**
 	 * Style constant for right to left orientation (value is 1&lt;&lt;26).
 	 * <p>
@@ -1718,13 +1719,13 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Control</code></li>
 	 * <li><code>Menu</code></li>
-	 * <li><code>GC</code></li> 
+	 * <li><code>GC</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 2.1.2
 	 */
 	public static final int RIGHT_TO_LEFT = 1 << 26;
-	
+
 	/**
 	 * Style constant to indicate coordinate mirroring (value is 1&lt;&lt;27).
 	 * <p><b>Used By:</b><ul>
@@ -1731,21 +1732,21 @@
 	 * <li><code>Control</code></li>
 	 * <li><code>Menu</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 2.1.2
 	 */
 	public static final int MIRRORED = 1 << 27;
-	
+
 	/**
 	 * Style constant to allow embedding (value is 1&lt;&lt;24).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Composite</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int EMBEDDED = 1 << 24;
-	
+
 	/**
 	 * Style constant to allow virtual data (value is 1&lt;&lt;28).
 	 * <p><b>Used By:</b><ul>
@@ -1752,7 +1753,7 @@
 	 * <li><code>Table</code></li>
 	 * <li><code>Tree</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int VIRTUAL = 1 << 28;
@@ -1762,11 +1763,11 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Control</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int DOUBLE_BUFFERED = 1 << 29;
-	
+
 	/**
 	 * Style constant for transparent behavior (value is 1&lt;&lt;30).
 	 * <p>
@@ -1778,11 +1779,11 @@
 	 * </ul></p>
 	 *
 	 * @since 3.4
-	 * 
+	 *
 	 * WARNING: THIS API IS UNDER CONSTRUCTION AND SHOULD NOT BE USED
 	 */
 	public static final int TRANSPARENT = 1 << 30;
-	
+
 	/**
 	 * Style constant for align up behavior (value is 1&lt;&lt;7,
 	 * since align UP and align TOP are considered the same).
@@ -1794,13 +1795,13 @@
 	 * </ul></p>
 	 */
 	public static final int UP = 1 << 7;
-	
+
 	/**
 	 * Style constant to indicate single underline (value is 0).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int UNDERLINE_SINGLE = 0;
@@ -1810,31 +1811,31 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int UNDERLINE_DOUBLE = 1;
-	
+
 	/**
 	 * Style constant to indicate error underline (value is 2).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int UNDERLINE_ERROR = 2;
-	
+
 	/**
 	 * Style constant to indicate squiggle underline (value is 3).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int UNDERLINE_SQUIGGLE = 3;
-	
+
 	/**
 	 * Style constant to indicate link underline (value is 0).
 	 * <p>
@@ -1858,7 +1859,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int BORDER_SOLID = 1;
@@ -1868,21 +1869,21 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int BORDER_DASH = 2;
-	
+
 	/**
 	 * Style constant to indicate dotted border (value is 4).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextStyle</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public static final int BORDER_DOT = 4;
-	
+
 	/**
 	 * Style constant for align top behavior (value is 1&lt;&lt;7,
 	 * since align UP and align TOP are considered the same).
@@ -1923,11 +1924,11 @@
 	 * <li><code>Tracker</code></li>
 	 * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 2.1.2
 	 */
 	public static final int LEAD               = 1 << 14;
-	
+
 	/**
 	 * Style constant for align left behavior (value is 1&lt;&lt;14).
 	 * This is a synonym for {@link #LEAD} (value is 1&lt;&lt;14).  Newer
@@ -1949,11 +1950,11 @@
 	 * <li><code>Tracker</code></li>
 	 * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 2.1.2
 	 */
 	public static final int TRAIL              = 1 << 17;
-		
+
 	/**
 	 * Style constant for align right behavior (value is 1&lt;&lt;17).
 	 * This is a synonym for {@link #TRAIL} (value is 1&lt;&lt;17).  Newer
@@ -2015,7 +2016,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int DATE = 1 << 5;
@@ -2025,17 +2026,17 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int TIME = 1 << 7;
-	
+
 	/**
 	 * Style constant for calendar display (value is 1&lt;&lt;10).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int CALENDAR = 1 << 10;
@@ -2050,7 +2051,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int SHORT = 1 << 15;
@@ -2065,7 +2066,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int MEDIUM = 1 << 16;
@@ -2081,7 +2082,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>DateTime</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int LONG = 1 << 28;
@@ -2093,7 +2094,7 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Browser</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int MOZILLA = 1 << 15;
@@ -2117,9 +2118,9 @@
 	 * </ul></p>
 	 *
 	 * @since 3.2
-	 */	
+	 */
 	public static final int BALLOON = 1 << 12;
-	
+
 	/**
 	 * Style constant for vertical alignment or orientation behavior (value is 1).
 	 * <p><b>Used By:</b><ul>
@@ -2127,7 +2128,7 @@
 	 * </ul></p>
 	 */
 	public static final int BEGINNING = 1;
-	
+
 	/**
 	 * Style constant for vertical alignment or orientation behavior (value is 4).
 	 * <p><b>Used By:</b><ul>
@@ -2135,7 +2136,7 @@
 	 * </ul></p>
 	 */
 	public static final int FILL = 4;
-	
+
 	/**
 	 * Input Method Editor style constant for double byte
 	 * input behavior (value is 1&lt;&lt;1).
@@ -2183,7 +2184,7 @@
 	 * (value is the <code>char</code> with value 127).
 	 */
 	public static final char DEL = 0x7F;
- 
+
 	/**
 	 * ASCII character convenience constant for the escape character
 	 * (value is the <code>char</code> with value 27).
@@ -2199,11 +2200,11 @@
 	/**
 	 * ASCII character convenience constant for the tab character
 	 * (value is the <code>char</code> '\t').
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final char TAB = '\t';
-						
+
 	/**
 	 * ASCII character convenience constant for the space character
 	 * (value is the <code>char</code> ' ').
@@ -2218,7 +2219,7 @@
 	 * (value is 1&lt;&lt;16).
 	 */
 	public static final int ALT = 1 << 16;
-					
+
 	/**
 	 * Keyboard and/or mouse event mask indicating that the SHIFT key
 	 * was pushed on the keyboard when the event was generated
@@ -2225,7 +2226,7 @@
 	 * (value is 1&lt;&lt;17).
 	 */
 	public static final int SHIFT = 1 << 17;
-					
+
 	/**
 	 * Keyboard and/or mouse event mask indicating that the CTRL key
 	 * was pushed on the keyboard when the event was generated
@@ -2244,27 +2245,27 @@
 	 * Keyboard and/or mouse event mask indicating that the COMMAND key
 	 * was pushed on the keyboard when the event was generated
 	 * (value is 1&lt;&lt;22).
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int COMMAND = 1 << 22;
-	
+
 	/**
 	 * Keyboard and/or mouse event mask indicating all possible
 	 * keyboard modifiers.
-	 * 
-	 * To allow for the future, this mask  is intended to be used in 
-	 * place of code that references  each individual keyboard mask. 
-	 *  For example, the following expression will determine whether 
-	 * any modifier is pressed and will continue to work as new modifier 
+	 *
+	 * To allow for the future, this mask  is intended to be used in
+	 * place of code that references  each individual keyboard mask.
+	 *  For example, the following expression will determine whether
+	 * any modifier is pressed and will continue to work as new modifier
 	 * masks are added.
-	 * 
+	 *
  	 * <code>(stateMask & SWT.MODIFIER_MASK) != 0</code>.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int MODIFIER_MASK;
-	
+
 	/**
 	 * Keyboard and/or mouse event mask indicating that mouse button one
 	 * was pushed when the event was generated. (value is 1&lt;&lt;19).
@@ -2286,7 +2287,7 @@
 	/**
 	 * Keyboard and/or mouse event mask indicating that mouse button four
 	 * was pushed when the event was generated. (value is 1&lt;&lt;23).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int BUTTON4 = 1 << 23;
@@ -2294,7 +2295,7 @@
 	/**
 	 * Keyboard and/or mouse event mask indicating that mouse button five
 	 * was pushed when the event was generated. (value is 1&lt;&lt;25).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int BUTTON5 = 1 << 25;
@@ -2302,35 +2303,35 @@
 	/**
 	 * Keyboard and/or mouse event mask indicating all possible
 	 * mouse buttons.
-	 * 
-	 * To allow for the future, this mask  is intended to be used 
-	 * in place of code that references each individual button mask.  
+	 *
+	 * To allow for the future, this mask  is intended to be used
+	 * in place of code that references each individual button mask.
 	 * For example, the following expression will determine whether
-	 * any button is pressed and will continue to work as new button 
+	 * any button is pressed and will continue to work as new button
 	 * masks are added.
-	 * 
+	 *
  	 * <code>(stateMask & SWT.BUTTON_MASK) != 0</code>.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int BUTTON_MASK;
-	
+
 	/**
 	 * Keyboard and/or mouse event mask indicating that the MOD1 key
 	 * was pushed on the keyboard when the event was generated.
-	 * 
+	 *
 	 * This is the primary keyboard modifier for the platform.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int MOD1;
-	
+
 	/**
 	 * Keyboard and/or mouse event mask indicating that the MOD2 key
 	 * was pushed on the keyboard when the event was generated.
-	 * 
+	 *
 	 * This is the secondary keyboard modifier for the platform.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int MOD2;
@@ -2338,7 +2339,7 @@
 	/**
 	 * Keyboard and/or mouse event mask indicating that the MOD3 key
 	 * was pushed on the keyboard when the event was generated.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int MOD3;
@@ -2346,17 +2347,17 @@
 	/**
 	 * Keyboard and/or mouse event mask indicating that the MOD4 key
 	 * was pushed on the keyboard when the event was generated.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final int MOD4;
-	
+
 	/**
 	 * Constants to indicate line scrolling (value is 1).
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Control</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int SCROLL_LINE = 1;
@@ -2366,46 +2367,46 @@
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>Control</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int SCROLL_PAGE = 2;
-	
+
 	/**
 	 * Accelerator constant used to differentiate a key code from a
 	 * unicode character.
-	 * 
+	 *
 	 * If this bit is set, then the key stroke
 	 * portion of an accelerator represents a key code.  If this bit
 	 * is not set, then the key stroke portion of an accelerator is
 	 * a unicode character.
-	 * 
+	 *
 	 * The following expression is false:
-	 * 
+	 *
 	 * <code>((SWT.MOD1 | SWT.MOD2 | 'T') & SWT.KEYCODE_BIT) != 0</code>.
-	 * 
+	 *
 	 * The following expression is true:
-	 * 
+	 *
 	 * <code>((SWT.MOD3 | SWT.F2) & SWT.KEYCODE_BIT) != 0</code>.
-	 * 
+	 *
 	 * (value is (1&lt;&lt;24))
-	 * 
+	 *
 	 * @since 2.1
-	 */	
+	 */
 	public static final int KEYCODE_BIT = (1 << 24);
 
 	/**
 	 * Accelerator constant used to extract the key stroke portion of
 	 * an accelerator.
-	 * 
+	 *
 	 * The key stroke may be a key code or a unicode
 	 * value.  If the key stroke is a key code <code>KEYCODE_BIT</code>
 	 * will be set.
-	 * 
+	 *
 	 * @since 2.1
-	 */	
+	 */
 	public static final int KEY_MASK = KEYCODE_BIT + 0xFFFF;
-	
+
 	/**
 	 * Keyboard event constant representing the UP ARROW key
 	 * (value is (1&lt;&lt;24)+1).
@@ -2465,67 +2466,67 @@
 	 * (value is (1&lt;&lt;24)+10).
 	 */
 	public static final int F1 = KEYCODE_BIT + 10;
-	
+
 	/**
 	 * Keyboard event constant representing the F2 key
 	 * (value is (1&lt;&lt;24)+11).
 	 */
 	public static final int F2 = KEYCODE_BIT + 11;
-	
+
 	/**
 	 * Keyboard event constant representing the F3 key
 	 * (value is (1&lt;&lt;24)+12).
 	 */
 	public static final int F3 = KEYCODE_BIT + 12;
-	
+
 	/**
 	 * Keyboard event constant representing the F4 key
 	 * (value is (1&lt;&lt;24)+13).
 	 */
 	public static final int F4 = KEYCODE_BIT + 13;
-	
+
 	/**
 	 * Keyboard event constant representing the F5 key
 	 * (value is (1&lt;&lt;24)+14).
 	 */
 	public static final int F5 = KEYCODE_BIT + 14;
-	
+
 	/**
 	 * Keyboard event constant representing the F6 key
 	 * (value is (1&lt;&lt;24)+15).
 	 */
 	public static final int F6 = KEYCODE_BIT + 15;
-	
+
 	/**
 	 * Keyboard event constant representing the F7 key
 	 * (value is (1&lt;&lt;24)+16).
 	 */
 	public static final int F7 = KEYCODE_BIT + 16;
-	
+
 	/**
 	 * Keyboard event constant representing the F8 key
 	 * (value is (1&lt;&lt;24)+17).
 	 */
 	public static final int F8 = KEYCODE_BIT + 17;
-	
+
 	/**
 	 * Keyboard event constant representing the F9 key
 	 * (value is (1&lt;&lt;24)+18).
 	 */
 	public static final int F9 = KEYCODE_BIT + 18;
-	
+
 	/**
 	 * Keyboard event constant representing the F10 key
 	 * (value is (1&lt;&lt;24)+19).
 	 */
 	public static final int F10 = KEYCODE_BIT + 19;
-	
+
 	/**
 	 * Keyboard event constant representing the F11 key
 	 * (value is (1&lt;&lt;24)+20).
 	 */
 	public static final int F11 = KEYCODE_BIT + 20;
-	
+
 	/**
 	 * Keyboard event constant representing the F12 key
 	 * (value is (1&lt;&lt;24)+21).
@@ -2535,27 +2536,27 @@
 	/**
 	 * Keyboard event constant representing the F13 key
 	 * (value is (1&lt;&lt;24)+22).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int F13 = KEYCODE_BIT + 22;
-	
+
 	/**
 	 * Keyboard event constant representing the F14 key
 	 * (value is (1&lt;&lt;24)+23).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int F14 = KEYCODE_BIT + 23;
-	
+
 	/**
 	 * Keyboard event constant representing the F15 key
 	 * (value is (1&lt;&lt;24)+24).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int F15 = KEYCODE_BIT + 24;
-	
+
 	/**
 	 * Keyboard event constant representing the F16 key
 	 * (value is (1&lt;&lt;25)+25).
@@ -2610,23 +2611,23 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad multiply key (value is (1&lt;&lt;24)+42).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_MULTIPLY = KEYCODE_BIT + 42;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad add key (value is (1&lt;&lt;24)+43).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_ADD = KEYCODE_BIT + 43;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad subtract key (value is (1&lt;&lt;24)+45).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_SUBTRACT = KEYCODE_BIT + 45;
@@ -2634,7 +2635,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad decimal key (value is (1&lt;&lt;24)+46).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_DECIMAL = KEYCODE_BIT + 46;
@@ -2642,7 +2643,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad divide key (value is (1&lt;&lt;24)+47).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_DIVIDE = KEYCODE_BIT + 47;
@@ -2650,7 +2651,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad zero key (value is (1&lt;&lt;24)+48).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_0 = KEYCODE_BIT + 48;
@@ -2658,7 +2659,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad one key (value is (1&lt;&lt;24)+49).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_1 = KEYCODE_BIT + 49;
@@ -2666,7 +2667,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad two key (value is (1&lt;&lt;24)+50).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_2 = KEYCODE_BIT + 50;
@@ -2674,7 +2675,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad three key (value is (1&lt;&lt;24)+51).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_3 = KEYCODE_BIT + 51;
@@ -2682,23 +2683,23 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad four key (value is (1&lt;&lt;24)+52).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_4 = KEYCODE_BIT + 52;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad five key (value is (1&lt;&lt;24)+53).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_5 = KEYCODE_BIT + 53;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad six key (value is (1&lt;&lt;24)+54).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_6 = KEYCODE_BIT + 54;
@@ -2706,7 +2707,7 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad seven key (value is (1&lt;&lt;24)+55).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_7 = KEYCODE_BIT + 55;
@@ -2714,15 +2715,15 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad eight key (value is (1&lt;&lt;24)+56).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_8 = KEYCODE_BIT + 56;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad nine key (value is (1&lt;&lt;24)+57).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_9 = KEYCODE_BIT + 57;
@@ -2730,82 +2731,82 @@
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad equal key (value is (1&lt;&lt;24)+61).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_EQUAL = KEYCODE_BIT + 61;
-	
+
 	/**
 	 * Keyboard event constant representing the numeric key
 	 * pad enter key (value is (1&lt;&lt;24)+80).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int KEYPAD_CR = KEYCODE_BIT + 80;
-	
+
 	/**
 	 * Keyboard event constant representing the help
 	 * key (value is (1&lt;&lt;24)+81).
-	 * 
+	 *
 	 * NOTE: The HELP key maps to the key labeled "help",
 	 * not "F1". If your keyboard does not have a HELP key,
 	 * you will never see this key press.  To listen for
 	 * help on a control, use SWT.Help.
-	 * 
+	 *
 	 * @since 3.0
-	 * 
+	 *
 	 * @see SWT#Help
 	 */
 	public static final int HELP = KEYCODE_BIT + 81;
-	
+
 	/**
 	 * Keyboard event constant representing the caps
 	 * lock key (value is (1&lt;&lt;24)+82).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int CAPS_LOCK = KEYCODE_BIT + 82;
-	
+
 	/**
 	 * Keyboard event constant representing the num
 	 * lock key (value is (1&lt;&lt;24)+83).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int NUM_LOCK = KEYCODE_BIT + 83;
-	
+
 	/**
 	 * Keyboard event constant representing the scroll
 	 * lock key (value is (1&lt;&lt;24)+84).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int SCROLL_LOCK = KEYCODE_BIT + 84;
-	
+
 	/**
 	 * Keyboard event constant representing the pause
 	 * key (value is (1&lt;&lt;24)+85).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int PAUSE = KEYCODE_BIT + 85;
-	
+
 	/**
 	 * Keyboard event constant representing the break
 	 * key (value is (1&lt;&lt;24)+86).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int BREAK = KEYCODE_BIT + 86;
-	
+
 	/**
 	 * Keyboard event constant representing the print screen
 	 * key (value is (1&lt;&lt;24)+87).
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int PRINT_SCREEN = KEYCODE_BIT + 87;
-	
+
 	/**
 	 * The <code>MessageBox</code> style constant for error icon
 	 * behavior (value is 1).
@@ -2835,7 +2836,7 @@
 	 * behavior (value is 1&lt;&lt;4).
 	 */
 	public static final int ICON_WORKING = 1 << 4;
-	
+
 	/**
 	 * The style constant for "search" icon. This style constant is 
 	 * used with <code>Text</code> in combination with <code>SWT.SEARCH
@@ -2896,7 +2897,7 @@
 	 * The <code>MessageBox</code> style constant for a CANCEL button;
 	 * valid combinations are OK|CANCEL, YES|NO|CANCEL, RETRY|CANCEL
 	 * (value is 1&lt;&lt;8).
-	 * 
+	 *
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>MessageBox</code></li>
 	 * </ul></p>
@@ -2944,7 +2945,7 @@
 	 * @since 3.2
 	 */
 	public static final int INHERIT_NONE = 0;
-	
+
 	/**
 	 * The <code>Composite</code> constant to indicate that
 	 * an attribute (such as background) is inherited by
@@ -2956,7 +2957,7 @@
 	 * @since 3.2
 	 */
 	public static final int INHERIT_DEFAULT = 1;
-	
+
 	/**
 	 * The <code>Composite</code> constant to indicate that
 	 * an attribute (such as background) is inherited by
@@ -2965,7 +2966,7 @@
 	 * @since 3.2
 	 */
 	public static final int INHERIT_FORCE = 2;
-	
+
 	/**
 	 * Default color white (value is 1).
 	 */
@@ -3045,7 +3046,7 @@
 	 * Default color dark gray (value is 16).
 	 */
 	public static final int COLOR_DARK_GRAY = 16;
-	
+
 	/*
 	 * System Colors
 	 *
@@ -3061,7 +3062,7 @@
 	 *	It is expected that the list of supported colors
 	 * will grow over time.
 	 */
-	
+
 	/**
 	 * System color used to paint dark shadow areas (value is 17).
 	 */
@@ -3126,7 +3127,7 @@
 	 * System color used to paint tooltip background areas (value is 29).
 	 */
 	public static final int COLOR_INFO_BACKGROUND = 29;
-	
+
 	/**
 	 * System color used to paint title text (value is 30).
 	 */
@@ -3141,7 +3142,7 @@
 	 * System color used to paint title background gradient (value is 32).
 	 */
 	public static final int COLOR_TITLE_BACKGROUND_GRADIENT = 32;
-	
+
 	/**
 	 * System color used to paint inactive title text (value is 33).
 	 */
@@ -3156,7 +3157,7 @@
 	 * System color used to paint inactive title background gradient (value is 35).
 	 */
 	public static final int COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = 35;
-	
+
 	/**
 	 * Draw constant indicating whether the drawing operation
 	 * should fill the background (value is 1&lt;&lt;0).
@@ -3179,13 +3180,13 @@
 	 * Draw constant indicating whether the string drawing operation
 	 * should handle mnemonics (value is 1&lt;&lt;3).
 	 */
-	public static final int DRAW_MNEMONIC = 1 << 3;	
+	public static final int DRAW_MNEMONIC = 1 << 3;
 
-	
+
 	/**
-	 * Selection constant indicating that a line delimiter should be 
+	 * Selection constant indicating that a line delimiter should be
 	 * drawn (value is 1&lt;&lt;17).
-	 * 
+	 *
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextLayout</code></li>
 	 * </ul></p>
@@ -3192,80 +3193,80 @@
 	 *
 	 * @see #FULL_SELECTION
 	 * @see #LAST_LINE_SELECTION
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int DELIMITER_SELECTION = 1 << 17;
-	
+
 	/**
 	 * Selection constant indicating that the last line is selected
-	 * to the end and should be drawn using either a line delimiter 
+	 * to the end and should be drawn using either a line delimiter
 	 * or full line selection (value is 1&lt;&lt;20).
-	 * 
+	 *
 	 * <p><b>Used By:</b><ul>
 	 * <li><code>TextLayout</code></li>
 	 * </ul></p>
-	 * 
+	 *
 	 * @see #DELIMITER_SELECTION
 	 * @see #FULL_SELECTION
-	 * 
+	 *
 	 * @since 3.3
 	 */
 	public static final int LAST_LINE_SELECTION = 1 << 20;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that no error number was specified
 	 * (value is 1).
 	 */
 	public static final int ERROR_UNSPECIFIED = 1;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that no more handles for an
 	 * operating system resource are available
 	 * (value is 2).
 	 */
 	public static final int ERROR_NO_HANDLES = 2;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that no more callback resources are available
 	 * (value is 3).
 	 */
 	public static final int ERROR_NO_MORE_CALLBACKS = 3;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that a null argument was passed in
-	 * (value is 4). 
+	 * (value is 4).
 	 */
 	public static final int ERROR_NULL_ARGUMENT = 4;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that an invalid argument was passed in
 	 * (value is 5).
 	 */
 	public static final int ERROR_INVALID_ARGUMENT = 5;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that a value was found to be
 	 * outside the allowable range
 	 * (value is 6).
 	 */
 	public static final int ERROR_INVALID_RANGE = 6;
-	
-	/** 
-	 * SWT error constant indicating that a value which can not be 
+
+	/**
+	 * SWT error constant indicating that a value which can not be
 	 * zero was found to be
 	 * (value is 7).
 	 */
 	public static final int ERROR_CANNOT_BE_ZERO = 7;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide the value of an item
 	 * (value is 8).
 	 */
 	public static final int ERROR_CANNOT_GET_ITEM = 8;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide the selection
 	 * (value is 9).
@@ -3272,15 +3273,15 @@
 	 */
 	public static final int ERROR_CANNOT_GET_SELECTION = 9;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the matrix is not invertible
 	 * (value is 10).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int ERROR_CANNOT_INVERT_MATRIX = 10;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide the height of an item
 	 * (value is 11).
@@ -3287,7 +3288,7 @@
 	 */
 	public static final int ERROR_CANNOT_GET_ITEM_HEIGHT = 11;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide the text of a widget
 	 * (value is 12).
@@ -3294,7 +3295,7 @@
 	 */
 	public static final int ERROR_CANNOT_GET_TEXT = 12;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to set the text of a widget
 	 * (value is 13).
@@ -3301,7 +3302,7 @@
 	 */
 	public static final int ERROR_CANNOT_SET_TEXT = 13;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to add an item
 	 * (value is 14).
@@ -3308,7 +3309,7 @@
 	 */
 	public static final int ERROR_ITEM_NOT_ADDED = 14;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to remove an item
 	 * (value is 15).
@@ -3315,7 +3316,7 @@
 	 */
 	public static final int ERROR_ITEM_NOT_REMOVED = 15;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the graphics library
 	 * is not available
 	 * (value is 16).
@@ -3322,7 +3323,7 @@
 	 */
 	public static final int ERROR_NO_GRAPHICS_LIBRARY = 16;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a particular feature has
 	 * not been implemented on this platform
 	 * (value is 20).
@@ -3329,7 +3330,7 @@
 	 */
 	public static final int ERROR_NOT_IMPLEMENTED = 20;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a menu which needed
 	 * to have the drop down style had some other style instead
 	 * (value is 21).
@@ -3336,7 +3337,7 @@
 	 */
 	public static final int ERROR_MENU_NOT_DROP_DOWN = 21;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an attempt was made to
 	 * invoke an SWT operation which can only be executed by the
 	 * user-interface thread from some other thread
@@ -3344,15 +3345,15 @@
 	 */
 	public static final int ERROR_THREAD_INVALID_ACCESS = 22;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an attempt was made to
 	 * invoke an SWT operation using a widget which had already
 	 * been disposed
-	 * (value is 24). 
+	 * (value is 24).
 	 */
 	public static final int ERROR_WIDGET_DISPOSED = 24;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a menu item which needed
 	 * to have the cascade style had some other style instead
 	 * (value is 27).
@@ -3359,7 +3360,7 @@
 	 */
 	public static final int ERROR_MENUITEM_NOT_CASCADE = 27;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to set the selection of a widget
 	 * (value is 28).
@@ -3366,7 +3367,7 @@
 	 */
 	public static final int ERROR_CANNOT_SET_SELECTION = 28;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to set the menu
 	 * (value is 29).
@@ -3373,7 +3374,7 @@
 	 */
 	public static final int ERROR_CANNOT_SET_MENU = 29;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to set the enabled state
 	 * (value is 30).
@@ -3380,7 +3381,7 @@
 	 */
 	public static final int ERROR_CANNOT_SET_ENABLED = 30;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide enabled/disabled state information
 	 * (value is 31).
@@ -3387,14 +3388,14 @@
 	 */
 	public static final int ERROR_CANNOT_GET_ENABLED = 31;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a provided widget can
 	 * not be used as a parent in the current operation
 	 * (value is 32).
 	 */
 	public static final int ERROR_INVALID_PARENT = 32;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that a menu which needed
 	 * to have the menu bar style had some other style instead
 	 * (value is 33).
@@ -3401,7 +3402,7 @@
 	 */
 	public static final int ERROR_MENU_NOT_BAR = 33;
 
-	/** 
+	/**
 	 * SWT error constant indicating that the underlying operating
 	 * system was unable to provide count information
 	 * (value is 36).
@@ -3408,7 +3409,7 @@
 	 */
 	public static final int ERROR_CANNOT_GET_COUNT = 36;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a menu which needed
 	 * to have the pop up menu style had some other style instead
 	 * (value is 37).
@@ -3415,7 +3416,7 @@
 	 */
 	public static final int ERROR_MENU_NOT_POP_UP = 37;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a graphics operation
 	 * was attempted with an image of an unsupported depth
 	 * (value is 38).
@@ -3422,7 +3423,7 @@
 	 */
 	public static final int ERROR_UNSUPPORTED_DEPTH = 38;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an input/output operation
 	 * failed during the execution of an SWT operation
 	 * (value is 39).
@@ -3429,7 +3430,7 @@
 	 */
 	public static final int ERROR_IO = 39;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a graphics operation
 	 * was attempted with an image having an invalid format
 	 * (value is 40).
@@ -3436,7 +3437,7 @@
 	 */
 	public static final int ERROR_INVALID_IMAGE = 40;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a graphics operation
 	 * was attempted with an image having a valid but unsupported
 	 * format
@@ -3444,13 +3445,13 @@
 	 */
 	public static final int ERROR_UNSUPPORTED_FORMAT = 42;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an attempt was made
 	 * to subclass an SWT widget class without implementing the
 	 * <code>checkSubclass()</code> method
 	 * (value is 43).
-	 * 
-	 * For additional information see the comment in 
+	 *
+	 * For additional information see the comment in
 	 * <code>Widget.checkSubclass()</code>.
 	 *
 	 * @see org.eclipse.swt.widgets.Widget#checkSubclass
@@ -3457,7 +3458,7 @@
 	 */
 	public static final int ERROR_INVALID_SUBCLASS = 43;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an attempt was made to
 	 * invoke an SWT operation using a graphics object which had
 	 * already been disposed
@@ -3464,40 +3465,40 @@
 	 * (value is 44).
 	 */
 	public static final int ERROR_GRAPHIC_DISPOSED = 44;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that an attempt was made to
 	 * invoke an SWT operation using a device which had already
 	 * been disposed
-	 * (value is 45). 
+	 * (value is 45).
 	 */
 	public static final int ERROR_DEVICE_DISPOSED = 45;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that an exception happened
 	 * when executing a runnable
 	 * (value is 46).
 	 */
 	public static final int ERROR_FAILED_EXEC = 46;
-	
-	/** 
+
+	/**
 	 * SWT error constant indicating that an unsatisfied link
 	 * error occurred while attempting to load a library
 	 * (value is 47).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int ERROR_FAILED_LOAD_LIBRARY = 47;
 
-	/** 
+	/**
 	 * SWT error constant indicating that a font is not valid
 	 * (value is 48).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int ERROR_INVALID_FONT = 48;
 
-	/** 
+	/**
 	 * SWT error constant indicating that an attempt was made to
 	 * use an BrowserFunction object which had already been disposed
 	 * (value is 49).
@@ -3525,12 +3526,12 @@
 
 	/**
 	 * Constant indicating that an image or operation is of type bitmap  (value is 0).
-	 */	
+	 */
 	public static final int BITMAP = 0;
 
 	/**
 	 * Constant indicating that an image or operation is of type icon  (value is 1).
-	 */	
+	 */
 	public static final int ICON = 1;
 
 	/**
@@ -3537,7 +3538,7 @@
 	 * The <code>Image</code> constructor argument indicating that
 	 * the new image should be a copy of the image provided as
 	 * an argument  (value is 0).
-	 */	
+	 */
 	public static final int IMAGE_COPY = 0;
 
 	/**
@@ -3545,16 +3546,16 @@
 	 * the new image should have the appearance of a "disabled"
 	 * (using the platform's rules for how this should look)
 	 * copy of the image provided as an argument  (value is 1).
-	 */	
+	 */
 	public static final int IMAGE_DISABLE = 1;
-	
+
 	/**
 	 * The <code>Image</code> constructor argument indicating that
 	 * the new image should have the appearance of a "gray scaled"
 	 * copy of the image provided as an argument  (value is 2).
-	 */	
+	 */
 	public static final int IMAGE_GRAY = 2;
-	
+
 	/**
 	 * Constant to indicate an error state (value is 1).
 	 * <p><b>Used By:</b><ul>
@@ -3584,135 +3585,135 @@
 	 * </ul></p>
 	 */
 	public static final int NORMAL = 0;
-	
+
 	/**
 	 * The font style constant indicating a bold weight font
 	 * (value is 1&lt;&lt;0).
 	 */
 	public static final int BOLD = 1 << 0;
-	
+
 	/**
 	 * The font style constant indicating an italic font
 	 * (value is 1&lt;&lt;1).
 	 */
 	public static final int ITALIC = 1 << 1;
-		
+
 	/**
 	 * System arrow cursor  (value is 0).
 	 */
 	public static final int CURSOR_ARROW = 0;
-		
+
 	/**
 	 * System wait cursor  (value is 1).
 	 */
 	public static final int CURSOR_WAIT = 1;
-		
+
 	/**
 	 * System cross hair cursor  (value is 2).
 	 */
 	public static final int CURSOR_CROSS = 2;
-		
+
 	/**
 	 * System app startup cursor  (value is 3).
 	 */
 	public static final int CURSOR_APPSTARTING = 3;
-		
+
 	/**
 	 * System help cursor  (value is 4).
 	 */
 	public static final int CURSOR_HELP = 4;
-		
+
 	/**
 	 * System resize all directions cursor (value is 5).
 	 */
 	public static final int CURSOR_SIZEALL = 5;
-		
+
 	/**
 	 * System resize north-east-south-west cursor  (value is 6).
 	 */
 	public static final int CURSOR_SIZENESW = 6;
-		
+
 	/**
 	 * System resize north-south cursor  (value is 7).
 	 */
 	public static final int CURSOR_SIZENS = 7;
-		
+
 	/**
 	 * System resize north-west-south-east cursor  (value is 8).
 	 */
 	public static final int CURSOR_SIZENWSE = 8;
-		
+
 	/**
 	 * System resize west-east cursor  (value is 9).
 	 */
 	public static final int CURSOR_SIZEWE = 9;
-		
+
 	/**
 	 * System resize north cursor  (value is 10).
 	 */
 	public static final int CURSOR_SIZEN = 10;
-		
+
 	/**
 	 * System resize south cursor  (value is 11).
 	 */
 	public static final int CURSOR_SIZES = 11;
-		
+
 	/**
 	 * System resize east cursor  (value is 12).
 	 */
 	public static final int CURSOR_SIZEE = 12;
-		
+
 	/**
 	 * System resize west cursor  (value is 13).
 	 */
 	public static final int CURSOR_SIZEW = 13;
-		
+
 	/**
 	 * System resize north-east cursor (value is 14).
 	 */
 	public static final int CURSOR_SIZENE = 14;
-		
+
 	/**
 	 * System resize south-east cursor (value is 15).
 	 */
 	public static final int CURSOR_SIZESE = 15;
-		
+
 	/**
 	 * System resize south-west cursor (value is 16).
 	 */
 	public static final int CURSOR_SIZESW = 16;
-		
+
 	/**
 	 * System resize north-west cursor (value is 17).
 	 */
 	public static final int CURSOR_SIZENW = 17;
-		
+
 	/**
 	 * System up arrow cursor  (value is 18).
 	 */
 	public static final int CURSOR_UPARROW = 18;
-		
+
 	/**
 	 * System i-beam cursor (value is 19).
 	 */
 	public static final int CURSOR_IBEAM = 19;
-		
+
 	/**
 	 * System "not allowed" cursor (value is 20).
 	 */
 	public static final int CURSOR_NO = 20;
-		
+
 	/**
 	 * System hand cursor (value is 21).
 	 */
 	public static final int CURSOR_HAND = 21;
-		
+
 	/**
 	 * Line drawing style for flat end caps (value is 1).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineCap(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineCap()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int CAP_FLAT = 1;
@@ -3719,10 +3720,10 @@
 
 	/**
 	 * Line drawing style for rounded end caps (value is 2).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineCap(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineCap()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int CAP_ROUND = 2;
@@ -3729,10 +3730,10 @@
 
 	/**
 	 * Line drawing style for square end caps (value is 3).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineCap(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineCap()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int CAP_SQUARE = 3;
@@ -3739,10 +3740,10 @@
 
 	/**
 	 * Line drawing style for miter joins (value is 1).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineJoin(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineJoin()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int JOIN_MITER = 1;
@@ -3749,10 +3750,10 @@
 
 	/**
 	 * Line drawing  style for rounded joins (value is 2).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineJoin(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineJoin()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int JOIN_ROUND = 2;
@@ -3759,10 +3760,10 @@
 
 	/**
 	 * Line drawing style for bevel joins (value is 3).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineJoin(int)
 	 * @see org.eclipse.swt.graphics.GC#getLineJoin()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int JOIN_BEVEL = 3;
@@ -3771,22 +3772,22 @@
 	 * Line drawing style for solid lines  (value is 1).
 	 */
 	public static final int LINE_SOLID = 1;
-		
+
 	/**
 	 * Line drawing style for dashed lines (value is 2).
 	 */
 	public static final int LINE_DASH = 2;
-		
+
 	/**
 	 * Line drawing style for dotted lines (value is 3).
 	 */
 	public static final int LINE_DOT = 3;
-		
+
 	/**
 	 * Line drawing style for alternating dash-dot lines (value is 4).
 	 */
 	public static final int LINE_DASHDOT = 4;
-		
+
 	/**
 	 * Line drawing style for dash-dot-dot lines (value is 5).
 	 */
@@ -3794,17 +3795,17 @@
 
 	/**
 	 * Line drawing style for custom dashed lines (value is 6).
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.GC#setLineDash(int[])
 	 * @see org.eclipse.swt.graphics.GC#getLineDash()
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int LINE_CUSTOM = 6;
-	
+
 	/**
 	 * Path constant that represents a "move to" operation (value is 1).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int PATH_MOVE_TO = 1;
@@ -3811,7 +3812,7 @@
 
 	/**
 	 * Path constant that represents a "line to" operation (value is 2).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int PATH_LINE_TO = 2;
@@ -3818,7 +3819,7 @@
 
 	/**
 	 * Path constant that represents a "quadratic curve to" operation (value is 3).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int PATH_QUAD_TO = 3;
@@ -3825,7 +3826,7 @@
 
 	/**
 	 * Path constant that represents a "cubic curve to" operation (value is 4).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int PATH_CUBIC_TO = 4;
@@ -3832,7 +3833,7 @@
 
 	/**
 	 * Path constant that represents a "close" operation (value is 5).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int PATH_CLOSE = 5;
@@ -3839,7 +3840,7 @@
 
 	/**
 	 * Even odd rule for filling operations (value is 1).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int FILL_EVEN_ODD = 1;
@@ -3846,7 +3847,7 @@
 
 	/**
 	 * Winding rule for filling operations (value is 2).
-	 * 
+	 *
 	 * @since 3.1
 	 */
 	public static final int FILL_WINDING = 2;
@@ -3862,7 +3863,7 @@
 	public static final int IMAGE_BMP = 0;
 
 	/**
-	 * Image format constant indicating a run-length encoded 
+	 * Image format constant indicating a run-length encoded
 	 * Windows BMP format image (value is 1).
 	 */
 	public static final int IMAGE_BMP_RLE = 1;
@@ -3905,7 +3906,7 @@
 
 	/**
 	 * GIF image disposal method constants indicating that the
-	 * disposal method is to do nothing; that is, to leave the 
+	 * disposal method is to do nothing; that is, to leave the
 	 * previous image in place (value is 1).
 	 */
 	public static final int DM_FILL_NONE = 0x1;
@@ -3923,25 +3924,25 @@
 	 * (value is 3).
 	 */
 	public static final int DM_FILL_PREVIOUS = 0x3;
-	
+
 	/**
 	 * Image transparency constant indicating that the image
 	 * contains no transparency information (value is 0).
 	 */
 	public static final int TRANSPARENCY_NONE = 0x0;
-	
+
 	/**
 	 * Image transparency constant indicating that the image
 	 * contains alpha transparency information (value is 1&lt;&lt;0).
 	 */
 	public static final int TRANSPARENCY_ALPHA = 1 << 0;
-	
+
 	/**
 	 * Image transparency constant indicating that the image
 	 * contains a transparency mask (value is 1&lt;&lt;1).
 	 */
 	public static final int TRANSPARENCY_MASK = 1 << 1;
-	
+
 	/**
 	 * Image transparency constant indicating that the image
 	 * contains a transparent pixel (value is 1&lt;&lt;2).
@@ -3951,24 +3952,24 @@
 	/**
 	 * The character movement type (value is 1&lt;&lt;0).
 	 * This constant is used to move a text offset over a character.
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.TextLayout#getNextOffset(int, int)
 	 * @see org.eclipse.swt.graphics.TextLayout#getPreviousOffset(int, int)
-	 * 
+	 *
 	 * @since 3.0
-	 */	
+	 */
 	public static final int MOVEMENT_CHAR = 1 << 0;
 
 	/**
 	 * The cluster movement type (value is 1&lt;&lt;1).
 	 * This constant is used to move a text offset over a cluster.
-	 * A cluster groups one or more characters. A cluster is 
+	 * A cluster groups one or more characters. A cluster is
 	 * undivisible, this means that a caret offset can not be placed in the
-	 * middle of a cluster.  
-	 * 
+	 * middle of a cluster.
+	 *
 	 * @see org.eclipse.swt.graphics.TextLayout#getNextOffset(int, int)
 	 * @see org.eclipse.swt.graphics.TextLayout#getPreviousOffset(int, int)
-	 * 
+	 *
 	 * @since 3.0
 	 */
 	public static final int MOVEMENT_CLUSTER = 1 << 1;
@@ -3976,42 +3977,42 @@
 	/**
 	 * The word movement type (value is 1&lt;&lt;2).
 	 * This constant is used to move a text offset over a word.
-	 * The behavior of this constant depends on the platform and on the 
-	 * direction of the movement. For example, on Windows the stop is 
-	 * always at the start of the word. On GTK and Mac the stop is at the end 
-	 * of the word if the direction is next and at the start of the word if the 
+	 * The behavior of this constant depends on the platform and on the
+	 * direction of the movement. For example, on Windows the stop is
+	 * always at the start of the word. On GTK and Mac the stop is at the end
+	 * of the word if the direction is next and at the start of the word if the
 	 * direction is previous.
-	 * 
+	 *
 	 * @see org.eclipse.swt.graphics.TextLayout#getNextOffset(int, int)
 	 * @see org.eclipse.swt.graphics.TextLayout#getPreviousOffset(int, int)
-	 * 
+	 *
 	 * @since 3.0
-	 */	
+	 */
 	public static final int MOVEMENT_WORD = 1 << 2;
 
 	/**
 	 * The word end movement type (value is 1&lt;&lt;3).
 	 * This constant is used to move a text offset to the next or previous
-	 * word end. The behavior of this constant does not depend on the platform.  
-	 * 
-	 * 
+	 * word end. The behavior of this constant does not depend on the platform.
+	 *
+	 *
 	 * @see org.eclipse.swt.graphics.TextLayout#getNextOffset(int, int)
 	 * @see org.eclipse.swt.graphics.TextLayout#getPreviousOffset(int, int)
-	 * 
+	 *
 	 * @since 3.3
-	 */	
+	 */
 	public static final int MOVEMENT_WORD_END = 1 << 3;
 
 	/**
 	 * The word start movement type (value is 1&lt;&lt;4).
 	 * This constant is used to move a text offset to the next or previous
-	 * word start. The behavior of this constant does not depend on the platform.  
-	 * 
+	 * word start. The behavior of this constant does not depend on the platform.
+	 *
 	 * @see org.eclipse.swt.graphics.TextLayout#getNextOffset(int, int)
 	 * @see org.eclipse.swt.graphics.TextLayout#getPreviousOffset(int, int)
-	 * 
+	 *
 	 * @since 3.3
-	 */	
+	 */
 	public static final int MOVEMENT_WORD_START = 1 << 4;
 
 	/**
@@ -4107,7 +4108,7 @@
 	 * @since 3.6
 	 */
 	public static final String SKIN_ID = "org.eclipse.swt.skin.id";
-	
+
 	/**
 	 * The <code>Scrollable</code> constant to indicate that
 	 * the receiver is using overlay scrollbars. (value is 1)
@@ -4189,10 +4190,10 @@
 
 /**
  * Returns the NLS'ed message for the given argument.
- * 
+ *
  * @param key the key to look up
  * @return the message for the given key
- * 
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
  * </ul>
@@ -4228,7 +4229,19 @@
 	return Platform.PLATFORM;
 }
 
+// <QFS>
 /**
+ * Returns the SWT platform name including architecture.
+ * Examples: "win32", "motif", "gtk", "gtk-64", "photon", "carbon"
+ *
+ * @return the SWT platform name
+ */
+public static String getPlatformAndArch () {
+    return getPlatform();
+}
+// </QFS>
+
+/**
  * Returns the SWT version number as an integer.
  * Example: "SWT051" == 51
  *
@@ -4301,7 +4314,7 @@
  * @see SWTError
  * @see SWTException
  * @see IllegalArgumentException
- * 
+ *
  * @since 3.0
  */
 public static void error (int code, Throwable throwable, String detail) {
@@ -4308,7 +4321,7 @@
 
 	/*
 	* This code prevents the creation of "chains" of SWTErrors and
-	* SWTExceptions which in turn contain other SWTErrors and 
+	* SWTExceptions which in turn contain other SWTErrors and
 	* SWTExceptions as their throwable. This can occur when low level
 	* code throws an exception past a point where a higher layer is
 	* being "safe" and catching all exceptions. (Note that, this is
@@ -4316,7 +4329,7 @@
 	*
 	* On the theory that the low level code is closest to the
 	* original problem, we simply re-throw the original exception here.
-	* 
+	*
 	* NOTE: Exceptions thrown in syncExec and asyncExec must be
 	* wrapped.
 	*/
@@ -4328,9 +4341,9 @@
 	String message = findErrorText (code);
 	if (detail != null) message += detail;
 	switch (code) {
-		
+
 		/* Illegal Arguments (non-fatal) */
-		case ERROR_NULL_ARGUMENT: 
+		case ERROR_NULL_ARGUMENT:
 		case ERROR_CANNOT_BE_ZERO:
 		case ERROR_INVALID_ARGUMENT:
 		case ERROR_MENU_NOT_BAR:
@@ -4337,11 +4350,11 @@
 		case ERROR_MENU_NOT_DROP_DOWN:
 		case ERROR_MENU_NOT_POP_UP:
 		case ERROR_MENUITEM_NOT_CASCADE:
-		case ERROR_INVALID_PARENT: 		
+		case ERROR_INVALID_PARENT:
 		case ERROR_INVALID_RANGE: {
 			throw new IllegalArgumentException (message);
 		}
-		
+
 		/* SWT Exceptions (non-fatal) */
 		case ERROR_INVALID_SUBCLASS:
 		case ERROR_THREAD_INVALID_ACCESS:
@@ -4362,7 +4375,7 @@
 			exception.throwable = throwable;
 			throw exception;
 		}
-		
+
 		/* Operation System Errors (fatal, may occur only on some platforms) */
 		case ERROR_CANNOT_GET_COUNT:
 		case ERROR_CANNOT_GET_ENABLED:
@@ -4378,7 +4391,7 @@
 		case ERROR_ITEM_NOT_REMOVED:
 		case ERROR_NO_HANDLES:
 		//FALL THROUGH
-		
+
 		/* SWT Errors (fatal, may occur only on some platforms) */
 		case ERROR_FAILED_LOAD_LIBRARY:
 		case ERROR_NO_MORE_CALLBACKS:
@@ -4389,7 +4402,7 @@
 			throw error;
 		}
 	}
-	
+
 	/* Unknown/Undefined Error */
 	SWTError error = new SWTError (code, message);
 	error.throwable = throwable;
@@ -4404,7 +4417,7 @@
 	*/
 	BUTTON_MASK = BUTTON1 | BUTTON2 | BUTTON3 | BUTTON4 | BUTTON5;
 	MODIFIER_MASK = ALT | SHIFT | CTRL | COMMAND;
-	
+
 	/*
 	* These values can be different on different platforms.
 	* Therefore they are not initialized in the declaration
Index: org/eclipse/swt/graphics/Device.java
===================================================================
--- org/eclipse/swt/graphics/Device.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/Device.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -243,17 +243,17 @@
  */
 public void dispose () {
 	synchronized (Device.class) {
-		if (isDisposed()) return;
-		checkDevice ();
-		release ();
-		destroy ();
-		deregister (this);
-		xDisplay = 0;
-		disposed = true;
-		if (tracking) {
+	if (isDisposed()) return;
+	checkDevice ();
+	release ();
+	destroy ();
+	deregister (this);
+	xDisplay = 0;
+	disposed = true;
+	if (tracking) {
 			synchronized (trackingLock) {
-				objects = null;
-				errors = null;
+		objects = null;
+		errors = null;
 				trackingLock = null;
 			}
 		}
@@ -262,14 +262,14 @@
 
 void dispose_Object (Object object) {
 	synchronized (trackingLock) {
-		for (int i=0; i<objects.length; i++) {
-			if (objects [i] == object) {
-				objects [i] = null;
-				errors [i] = null;
-				return;
-			}
+	for (int i=0; i<objects.length; i++) {
+		if (objects [i] == object) {
+			objects [i] = null;
+			errors [i] = null;
+			return;
 		}
 	}
+	}
 }
 
 static synchronized Device findDevice (int /*long*/ xDisplay) {
@@ -340,20 +340,20 @@
 	if (tracking) {
 		synchronized (trackingLock) {
 			int count = 0, length = objects.length;
-			for (int i=0; i<length; i++) {
-				if (objects [i] != null) count++;
-			}
-			int index = 0;
-			data.objects = new Object [count];
-			data.errors = new Error [count];
-			for (int i=0; i<length; i++) {
-				if (objects [i] != null) {
-					data.objects [index] = objects [i];
-					data.errors [index] = errors [i];
-					index++;
-				}
-			}
+	for (int i=0; i<length; i++) {
+		if (objects [i] != null) count++;
+	}
+	int index = 0;
+	data.objects = new Object [count];
+	data.errors = new Error [count];
+	for (int i=0; i<length; i++) {
+		if (objects [i] != null) {
+			data.objects [index] = objects [i];
+			data.errors [index] = errors [i];
+			index++;
 		}
+	}
+		}
 	} else {
 		data.objects = new Object [0];
 		data.errors = new Error [0];
@@ -587,10 +587,10 @@
 			useXRender = major_versionp[0] > 0 || (major_versionp[0] == 0 && minor_versionp[0] >= 8);
 		}
 	}
-
+	
 	//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 */
@@ -708,7 +708,7 @@
  */
 public boolean isDisposed () {
 	synchronized (Device.class) {
-		return disposed;
+	return disposed;
 	}
 }
 
@@ -747,22 +747,22 @@
 
 void new_Object (Object object) {
 	synchronized (trackingLock) {
-		for (int i=0; i<objects.length; i++) {
-			if (objects [i] == null) {
-				objects [i] = object;
-				errors [i] = new Error ();
-				return;
-			}
+	for (int i=0; i<objects.length; i++) {
+		if (objects [i] == null) {
+			objects [i] = object;
+			errors [i] = new Error ();
+			return;
 		}
-		Object [] newObjects = new Object [objects.length + 128];
-		System.arraycopy (objects, 0, newObjects, 0, objects.length);
-		newObjects [objects.length] = object;
-		objects = newObjects;
-		Error [] newErrors = new Error [errors.length + 128];
-		System.arraycopy (errors, 0, newErrors, 0, errors.length);
-		newErrors [errors.length] = new Error ();
-		errors = newErrors;
 	}
+	Object [] newObjects = new Object [objects.length + 128];
+	System.arraycopy (objects, 0, newObjects, 0, objects.length);
+	newObjects [objects.length] = object;
+	objects = newObjects;
+	Error [] newErrors = new Error [errors.length + 128];
+	System.arraycopy (errors, 0, newErrors, 0, errors.length);
+	newErrors [errors.length] = new Error ();
+	errors = newErrors;
+	}
 }
 
 static synchronized void register (Device device) {
Index: org/eclipse/swt/graphics/ImageLoader.java
===================================================================
--- org/eclipse/swt/graphics/ImageLoader.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/ImageLoader.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -81,7 +81,7 @@
 	 * The default is 1. A value of 0 means 'display repeatedly'
 	 */
 	public int repeatCount;
-	
+		
 	/**
 	 * This is the compression used when saving jpeg and png files.
 	 * <p>
Index: org/eclipse/swt/graphics/Pattern.java
===================================================================
--- org/eclipse/swt/graphics/Pattern.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/Pattern.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -47,7 +47,7 @@
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	public int /*long*/ handle;
-	
+
 	int /*long*/ surface;
 
 /**
Index: org/eclipse/swt/graphics/Image.java
===================================================================
--- org/eclipse/swt/graphics/Image.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/Image.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -246,7 +246,7 @@
 	}
 	device = this.device;
 	this.type = srcImage.type;
-	
+
 	if (OS.USE_CAIRO) {
 		if (flag != SWT.IMAGE_DISABLE) transparentPixel = srcImage.transparentPixel;
 		alpha = srcImage.alpha;
@@ -402,75 +402,75 @@
 		OS.gdk_draw_drawable(pixmap, gdkGC, srcImage.pixmap, 0, 0, 0, 0, width, height);
 		OS.g_object_unref(gdkGC);
 	} else {
-		
-		/* Retrieve the source pixmap data */
-		int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
-		if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-		int /*long*/ colormap = OS.gdk_colormap_get_system();
-		OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height);
-		int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
-		int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
 	
-		/* Apply transformation */
-		switch (flag) {
-			case SWT.IMAGE_DISABLE: {
-				Color zeroColor = device.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
-				RGB zeroRGB = zeroColor.getRGB();
-				byte zeroRed = (byte)zeroRGB.red;
-				byte zeroGreen = (byte)zeroRGB.green;
-				byte zeroBlue = (byte)zeroRGB.blue;
-				Color oneColor = device.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-				RGB oneRGB = oneColor.getRGB();
-				byte oneRed = (byte)oneRGB.red;
-				byte oneGreen = (byte)oneRGB.green;
-				byte oneBlue = (byte)oneRGB.blue;
-				byte[] line = new byte[stride];
-				for (int y=0; y<height; y++) {
-					OS.memmove(line, pixels + (y * stride), stride);
-					for (int x=0; x<width; x++) {
-						int offset = x*3;
-						int red = line[offset] & 0xFF;
-						int green = line[offset+1] & 0xFF;
-						int blue = line[offset+2] & 0xFF;
-						int intensity = red * red + green * green + blue * blue;
-						if (intensity < 98304) {
-							line[offset] = zeroRed;
-							line[offset+1] = zeroGreen;
-							line[offset+2] = zeroBlue;
-						} else {
-							line[offset] = oneRed;
-							line[offset+1] = oneGreen;
-							line[offset+2] = oneBlue;
-						}
+	/* Retrieve the source pixmap data */
+	int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
+	if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+	int /*long*/ colormap = OS.gdk_colormap_get_system();
+	OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height);
+	int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
+	int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+
+	/* Apply transformation */
+	switch (flag) {
+		case SWT.IMAGE_DISABLE: {
+			Color zeroColor = device.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+			RGB zeroRGB = zeroColor.getRGB();
+			byte zeroRed = (byte)zeroRGB.red;
+			byte zeroGreen = (byte)zeroRGB.green;
+			byte zeroBlue = (byte)zeroRGB.blue;
+			Color oneColor = device.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
+			RGB oneRGB = oneColor.getRGB();
+			byte oneRed = (byte)oneRGB.red;
+			byte oneGreen = (byte)oneRGB.green;
+			byte oneBlue = (byte)oneRGB.blue;
+			byte[] line = new byte[stride];
+			for (int y=0; y<height; y++) {
+				OS.memmove(line, pixels + (y * stride), stride);
+				for (int x=0; x<width; x++) {
+					int offset = x*3;
+					int red = line[offset] & 0xFF;
+					int green = line[offset+1] & 0xFF;
+					int blue = line[offset+2] & 0xFF;
+					int intensity = red * red + green * green + blue * blue;
+					if (intensity < 98304) {
+						line[offset] = zeroRed;
+						line[offset+1] = zeroGreen;
+						line[offset+2] = zeroBlue;
+					} else {
+						line[offset] = oneRed;
+						line[offset+1] = oneGreen;
+						line[offset+2] = oneBlue;
 					}
-					OS.memmove(pixels + (y * stride), line, stride);
 				}
-				break;
+				OS.memmove(pixels + (y * stride), line, stride);
 			}
-			case SWT.IMAGE_GRAY: {			
-				byte[] line = new byte[stride];
-				for (int y=0; y<height; y++) {
-					OS.memmove(line, pixels + (y * stride), stride);
-					for (int x=0; x<width; x++) {
-						int offset = x*3;
-						int red = line[offset] & 0xFF;
-						int green = line[offset+1] & 0xFF;
-						int blue = line[offset+2] & 0xFF;
-						byte intensity = (byte)((red+red+green+green+green+green+green+blue) >> 3);
-						line[offset] = line[offset+1] = line[offset+2] = intensity;
-					}
-					OS.memmove(pixels + (y * stride), line, stride);
+			break;
+		}
+		case SWT.IMAGE_GRAY: {			
+			byte[] line = new byte[stride];
+			for (int y=0; y<height; y++) {
+				OS.memmove(line, pixels + (y * stride), stride);
+				for (int x=0; x<width; x++) {
+					int offset = x*3;
+					int red = line[offset] & 0xFF;
+					int green = line[offset+1] & 0xFF;
+					int blue = line[offset+2] & 0xFF;
+					byte intensity = (byte)((red+red+green+green+green+green+green+blue) >> 3);
+					line[offset] = line[offset+1] = line[offset+2] = intensity;
 				}
-				break;
+				OS.memmove(pixels + (y * stride), line, stride);
 			}
+			break;
 		}
+	}
+
+	/* Copy data back to destination pixmap */
+	OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
 	
-		/* Copy data back to destination pixmap */
-		OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
-		
-		/* Free resources */
-		OS.g_object_unref(pixbuf);
-		OS.g_object_unref(gdkGC);
+	/* Free resources */
+	OS.g_object_unref(pixbuf);
+	OS.g_object_unref(gdkGC);
 	}
 	init();
 }
@@ -1022,7 +1022,7 @@
 	if (OS.USE_CAIRO) {
 		return device == image.device && surface == image.surface;
 	} else {
-		return device == image.device && pixmap == image.pixmap;
+	return device == image.device && pixmap == image.pixmap;
 	}
 }
 
@@ -1221,7 +1221,7 @@
 	return image;
 }
 
-/**	 
+/**
  * Invokes platform specific functionality to allocate a new image.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -1258,7 +1258,7 @@
 	if (OS.USE_CAIRO) {
 		return (int)/*64*/surface;
 	} else {
-		return (int)/*64*/pixmap;
+	return (int)/*64*/pixmap;
 	}
 }
 
@@ -1581,7 +1581,7 @@
  * </p>
  *
  * @param hDC the platform specific GC handle
- * @param data the platform specific GC data
+ * @param data the platform specific GC data 
  * 
  * @noreference This method is not intended to be referenced by clients.
  */
@@ -1608,7 +1608,7 @@
 	if (OS.USE_CAIRO) {
 		return surface == 0;
 	} else {
-		return pixmap == 0;
+	return pixmap == 0;
 	}
 }
 
@@ -1665,7 +1665,7 @@
 	if (OS.USE_CAIRO) {
 		return "Image {" + surface + "}";
 	} else {
-		return "Image {" + pixmap + "}";
+	return "Image {" + pixmap + "}";
 	}
 }
 
Index: org/eclipse/swt/graphics/TextLayout.java
===================================================================
--- org/eclipse/swt/graphics/TextLayout.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/TextLayout.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -83,7 +83,7 @@
 	 * Colormap is automatically set for GTK 2.6.0 and newer.
 	 */
 	if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) {
-	    OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());	
+	OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());
 	}
 	layout = OS.pango_layout_new(context);
 	if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -90,7 +90,7 @@
 	OS.pango_layout_set_font_description(layout, device.systemFont.handle);
 	OS.pango_layout_set_wrap(layout, OS.PANGO_WRAP_WORD_CHAR);
 	OS.pango_layout_set_tabs(layout, device.emptyTab);
-	OS.pango_layout_set_auto_dir(layout, false);
+		OS.pango_layout_set_auto_dir(layout, false);
 	text = "";
 	wrapWidth = ascent = descent = -1;
 	styles = new StyleItem[2];
@@ -117,7 +117,7 @@
 	char[] chars = null;
 	int segementsLength = segmentsText.length();
 	int nSegments = segementsLength - text.length();
-	int offsetCount = nSegments;
+	int offsetCount = nSegments; 
 	int[] lineOffsets = null; 
 	if ((ascent != -1  || descent != -1) && segementsLength > 0) {
 		PangoRectangle rect = new PangoRectangle();
@@ -167,11 +167,11 @@
 	}
 	invalidOffsets = new int[offsetCount];
 	if (offsetCount > 0) {
-		offsetCount = 0;
+	offsetCount = 0;
 		int lineIndex = 0;
 		int segmentCount = 0;
-		for (int i = 0; i < chars.length; i++) {
-			char c = chars[i];
+	for (int i = 0; i < chars.length; i++) {
+		char c = chars[i];
 			if (c == ZWS && lineOffsets != null && lineIndex < lineOffsets.length && i == lineOffsets[lineIndex]) {
 				invalidOffsets[offsetCount++] = i;		//ZWS
 				invalidOffsets[offsetCount++] = ++i;	//ZWNBS
@@ -215,7 +215,7 @@
 					break;
 				case SWT.UNDERLINE_SQUIGGLE:
 				case SWT.UNDERLINE_ERROR:
-					underlineStyle = OS.PANGO_UNDERLINE_ERROR;
+						underlineStyle = OS.PANGO_UNDERLINE_ERROR;
 					break;
 				case SWT.UNDERLINE_LINK: {
 					if (style.foreground == null) {
@@ -226,11 +226,11 @@
 						OS.memmove (attr, attribute, PangoAttribute.sizeof);
 						OS.pango_attr_list_insert(attrList, attr);
 					} 
-					underlineStyle = OS.PANGO_UNDERLINE_SINGLE;
+						underlineStyle = OS.PANGO_UNDERLINE_SINGLE;
 					break;
 				}
 			}
-			int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);
+				int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);
 			OS.memmove(attribute, attr, PangoAttribute.sizeof);
 			attribute.start_index = byteStart;
 			attribute.end_index = byteEnd;
@@ -241,15 +241,15 @@
 				GdkColor fg = style.underlineColor.handle;
 				attr = OS.pango_attr_underline_color_new(fg.red, fg.green, fg.blue);
 				if (attr != 0) {
-					OS.memmove(attribute, attr, PangoAttribute.sizeof);
-					attribute.start_index = byteStart;
-					attribute.end_index = byteEnd;
-					OS.memmove(attr, attribute, PangoAttribute.sizeof);
-					OS.pango_attr_list_insert(attrList, attr);
-					OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
-				}
-			}
+				OS.memmove(attribute, attr, PangoAttribute.sizeof);
+				attribute.start_index = byteStart;
+				attribute.end_index = byteEnd;
+				OS.memmove(attr, attribute, PangoAttribute.sizeof);
+				OS.pango_attr_list_insert(attrList, attr);
+				OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
 		}
+		}
+		}
 		if (style.strikeout) {
 			int /*long*/ attr = OS.pango_attr_strikethrough_new(true);
 			OS.memmove(attribute, attr, PangoAttribute.sizeof);
@@ -262,15 +262,15 @@
 				GdkColor fg = style.strikeoutColor.handle;
 				attr = OS.pango_attr_strikethrough_color_new(fg.red, fg.green, fg.blue);
 				if (attr != 0) {
-					OS.memmove(attribute, attr, PangoAttribute.sizeof);
-					attribute.start_index = byteStart;
-					attribute.end_index = byteEnd;
-					OS.memmove(attr, attribute, PangoAttribute.sizeof);
-					OS.pango_attr_list_insert(attrList, attr);
-					OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
-				}
+				OS.memmove(attribute, attr, PangoAttribute.sizeof);
+				attribute.start_index = byteStart;
+				attribute.end_index = byteEnd;
+				OS.memmove(attr, attribute, PangoAttribute.sizeof);
+				OS.pango_attr_list_insert(attrList, attr);
+				OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
 			}
 		}
+		}
 		Color foreground = style.foreground;
 		if (foreground != null && !foreground.isDisposed()) {
 			GdkColor fg = foreground.handle;
@@ -707,7 +707,7 @@
 		data.state &= ~GC.LINE_STYLE;
 	}
 	if (cairo != 0) {
-		Cairo.cairo_restore(cairo);
+	Cairo.cairo_restore(cairo);
 	}
 }
 
@@ -1129,7 +1129,7 @@
 		int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index);
 		offsets[i] = untranslateOffset(pos);
 	}
-	offsets[lineCount] = text.length();
+	offsets[lineCount] = text.length();						 
 	return offsets;
 }
 
@@ -1248,7 +1248,7 @@
 						found = false;
 						break;
 					}
-				}
+		}
 			}
 			if (found || limit) {
 				offset = untranslateOffset(testOffset);
@@ -1468,10 +1468,10 @@
 	if (nSegments == 0) return text;
 	if (segmentsChars == null) {
 		if (nSegments == 1) return text;
-		if (nSegments == 2) {
-			if (segments[0] == 0 && segments[1] == length) return text;
-		}
+	if (nSegments == 2) {
+		if (segments[0] == 0 && segments[1] == length) return text;
 	}
+	}
 	char[] oldChars = new char[length];
 	text.getChars(0, length, oldChars, 0);
 	char[] newChars = new char[length + nSegments];
@@ -1661,7 +1661,7 @@
 	alignment &= mask;
 	if (alignment == 0) return;
 	if ((alignment & SWT.LEFT) != 0) alignment = SWT.LEFT; 
-	if ((alignment & SWT.RIGHT) != 0) alignment = SWT.RIGHT;
+	if ((alignment & SWT.RIGHT) != 0) alignment = SWT.RIGHT; 
 	boolean rtl = OS.pango_context_get_base_dir(context) == OS.PANGO_DIRECTION_RTL;
 	int align = OS.PANGO_ALIGN_CENTER;
 	switch (alignment) {
@@ -2073,7 +2073,7 @@
  * returns without doing anything if the new text is the same as 
  * the current text.
  * </p>
- * 
+ *
  * @param text the new text
  *
  * @exception IllegalArgumentException <ul>
@@ -2211,8 +2211,8 @@
 	int i = 0;
 	while (i < invalidOffsets.length && offset > invalidOffsets[i]) {
 		i++;
-	}
-	return offset - i;
+		}
+			return offset - i;
 }
 
 int width () {
Index: org/eclipse/swt/graphics/GC.java
===================================================================
--- org/eclipse/swt/graphics/GC.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/GC.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -175,7 +175,7 @@
 		double[] currentX = new double[1], currentY = new double[1];
 		Cairo.cairo_get_current_point(cairo, currentX, currentY);
 		if (currentX[0] != x || currentY[0] != y) {
-			Cairo.cairo_move_to(cairo, x, y);
+		Cairo.cairo_move_to(cairo, x, y);
 		}
 		OS.pango_cairo_layout_path(cairo, layout);
 		OS.g_object_unref(layout);
@@ -238,7 +238,7 @@
 					Cairo.cairo_set_source(cairo, newPattern);
 					Cairo.cairo_pattern_destroy(newPattern);
 				} else {
-					Cairo.cairo_set_source(cairo, pattern.handle);
+				Cairo.cairo_set_source(cairo, pattern.handle);
 				}
 			} else {
 				Cairo.cairo_set_source_rgba(cairo, (color.red & 0xFFFF) / (float)0xFFFF, (color.green & 0xFFFF) / (float)0xFFFF, (color.blue & 0xFFFF) / (float)0xFFFF, data.alpha / (float)0xFF);
@@ -568,8 +568,8 @@
 			}
 		}
 	} else {
-		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) 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) {
 		if (!OS.USE_CAIRO) OS.gdk_gc_set_exposures(handle, false);
@@ -620,7 +620,7 @@
 	 * Colormap is automatically set for GTK 2.6.0 and newer.
 	 */
 	if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) {
-	    OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());	
+	OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());	
 	}
 	if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
 		OS.pango_layout_set_auto_dir(layout, false);
@@ -639,7 +639,7 @@
 		int /*long*/ cairo = data.cairo;
 		if (cairo != 0) Cairo.cairo_destroy(cairo);
 	}
-	data.cairo = 0;
+		data.cairo = 0;
 
 	/* Free resources */
 	int /*long*/ clipRgn = data.clipRgn;
@@ -654,7 +654,7 @@
 
 	/* Dispose the GC */
 	if (drawable != null) {
-		drawable.internal_dispose_GC(handle, data);
+	drawable.internal_dispose_GC(handle, data);
 	}
 	data.drawable = data.clipRgn = 0;
 	drawable = null;
@@ -851,9 +851,9 @@
 	 	imgWidth = srcImage.width;
 	 	imgHeight = srcImage.height;
 	} else {
-		int[] width = new int[1];
-		int[] height = new int[1];
-	 	OS.gdk_drawable_get_size(srcImage.pixmap, width, height);
+	int[] width = new int[1];
+	int[] height = new int[1];
+ 	OS.gdk_drawable_get_size(srcImage.pixmap, width, height);
 	 	imgWidth = width[0];
 	 	imgHeight = height[0];
 	}
@@ -1017,7 +1017,7 @@
 		if (scaledPixbuf == 0) return;
 		pixbuf = scaledPixbuf;
 	}
-	OS.gdk_draw_pixbuf(data.drawable, handle, pixbuf, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
+		OS.gdk_draw_pixbuf(data.drawable, handle, pixbuf, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
 	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) {
@@ -1515,20 +1515,20 @@
 		if (naw == 0 || nah == 0) {
 			Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
 		} else {
-			float naw2 = naw / 2f;
-			float nah2 = nah / 2f;
-			float fw = nw / naw2;
-			float fh = nh / nah2;
-			Cairo.cairo_save(cairo);
-			Cairo.cairo_translate(cairo, nx + xOffset, ny + yOffset);
-			Cairo.cairo_scale(cairo, naw2, nah2);
-			Cairo.cairo_move_to(cairo, fw - 1, 0);
-		    Cairo.cairo_arc(cairo, fw - 1, 1, 1, Compatibility.PI + Compatibility.PI/2.0, Compatibility.PI*2.0);
-		    Cairo.cairo_arc(cairo, fw - 1, fh - 1, 1, 0, Compatibility.PI/2.0);
-		    Cairo.cairo_arc(cairo, 1, fh - 1, 1, Compatibility.PI/2, Compatibility.PI);
-		    Cairo.cairo_arc(cairo, 1, 1, 1, Compatibility.PI, 270.0*Compatibility.PI/180.0);
-			Cairo.cairo_close_path(cairo);
-			Cairo.cairo_restore(cairo);
+		float naw2 = naw / 2f;
+		float nah2 = nah / 2f;
+		float fw = nw / naw2;
+		float fh = nh / nah2;
+		Cairo.cairo_save(cairo);
+		Cairo.cairo_translate(cairo, nx + xOffset, ny + yOffset);
+		Cairo.cairo_scale(cairo, naw2, nah2);
+		Cairo.cairo_move_to(cairo, fw - 1, 0);
+	    Cairo.cairo_arc(cairo, fw - 1, 1, 1, Compatibility.PI + Compatibility.PI/2.0, Compatibility.PI*2.0);
+	    Cairo.cairo_arc(cairo, fw - 1, fh - 1, 1, 0, Compatibility.PI/2.0);
+	    Cairo.cairo_arc(cairo, 1, fh - 1, 1, Compatibility.PI/2, Compatibility.PI);
+	    Cairo.cairo_arc(cairo, 1, 1, 1, Compatibility.PI, 270.0*Compatibility.PI/180.0);
+		Cairo.cairo_close_path(cairo);
+		Cairo.cairo_restore(cairo);
 		}
 		Cairo.cairo_stroke(cairo);
 		return;
@@ -2135,20 +2135,20 @@
 		if (naw == 0 || nah == 0) {
 			Cairo.cairo_rectangle(cairo, x, y, width, height);
 		} else {
-			float naw2 = naw / 2f;
-			float nah2 = nah / 2f;
-			float fw = nw / naw2;
-			float fh = nh / nah2;
-			Cairo.cairo_save(cairo);
-			Cairo.cairo_translate(cairo, nx, ny);
-			Cairo.cairo_scale(cairo, naw2, nah2);
-			Cairo.cairo_move_to(cairo, fw - 1, 0);
-		    Cairo.cairo_arc(cairo, fw - 1, 1, 1, Compatibility.PI + Compatibility.PI/2.0, Compatibility.PI*2.0);
-		    Cairo.cairo_arc(cairo, fw - 1, fh - 1, 1, 0, Compatibility.PI/2.0);
-		    Cairo.cairo_arc(cairo, 1, fh - 1, 1, Compatibility.PI/2, Compatibility.PI);
-		    Cairo.cairo_arc(cairo, 1, 1, 1, Compatibility.PI, 270.0*Compatibility.PI/180.0);		
-			Cairo.cairo_close_path(cairo);
-			Cairo.cairo_restore(cairo);
+		float naw2 = naw / 2f;
+		float nah2 = nah / 2f;
+		float fw = nw / naw2;
+		float fh = nh / nah2;
+		Cairo.cairo_save(cairo);
+		Cairo.cairo_translate(cairo, nx, ny);
+		Cairo.cairo_scale(cairo, naw2, nah2);
+		Cairo.cairo_move_to(cairo, fw - 1, 0);
+	    Cairo.cairo_arc(cairo, fw - 1, 1, 1, Compatibility.PI + Compatibility.PI/2.0, Compatibility.PI*2.0);
+	    Cairo.cairo_arc(cairo, fw - 1, fh - 1, 1, 0, Compatibility.PI/2.0);
+	    Cairo.cairo_arc(cairo, 1, fh - 1, 1, Compatibility.PI/2, Compatibility.PI);
+	    Cairo.cairo_arc(cairo, 1, 1, 1, Compatibility.PI, 270.0*Compatibility.PI/180.0);		
+		Cairo.cairo_close_path(cairo);
+		Cairo.cairo_restore(cairo);
 		}
 		Cairo.cairo_fill(cairo);
 		return;
@@ -2914,7 +2914,7 @@
 		Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
 		data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET);
 	} else if (OS.INIT_CAIRO) {
-		 initCairo();
+		initCairo();
 	}
 	setClipping(data.clipRgn);
 	if ((data.style & SWT.MIRRORED) != 0) {
@@ -2930,31 +2930,31 @@
 	if (cairo != 0) return;
 	if (OS.GTK_VERSION < OS.VERSION(2, 17, 0)) {
 		int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
-		int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
-		int /*long*/ xDrawable = 0;
-		int translateX = 0, translateY = 0;
-		int /*long*/ drawable = data.drawable;
-		if (data.image != null) {
-			xDrawable = OS.GDK_PIXMAP_XID(drawable);
-		} else {
-			if (!data.realDrawable) {
-				int[] x = new int[1], y = new int[1];
-				int /*long*/ [] real_drawable = new int /*long*/ [1];
-				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];
-				translateY = -y[0];
-			}
-		}
-		int[] w = new int[1], h = new int[1];
-		OS.gdk_drawable_get_size(drawable, w, h);
-		int width = w[0], height = h[0];
-		int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
-		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);
-		Cairo.cairo_surface_destroy(surface);
+	int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+	int /*long*/ xDrawable = 0;
+	int translateX = 0, translateY = 0;
+	int /*long*/ drawable = data.drawable;
+	if (data.image != null) {
+		xDrawable = OS.GDK_PIXMAP_XID(drawable);
 	} else {
+		if (!data.realDrawable) {
+		int[] x = new int[1], y = new int[1];
+		int /*long*/ [] real_drawable = new int /*long*/ [1];
+		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];
+		translateY = -y[0];
+	}
+	}
+	int[] w = new int[1], h = new int[1];
+	OS.gdk_drawable_get_size(drawable, w, h);
+	int width = w[0], height = h[0];
+	int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
+	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);
+	Cairo.cairo_surface_destroy(surface);
+	} else {
 		data.cairo = cairo = OS.gdk_cairo_create(data.drawable);
 	}
 	if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -3267,7 +3267,7 @@
 	if (OS.GTK_VERSION >= OS.VERSION(2,18,0) && data.drawable != 0) {
 		OS.gdk_cairo_reset_clip(cairo, data.drawable);
 	} else {
-		Cairo.cairo_reset_clip(cairo);
+	Cairo.cairo_reset_clip(cairo);
 	}
 	if (damageRgn != 0) {
 		double[] matrix = new double[6];
@@ -4004,7 +4004,7 @@
 	double[] identity = identity();
 	if (transform != null) {
 		Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
-	} 
+	}
 	Cairo.cairo_set_matrix(cairo, identity);
 	data.state &= ~DRAW_OFFSET;
 }
@@ -4039,7 +4039,7 @@
 		}
 	}
 	if (!OS.USE_CAIRO) {
-		OS.gdk_gc_set_function(handle, xor ? OS.GDK_XOR : OS.GDK_COPY);
+	OS.gdk_gc_set_function(handle, xor ? OS.GDK_XOR : OS.GDK_COPY);
 	}
 	data.xorMode = xor;
 }
Index: org/eclipse/swt/graphics/DeviceData.java
===================================================================
--- org/eclipse/swt/graphics/DeviceData.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/graphics/DeviceData.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -14,15 +14,15 @@
 public class DeviceData {
 	/**
 	 * This field is platform dependent.
-	 * <p>
+	* <p>
 	 * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
 	 * public API. It is marked protected only so that it can be shared
 	 * within the packages provided by SWT. It is not available on all
-	 * platforms and should never be accessed from application code.
-	 * </p>
+	* platforms and should never be accessed from application code.
+	* </p>
 	 * 
 	 * @noreference This field is not intended to be referenced by clients.
-	 */
+	*/
 	public String display_name;
 
 	/**
Index: org/eclipse/swt/events/GestureEvent.java
===================================================================
--- org/eclipse/swt/events/GestureEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/events/GestureEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -23,7 +23,7 @@
  * @since 3.7
  */
 public class GestureEvent extends TypedEvent {
-
+	
 	/**
 	 * The state of the keyboard modifier keys and mouse masks
 	 * at the time the event was generated.
@@ -32,7 +32,7 @@
 	 * @see org.eclipse.swt.SWT#BUTTON_MASK
 	 */
 	public int stateMask;
-
+	
 	/**
 	 * The gesture type.
 	 * <p><ul>
@@ -55,13 +55,13 @@
 	 * gesture was performed. 
 	 */
 	public int x;
-
+	
 	/**
 	 * The meaning of this field is dependent on the value of the <code>detail</code> field
 	 * and the platform.  It can represent either the y coordinate of the centroid of the
 	 * touches that make up the gesture, or the y coordinate of the cursor at the time the
 	 * gesture was performed. 
-	 */
+	 */	
 	public int y;
 
 	/**
@@ -114,9 +114,9 @@
 	 * Setting it to <code>false</code> will cancel the operation.
 	 */
 	public boolean doit;
-
+	
 	static final long serialVersionUID = -8348741538373572182L;
-
+	
 /**
  * Constructs a new instance of this class based on the
  * information in the given untyped event.
Index: org/eclipse/swt/events/TouchEvent.java
===================================================================
--- org/eclipse/swt/events/TouchEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/events/TouchEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -23,7 +23,7 @@
  * @since 3.7
  */
 public class TouchEvent extends TypedEvent {
-
+	
 	/**
 	 * The set of touches representing the state of all contacts with touch input
 	 * device at the time the event was generated.
@@ -40,19 +40,19 @@
 	 * @see org.eclipse.swt.SWT#BUTTON_MASK
 	 */
 	public int stateMask;
-
+	
 	/**
 	 * The widget-relative x coordinate of the pointer
 	 * at the time the touch occurred.
 	 */
 	public int x;
-
+	
 	/**
 	 * The widget-relative y coordinate of the pointer
 	 * at the time the touch occurred.
 	 */	
 	public int y;
-
+	
 	static final long serialVersionUID = -8348741538373572182L;
 	
 /**
Index: org/eclipse/swt/events/SegmentEvent.java
===================================================================
--- org/eclipse/swt/events/SegmentEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/events/SegmentEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,100 +1,100 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.events;
-
-import org.eclipse.swt.widgets.Event;
-
-/**
- * This event is sent to SegmentListeners when a text content is to be modified.
- * The segments field can be used in conjunction with the segmentsChars field or
- * by itself. Setting only the segmentsChars field has no effect. When used by
- * itself, the segments field specify text ranges that should be treated as
- * separate segments.
- * <p>
- * The elements in the segments field specify the start offset of a segment
- * relative to the start of the text. They must follow the following rules:
- * <ul>
- * <li>elements must be in ascending order and must not have duplicates
- * <li>elements must not exceed the text length
- * </ul>
- * In addition, the first element may be set to zero and the last element may 
- * be set to the end of the line but this is not required.
- *
- * The segments field may be left null if the entire text content doesn't
- * require segmentation.
- * </p>
- * A SegmentListener may be used when adjacent segments of right-to-left text
- * should not be reordered relative to each other. For example, within a Java
- * editor, you may wish multiple right-to-left string literals to be reordered
- * differently than the bidi algorithm specifies.  
- *
- * Example:
- * <pre>
- * 	stored text = "R1R2R3" + "R4R5R6"
- *		R1 to R6 are right-to-left characters. The quotation marks
- * 		are part of the text. The text is 13 characters long.
- * 
- * 	segments = null: 
- * 		entire text content will be reordered and thus the two R2L segments 
- * 		swapped (as per the bidi algorithm). 
- *		visual display (rendered on screen) = "R6R5R4" + "R3R2R1"
- * 
- * 	segments = [0, 5, 8]	
- * 		"R1R2R3" will be reordered, followed by [blank]+[blank] and 
- * 		"R4R5R6". 
- *		visual display = "R3R2R1" + "R6R5R4"
- * </pre>
- * 
- * <p>
- * The segments and segementsChars fields can be used together to obtain different
- * types of bidi reordering and text display. The application can use these two fields
- * to insert Unicode Control Characters in specific offsets in the text, the character
- * at segmentsChars[i] is inserted at the offset specified by segments[i]. When both fields 
- * are set, the rules for the segments field are less restrictive:
- * <ul>
- * <li>elements must be in ascending order, duplicates are allowed
- * <li>elements must not exceed the text length
- * </ul>
- * </p>
- *
- * @since 3.8
- */
-
-public class SegmentEvent extends TypedEvent {
-
-	/** 
-	 * The start offset of the <code>lineText</code> relative to text (always zero for single line widget) 
-	 */
-	public int lineOffset;
-	
-	/** 
-	 * Text used to calculate the segments 
-	 */			
-	public String lineText;
-
-	/**
-	 * Text ranges that should be treated as separate segments (e.g. for bidi reordering)
-	 */
-	public int[] segments;
-
-	/**
-	 * Characters to be used in the segment boundaries (optional)
-	 */
-	public char[] segmentsChars;
-
-	static final long serialVersionUID = -2414889726745247762L;
-	
-	public SegmentEvent(Event e) {
-		super(e);
-		lineText = e.text;
-		lineOffset = e.detail;
-	}
-}
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.events;
+
+import org.eclipse.swt.widgets.Event;
+
+/**
+ * This event is sent to SegmentListeners when a text content is to be modified.
+ * The segments field can be used in conjunction with the segmentsChars field or
+ * by itself. Setting only the segmentsChars field has no effect. When used by
+ * itself, the segments field specify text ranges that should be treated as
+ * separate segments.
+ * <p>
+ * The elements in the segments field specify the start offset of a segment
+ * relative to the start of the text. They must follow the following rules:
+ * <ul>
+ * <li>elements must be in ascending order and must not have duplicates
+ * <li>elements must not exceed the text length
+ * </ul>
+ * In addition, the first element may be set to zero and the last element may 
+ * be set to the end of the line but this is not required.
+ *
+ * The segments field may be left null if the entire text content doesn't
+ * require segmentation.
+ * </p>
+ * A SegmentListener may be used when adjacent segments of right-to-left text
+ * should not be reordered relative to each other. For example, within a Java
+ * editor, you may wish multiple right-to-left string literals to be reordered
+ * differently than the bidi algorithm specifies.  
+ *
+ * Example:
+ * <pre>
+ * 	stored text = "R1R2R3" + "R4R5R6"
+ *		R1 to R6 are right-to-left characters. The quotation marks
+ * 		are part of the text. The text is 13 characters long.
+ * 
+ * 	segments = null: 
+ * 		entire text content will be reordered and thus the two R2L segments 
+ * 		swapped (as per the bidi algorithm). 
+ *		visual display (rendered on screen) = "R6R5R4" + "R3R2R1"
+ * 
+ * 	segments = [0, 5, 8]	
+ * 		"R1R2R3" will be reordered, followed by [blank]+[blank] and 
+ * 		"R4R5R6". 
+ *		visual display = "R3R2R1" + "R6R5R4"
+ * </pre>
+ * 
+ * <p>
+ * The segments and segementsChars fields can be used together to obtain different
+ * types of bidi reordering and text display. The application can use these two fields
+ * to insert Unicode Control Characters in specific offsets in the text, the character
+ * at segmentsChars[i] is inserted at the offset specified by segments[i]. When both fields 
+ * are set, the rules for the segments field are less restrictive:
+ * <ul>
+ * <li>elements must be in ascending order, duplicates are allowed
+ * <li>elements must not exceed the text length
+ * </ul>
+ * </p>
+ *
+ * @since 3.8
+ */
+
+public class SegmentEvent extends TypedEvent {
+
+	/** 
+	 * The start offset of the <code>lineText</code> relative to text (always zero for single line widget) 
+	 */
+	public int lineOffset;
+	
+	/** 
+	 * Text used to calculate the segments 
+	 */			
+	public String lineText;
+
+	/**
+	 * Text ranges that should be treated as separate segments (e.g. for bidi reordering)
+	 */
+	public int[] segments;
+
+	/**
+	 * Characters to be used in the segment boundaries (optional)
+	 */
+	public char[] segmentsChars;
+
+	static final long serialVersionUID = -2414889726745247762L;
+	
+	public SegmentEvent(Event e) {
+		super(e);
+		lineText = e.text;
+		lineOffset = e.detail;
+	}
+}
Index: org/eclipse/swt/events/SegmentListener.java
===================================================================
--- org/eclipse/swt/events/SegmentListener.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/events/SegmentListener.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,38 +1,38 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2012 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
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.events;
+
+import org.eclipse.swt.internal.SWTEventListener;
+
+/**
+ * This listener interface may be implemented in order to receive
+ * SegmentEvents.
+ * @see SegmentEvent
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.events;
-
-import org.eclipse.swt.internal.SWTEventListener;
-
-/**
- * This listener interface may be implemented in order to receive
- * SegmentEvents.
- * @see SegmentEvent
- *
  * @since 3.8
- */
-public interface SegmentListener extends SWTEventListener {
-
-/**
- * This method is called when text content is being modified. 
- * <p>
- * The following event fields are used:<ul>
- * <li>event.text text content (input)</li>
- * <li>event.segmentsChars characters that should be inserted (output)</li>
- * <li>event.segments text offsets for segment characters (output)</li>
- * </ul>
- *
- * @param event the given event
- * @see SegmentEvent
- */
-public void getSegments(SegmentEvent event);
-
-}
+ */
+public interface SegmentListener extends SWTEventListener {
+
+/**
+ * This method is called when text content is being modified. 
+ * <p>
+ * The following event fields are used:<ul>
+ * <li>event.text text content (input)</li>
+ * <li>event.segmentsChars characters that should be inserted (output)</li>
+ * <li>event.segments text offsets for segment characters (output)</li>
+ * </ul>
+ *
+ * @param event the given event
+ * @see SegmentEvent
+ */
+public void getSegments(SegmentEvent event);
+
+}
Index: org/eclipse/swt/dnd/DND.java
===================================================================
--- org/eclipse/swt/dnd/DND.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/DND.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -162,7 +162,7 @@
 	
 	/**
 	 * DropTarget drag under effect: The widget is scrolled up or down to allow the user to drop on items that 
-	 * are not currently visible; applies to tables and trees (value is 8).
+	 * are not currently visible;  applies to tables and trees (value is 8).
 	 */	
 	public static final int FEEDBACK_SCROLL = 8;
 	
Index: org/eclipse/swt/dnd/TreeDropTargetEffect.java
===================================================================
--- org/eclipse/swt/dnd/TreeDropTargetEffect.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/TreeDropTargetEffect.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -170,7 +170,7 @@
 						if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
 							OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y - cellRect.height, tx, ty);
 						} else {
-							OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y - cellRect.height, tx, ty);
+						OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y - cellRect.height, tx, ty);
 						}
 						OS.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
 					} else {
Index: org/eclipse/swt/dnd/HTMLTransfer.java
===================================================================
--- org/eclipse/swt/dnd/HTMLTransfer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/HTMLTransfer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -87,14 +87,14 @@
 	if ( !isSupportedType(transferData) ||  transferData.pValue == 0 ) return null;
 	/* Ensure byteCount is a multiple of 2 bytes */
 	int size = (transferData.format * transferData.length / 8) / 2 * 2;
-	if (size <= 0) return null;
+	if (size <= 0) return null;			
 	char[] bom = new char[1]; // look for a Byte Order Mark
 	if (size > 1) OS.memmove (bom, transferData.pValue, 2);
 	String string;
 	if (bom[0] == '\ufeff' || bom[0] == '\ufffe') {
 		// utf16
-		char[] chars = new char [size/2];
-		OS.memmove (chars, transferData.pValue, size);
+	char[] chars = new char [size/2];
+	OS.memmove (chars, transferData.pValue, size);
 		string = new String (chars);
 	} else {
 		byte[] utf8 = new byte[size];
Index: org/eclipse/swt/dnd/DropTarget.java
===================================================================
--- org/eclipse/swt/dnd/DropTarget.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/DropTarget.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.dnd;
 
@@ -238,6 +239,9 @@
 			control.getDisplay().timerExec(delay, dragOverHeartbeat);
 		}
 	};
+        // <QFS>
+        getDisplay().runDNDCreationHooks(this);
+        // </QFS>
 }
 
 static int checkStyle (int style) {
@@ -442,7 +446,7 @@
 		selectedDataType = null;
 		selectedOperation = DND.DROP_NONE;
 	}
-	
+		
 	DNDEvent event = new DNDEvent();
 	if (!setEventData(context, x, y, time, event)) {
 		keyOperation = -1;
Index: org/eclipse/swt/dnd/TableDragSourceEffect.java
===================================================================
--- org/eclipse/swt/dnd/TableDragSourceEffect.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/TableDragSourceEffect.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -99,7 +99,7 @@
 		if (count == 1) {
 			int /*long*/ path = OS.g_list_nth_data (list, 0);
 			int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
-			dragSourceImage =  Image.gtk_new(display, SWT.ICON, pixmap, 0);
+			dragSourceImage =  Image.gtk_new(display, SWT.ICON, pixmap, 0); 
 			OS.gtk_tree_path_free (path);
 		} else {
 			int width = 0, height = 0;
Index: org/eclipse/swt/dnd/FileTransfer.java
===================================================================
--- org/eclipse/swt/dnd/FileTransfer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/FileTransfer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -144,15 +144,15 @@
 		if (terminator) {
 			if (!(gnomeList && offset == 0)) {
 				/* The content of the first line in a gnome-list is always either 'copy' or 'cut' */
-				int size =  i - offset;
-				int /*long*/ file = OS.g_malloc(size + 1);
-				byte[] fileBuffer = new byte[size + 1];
-				System.arraycopy(temp, offset, fileBuffer, 0, size);
-				OS.memmove(file, fileBuffer, size + 1);
-				int /*long*/[] newFiles = new int /*long*/[files.length + 1];
-				System.arraycopy(files, 0, newFiles, 0, files.length);
-				newFiles[files.length] = file;
-				files = newFiles;
+			int size =  i - offset;
+			int /*long*/ file = OS.g_malloc(size + 1);
+			byte[] fileBuffer = new byte[size + 1];
+			System.arraycopy(temp, offset, fileBuffer, 0, size);
+			OS.memmove(file, fileBuffer, size + 1);
+			int /*long*/[] newFiles = new int /*long*/[files.length + 1];
+			System.arraycopy(files, 0, newFiles, 0, files.length);
+			newFiles[files.length] = file;
+			files = newFiles;
 			}
 			offset = i + sepLength;
 		}
Index: org/eclipse/swt/dnd/ImageTransfer.java
===================================================================
--- org/eclipse/swt/dnd/ImageTransfer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/ImageTransfer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -91,8 +91,8 @@
 	Image image = new Image(Display.getCurrent(), imgData);	
  	int /*long*/ pixbuf = ImageList.createPixbuf(image);
 	if (pixbuf != 0) {
-		String typeStr = "";
-		if (transferData.type ==  JPEG_ID) typeStr = "jpeg";
+	String typeStr = "";
+	if (transferData.type ==  JPEG_ID) typeStr = "jpeg";
 		else if (transferData.type ==  PNG_ID) typeStr = "png";
 		else if (transferData.type ==  BMP_ID) typeStr = "bmp";
 		else if (transferData.type ==  EPS_ID) typeStr = "eps";
@@ -103,16 +103,16 @@
 		else if (transferData.type ==  XBM_ID) typeStr = "xbm";
 		else if (transferData.type ==  XPM_ID) typeStr = "xpm";
 		else if (transferData.type ==  XV_ID) typeStr = "xv";
-		byte[] type = Converter.wcsToMbcs(null, typeStr , true);
-		int /*long*/ [] buffer = new int /*long*/ [1];
-		int /*long*/ [] len = new int /*long*/ [1];
-		if (type == null) return;
-		OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
-		OS.g_object_unref(pixbuf);
-		transferData.pValue = buffer[0];
-		transferData.length = (int)(len[0] + 3) / 4 * 4;
-		transferData.result = 1;
-		transferData.format = 32;
+	byte[] type = Converter.wcsToMbcs(null, typeStr , true);
+	int /*long*/ [] buffer = new int /*long*/ [1];
+	int /*long*/ [] len = new int /*long*/ [1];
+	if (type == null) return;
+	OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
+	OS.g_object_unref(pixbuf);
+	transferData.pValue = buffer[0];
+	transferData.length = (int)(len[0] + 3) / 4 * 4;
+	transferData.result = 1;
+	transferData.format = 32;
 	}
 	image.dispose();
 }
@@ -132,14 +132,14 @@
 	if (transferData.length > 0) {
 		int /*long*/ loader = OS.gdk_pixbuf_loader_new();
 		try {
-			OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null);
-			OS.gdk_pixbuf_loader_close(loader, null);
-			int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);
-			if (pixbuf != 0) {
+		OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null);
+		OS.gdk_pixbuf_loader_close(loader, null);
+		int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);
+		if (pixbuf != 0) {
 				Image img = Image.gtk_new_from_pixbuf(Display.getCurrent(), SWT.BITMAP, pixbuf);
-				imgData = img.getImageData();
-				img.dispose();
-			}		
+			imgData = img.getImageData();
+			img.dispose();
+		}		
 		} finally {
 			OS.g_object_unref(loader);
 		}
Index: org/eclipse/swt/dnd/DropTargetEffect.java
===================================================================
--- org/eclipse/swt/dnd/DropTargetEffect.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/DropTargetEffect.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -100,7 +100,7 @@
 		coordinates = table.toControl(coordinates);
 		TableItem item = table.getItem(coordinates);
 		if (item != null) return item;
-		Rectangle area = table.getClientArea();
+			Rectangle area = table.getClientArea();
 		int tableBottom = area.y + area.height;
 		int itemCount = table.getItemCount();
 		for (int i=table.getTopIndex(); i<itemCount; i++) {
@@ -110,7 +110,7 @@
 			rect.width = area.width;
 			if (rect.contains(coordinates)) return item;
 			if (rect.y > tableBottom) break;
-		}
+					}
 		return null;
 	}
 	
Index: org/eclipse/swt/dnd/TreeDragSourceEffect.java
===================================================================
--- org/eclipse/swt/dnd/TreeDragSourceEffect.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/TreeDragSourceEffect.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -98,7 +98,7 @@
 		if (count == 1) {
 			int /*long*/ path = OS.g_list_nth_data (list, 0);
 			int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
-			dragSourceImage =  Image.gtk_new(display, SWT.ICON, pixmap, 0);
+			dragSourceImage =  Image.gtk_new(display, SWT.ICON, pixmap, 0); 
 			OS.gtk_tree_path_free (path);
 		} else {
 			int width = 0, height = 0;
Index: org/eclipse/swt/dnd/DragSource.java
===================================================================
--- org/eclipse/swt/dnd/DragSource.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/dnd/DragSource.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.dnd;
 
@@ -200,6 +201,9 @@
 			onDispose();
 		}
 	});
+        // <QFS>
+        getDisplay().runDNDCreationHooks(this);
+        // </QFS>
 }
 
 static int checkStyle (int style) {
Index: org/eclipse/swt/widgets/Tree.java
===================================================================
--- org/eclipse/swt/widgets/Tree.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Tree.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -17,6 +18,11 @@
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class provide a selectable user interface object
  * that displays a hierarchy of items and issues notification when an
@@ -89,7 +95,7 @@
 	int drawState, drawFlags;
 	GdkColor drawForeground;
 	boolean ownerDraw, ignoreSize, ignoreAccessibility;
-	
+
 	static final int ID_COLUMN = 0;
 	static final int CHECKED_COLUMN = 1;
 	static final int GRAYED_COLUMN = 2;
@@ -104,6 +110,14 @@
 	static final int CELL_FONT = 4;
 	static final int CELL_TYPES = CELL_FONT + 1;
 
+// <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Tree");
+// </QFS>
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -110,7 +124,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -212,7 +226,7 @@
 	* applications have consistent scroll bar behavior.
 	*/
 	if ((style & SWT.NO_SCROLL) == 0) {
-		style |= SWT.H_SCROLL | SWT.V_SCROLL;
+	style |= SWT.H_SCROLL | SWT.V_SCROLL;
 	}
 	/* GTK is always FULL_SELECTION */
 	style |= SWT.FULL_SELECTION;
@@ -254,7 +268,7 @@
 			if (ptr [0] != 0) OS.g_object_unref (ptr [0]);
 		} else {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1); 
+			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1);
 			if (ptr [0] != 0) {
 				OS.g_object_set (cell, OS.text, ptr[0], 0);
 				OS.g_free (ptr[0]);
@@ -262,14 +276,14 @@
 		}
 	}
 	if (customDraw) {
-		if (!ownerDraw) {
-			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
-			if (ptr [0] != 0) {
-				OS.g_object_set (cell, OS.cell_background_gdk, ptr[0], 0);
-				OS.gdk_color_free (ptr [0]);
+			if (!ownerDraw) {
+				ptr [0] = 0;
+				OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
+				if (ptr [0] != 0) {
+					OS.g_object_set (cell, OS.cell_background_gdk, ptr[0], 0);
+					OS.gdk_color_free (ptr [0]);
+				}
 			}
-		}
 		if (!isPixbuf) {
 			ptr [0] = 0;
 			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
@@ -392,7 +406,7 @@
 	//int [] width = new int [1];
 	//OS.gtk_tree_view_column_cell_get_size (column, null, null, null, width, null);
 	//return width [0];
-	
+
 	int width = 0;
 	int [] w = new int [1];
 	int /*long*/ path = 0;
@@ -467,10 +481,10 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see SWT#VIRTUAL
  * @see SWT#SetData
- * 
+ *
  * @since 3.2
  */
 public void clear(int index, boolean all) {
@@ -496,7 +510,7 @@
  * attributes of the items are set to their default values. If the
  * tree was created with the <code>SWT.VIRTUAL</code> style, these
  * attributes are requested again as needed.
- * 
+ *
  * @param all <code>true</code> if all child items should be cleared
  * recursively, and <code>false</code> otherwise
  *
@@ -504,10 +518,10 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see SWT#VIRTUAL
  * @see SWT#SetData
- * 
+ *
  * @since 3.2
  */
 public void clearAll (boolean all) {
@@ -554,7 +568,7 @@
 		int [] ptr1 = new int [1];
 		do {
 			int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-			if (newItem == 0) error (SWT.ERROR_NO_HANDLES);	
+			if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
 			OS.gtk_tree_store_append (newModel, newItem, newParent);
 			OS.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1);
 			int index = ptr1[0];
@@ -573,8 +587,8 @@
 						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
 						OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
 						if (ptr [0] != 0) {
-							if (types [j] == OS.G_TYPE_STRING ()) {
-								OS.g_free ((ptr [0]));
+						if (types [j] == OS.G_TYPE_STRING ()) {
+							OS.g_free ((ptr [0]));
 							} else if (types[j] == OS.GDK_TYPE_COLOR()) {
 								OS.gdk_color_free(ptr[0]);
 							} else if (types[j] == OS.GDK_TYPE_PIXBUF()) {
@@ -590,7 +604,7 @@
 						OS.gtk_tree_store_set (newModel, newItem, newIndex, ptr [0], -1);
 						if (ptr[0] != 0) {
 							if (types [newIndex] == OS.G_TYPE_STRING ()) {
-								OS.g_free ((ptr [0]));
+							OS.g_free ((ptr [0]));
 							} else if (types[newIndex] == OS.GDK_TYPE_COLOR()) {
 								OS.gdk_color_free(ptr[0]);
 							} else if (types[newIndex] == OS.GDK_TYPE_PIXBUF()) {
@@ -606,7 +620,7 @@
 			}
 			// recurse through children
 			copyModel(oldModel, oldStart, newModel, newStart, types, iter, newItem, modelLength);
-			
+
 			if (item!= null) {
 				item.handle = newItem;
 			} else {
@@ -626,12 +640,12 @@
 
 void createColumn (TreeColumn column, int index) {
 /*
-* Bug in ATK. For some reason, ATK segments fault if 
+* Bug in ATK. For some reason, ATK segments fault if
 * the GtkTreeView has a column and does not have items.
-* The fix is to insert the column only when an item is 
+* The fix is to insert the column only when an item is
 * created.
 */
-	
+
 	int modelIndex = FIRST_COLUMN;
 	if (columnCount != 0) {
 		int modelLength = OS.gtk_tree_model_get_n_columns (modelHandle);
@@ -724,14 +738,14 @@
 	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
 	int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
-	OS.gtk_tree_view_set_headers_visible (handle, false);	
+	OS.gtk_tree_view_set_headers_visible (handle, false);
 	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
 	int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
 	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
 	if ((style & SWT.BORDER) != 0) OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
 	if ((style & SWT.VIRTUAL) != 0) {
-		OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
-	}
+			OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
+		}
 	if (!searchEnabled ()) {
 		/*
 		* Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE)
@@ -780,7 +794,7 @@
 	OS.gtk_widget_show (boxHandle);
 	OS.gtk_widget_show (labelHandle);
 	column.labelHandle = labelHandle;
-	column.imageHandle = imageHandle;	
+	column.imageHandle = imageHandle;
 	OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
 	int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle);
 	while (widget != handle) {
@@ -824,7 +838,7 @@
 	if (item.handle == 0) error(SWT.ERROR_NO_HANDLES);
 	/*
 	* Feature in GTK.  It is much faster to append to a tree store
-	* than to insert at the end using gtk_tree_store_insert(). 
+	* than to insert at the end using gtk_tree_store_insert().
 	*/
 	if (index == count) {
 		OS.gtk_tree_store_append (modelHandle, item.handle, parentIter);
@@ -841,8 +855,8 @@
 	if ((style & SWT.CHECK) != 0 && check) {
 		OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
 		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
-		if (!ownerDraw) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
+			if (!ownerDraw) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
 		if (ownerDraw) {
 			OS.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
 			OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
@@ -852,7 +866,7 @@
 	if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 	int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
-	
+
 	if (ownerDraw) {
 		OS.g_object_set_qdata (pixbufRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
 		OS.g_object_set_qdata (textRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
@@ -887,14 +901,14 @@
 
 	/* Add attributes */
 	OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
-	if (!ownerDraw) {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-	}
+		if (!ownerDraw) {
+			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+		}
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
-	
+
 	boolean customDraw = firstCustomDraw;
 	if (columnCount != 0) {
 		for (int i=0; i<columnCount; i++) {
@@ -1013,7 +1027,7 @@
 				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (int /*long*/)0, -1);
 				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (int /*long*/)0, -1);
 				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (int /*long*/)0, -1);
-				
+
 				Font [] cellFont = item.cellFont;
 				if (cellFont != null) {
 					if (columnCount == 0) {
@@ -1163,13 +1177,13 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Tree#getColumnOrder()
  * @see Tree#setColumnOrder(int[])
  * @see TreeColumn#getMoveable()
  * @see TreeColumn#setMoveable(boolean)
  * @see SWT#Move
- * 
+ *
  * @since 3.1
  */
 public TreeColumn getColumn (int index) {
@@ -1191,7 +1205,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public int getColumnCount () {
@@ -1210,7 +1224,7 @@
  * </p><p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
  * @return the current visual order of the receiver's items
@@ -1219,12 +1233,12 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Tree#setColumnOrder(int[])
  * @see TreeColumn#getMoveable()
  * @see TreeColumn#setMoveable(boolean)
  * @see SWT#Move
- * 
+ *
  * @since 3.2
  */
 public int [] getColumnOrder () {
@@ -1255,7 +1269,7 @@
 	int /*long*/[] types = new int /*long*/ [FIRST_COLUMN + (columnCount * CELL_TYPES)];
 	// per row data
 	types [ID_COLUMN] = OS.G_TYPE_INT ();
-	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN (); 
+	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
 	types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
 	types [FOREGROUND_COLUMN] = OS.GDK_TYPE_COLOR ();
 	types [BACKGROUND_COLUMN] = OS.GDK_TYPE_COLOR ();
@@ -1282,7 +1296,7 @@
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
  * @return the items in the receiver
@@ -1291,13 +1305,13 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Tree#getColumnOrder()
  * @see Tree#setColumnOrder(int[])
  * @see TreeColumn#getMoveable()
  * @see TreeColumn#setMoveable(boolean)
  * @see SWT#Move
- * 
+ *
  * @since 3.1
  */
 public TreeColumn [] getColumns () {
@@ -1320,8 +1334,8 @@
 	}
 	OS.g_free (iter);
 	OS.gtk_tree_path_free (path [0]);
-	return item;	
-} 
+	return item;
+}
 
 GdkColor getForegroundColor () {
 	return getTextColor ();
@@ -1331,12 +1345,12 @@
  * Returns the width in pixels of a grid line.
  *
  * @return the width of a grid line in pixels
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public int getGridLineWidth () {
@@ -1345,7 +1359,7 @@
 }
 
 /**
- * Returns the height of the receiver's header 
+ * Returns the height of the receiver's header
  *
  * @return the height of the header or zero if the header is not visible
  *
@@ -1353,8 +1367,8 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
- * @since 3.1 
+ *
+ * @since 3.1
  */
 public int getHeaderHeight () {
 	checkWidget ();
@@ -1397,7 +1411,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public boolean getHeaderVisible () {
@@ -1419,7 +1433,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public TreeItem getItem (int index) {
@@ -1436,8 +1450,8 @@
  * coordinate system of the receiver.
  * <p>
  * The item that is returned represents an item that could be selected by the user.
- * For example, if selection only occurs in items in the first column, then null is 
- * returned if the point is outside of the item. 
+ * For example, if selection only occurs in items in the first column, then null is
+ * returned if the point is outside of the item.
  * Note that the SWT.FULL_SELECTION style hint, which specifies the selection policy,
  * determines the extent of the selection.
  * </p>
@@ -1555,7 +1569,7 @@
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
  * @return the items
@@ -1610,7 +1624,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public boolean getLinesVisible() {
@@ -1661,11 +1675,11 @@
 /**
  * Returns an array of <code>TreeItem</code>s that are currently
  * selected in the receiver. The order of the items is unspecified.
- * An empty array indicates that no items are selected. 
+ * An empty array indicates that no items are selected.
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its selection, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  * @return an array representing the selection
  *
@@ -1702,7 +1716,7 @@
 	}
 	return new TreeItem [0];
 }
-	
+
 /**
  * Returns the number of selected items contained in the receiver.
  *
@@ -1724,15 +1738,15 @@
  * the receiver. The value may be null if no column shows
  * the sort indicator.
  *
- * @return the sort indicator 
+ * @return the sort indicator
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #setSortColumn(TreeColumn)
- * 
+ *
  * @since 3.2
  */
 public TreeColumn getSortColumn () {
@@ -1741,8 +1755,8 @@
 }
 
 /**
- * Returns the direction of the sort indicator for the receiver. 
- * The value will be one of <code>UP</code>, <code>DOWN</code> 
+ * Returns the direction of the sort indicator for the receiver.
+ * The value will be one of <code>UP</code>, <code>DOWN</code>
  * or <code>NONE</code>.
  *
  * @return the sort direction
@@ -1751,9 +1765,9 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #setSortDirection(int)
- * 
+ *
  * @since 3.2
  */
 public int getSortDirection () {
@@ -1789,13 +1803,13 @@
  * This item can change when items are expanded, collapsed, scrolled
  * or new items are added or removed.
  *
- * @return the item at the top of the receiver 
- * 
+ * @return the item at the top of the receiver
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public TreeItem getTopItem () {
@@ -1815,7 +1829,16 @@
 }
 
 int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
-	GdkEventButton gdkEvent = new GdkEventButton ();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_button_press_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("widget: ").add(widget)
+         .add(", event: ").add(event)
+         .add(", this: ").add(this)).log(Log.MTD);
+    }
+    // </QFS>
+    GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
 	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
 	int /*long*/ result = super.gtk_button_press_event (widget, event);
@@ -1822,7 +1845,7 @@
 	if (result != 0) return result;
 	/*
 	* Feature in GTK.  In a multi-select tree view, when multiple items are already
-	* selected, the selection state of the item is toggled and the previous selection 
+	* selected, the selection state of the item is toggled and the previous selection
 	* is cleared. This is not the desired behaviour when bringing up a popup menu.
 	* Also, when an item is reselected with the right button, the tree view issues
 	* an unwanted selection event. The workaround is to detect that case and not
@@ -1839,7 +1862,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	* Feature in GTK.  When the user clicks in a single selection GtkTreeView
 	* and there are no selected items, the first item is selected automatically
@@ -2031,7 +2054,7 @@
 	* the model can cause expansion to fail when using the multiple
 	* expansion keys (such as *).  The fix is to stop the expansion
 	* if there are model changes.
-	* 
+	*
 	* Note: This callback must return 0 for the collapsing
 	* animation to occur.
 	*/
@@ -2069,11 +2092,11 @@
 	* the model can cause expansion to fail when using the multiple
 	* expansion keys (such as *).  The fix is to stop the expansion
 	* if there are model changes.
-	* 
+	*
 	* Bug in GTK.  test-expand-row does not get called for each row
 	* in an expand all operation.  The fix is to block the initial
 	* expansion and only expand a single level.
-	* 
+	*
 	* Note: This callback must return 0 for the collapsing
 	* animation to occur.
 	*/
@@ -2141,9 +2164,9 @@
 
 void hideFirstColumn () {
 	int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
-	OS.gtk_tree_view_column_set_visible (firstColumn, false);	
+	OS.gtk_tree_view_column_set_visible (firstColumn, false);
 }
-	
+
 void hookEvents () {
 	super.hookEvents ();
 	int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);
@@ -2164,7 +2187,7 @@
 
 /**
  * Searches the receiver's list starting at the first column
- * (index 0) until a column is found that is equal to the 
+ * (index 0) until a column is found that is equal to the
  * argument, and returns the index of that column. If no column
  * is found, returns -1.
  *
@@ -2178,7 +2201,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public int indexOf (TreeColumn column) {
@@ -2192,7 +2215,7 @@
 
 /**
  * Searches the receiver's list starting at the first item
- * (index 0) until an item is found that is equal to the 
+ * (index 0) until an item is found that is equal to the
  * argument, and returns the index of that item. If no item
  * is found, returns -1.
  *
@@ -2207,7 +2230,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public int indexOf (TreeItem item) {
@@ -2219,7 +2242,7 @@
 	int depth = OS.gtk_tree_path_get_depth (path);
 	if (depth == 1) {
 		int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
-		if (indices != 0) {	
+		if (indices != 0) {
 			int[] temp = new int[1];
 			OS.memmove (temp, indices, 4);
 			index = temp[0];
@@ -2378,7 +2401,7 @@
 
 /**
  * Removes all of the items from the receiver.
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -2402,7 +2425,7 @@
 		OS.g_object_notify (handle, OS.model);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	
+
 	if (!searchEnabled ()) {
 		/*
 		* Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE)
@@ -2447,7 +2470,7 @@
 	checkWidget ();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	eventTable.unhook (SWT.Selection, listener);
-	eventTable.unhook (SWT.DefaultSelection, listener);	
+	eventTable.unhook (SWT.DefaultSelection, listener);
 }
 
 /**
@@ -2492,7 +2515,7 @@
 					if (columns [i].handle == columnHandle) {
 						columnIndex = i;
 						break;
-					}				
+					}
 				}
 			}
 			if (hooks (SWT.MeasureItem)) {
@@ -2543,7 +2566,7 @@
 			if (columns [i].handle == columnHandle) {
 				columnIndex = i;
 				break;
-			}				
+			}
 		}
 	}
 	if (item != null) {
@@ -2561,16 +2584,16 @@
 				OS.gdk_color_free(ptr[0]);
 			}
 			if ((flags & OS.GTK_CELL_RENDERER_SELECTED) != 0) drawState |= SWT.SELECTED;
-			if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;			
-			
+			if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
+
 			GdkRectangle rect = new GdkRectangle ();
 			int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
 			OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
 			OS.gtk_tree_path_free (path);
-			
+
 			if ((drawState & SWT.SELECTED) == 0) {
 				if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
-					Control control = findBackgroundControl ();
+				Control control = findBackgroundControl ();
 					if (control != null) {
 						drawBackground (control, window, 0, rect.x, rect.y, rect.width, rect.height);
 					}
@@ -2615,7 +2638,7 @@
 				if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
 				if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
 				if ((drawState & SWT.SELECTED) != 0) {
-					int /*long*/ style = OS.gtk_widget_get_style (widget);					
+					int /*long*/ style = OS.gtk_widget_get_style (widget);
 					//TODO - parity and sorted
 					byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
 					OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
@@ -2712,7 +2735,7 @@
 				event.width = contentWidth [0];
 				event.height = rect.height;
 				event.detail = drawState;
-				sendEvent (SWT.PaintItem, event);	
+				sendEvent (SWT.PaintItem, event);
 				gc.dispose();
 			}
 		}
@@ -2764,11 +2787,11 @@
 }
 /**
  * Display a mark indicating the point at which an item will be inserted.
- * The drop insert item has a visual hint to show where a dragged item 
+ * The drop insert item has a visual hint to show where a dragged item
  * will be inserted when dropped on the tree.
- * 
+ *
  * @param item the insert item.  Null will clear the insertion mark.
- * @param before true places the insert mark above 'item'. false places 
+ * @param before true places the insert mark above 'item'. false places
  *	the insert mark below 'item'.
  *
  * @exception IllegalArgumentException <ul>
@@ -2929,7 +2952,7 @@
 }
 
 /**
- * Sets the order that the items in the receiver should 
+ * Sets the order that the items in the receiver should
  * be displayed in to the given argument which is described
  * in terms of the zero-relative ordering of when the items
  * were added.
@@ -2944,12 +2967,12 @@
  *    <li>ERROR_NULL_ARGUMENT - if the item order is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the item order is not the same length as the number of items</li>
  * </ul>
- * 
+ *
  * @see Tree#getColumnOrder()
  * @see TreeColumn#getMoveable()
  * @see TreeColumn#setMoveable(boolean)
  * @see SWT#Move
- * 
+ *
  * @since 3.2
  */
 public void setColumnOrder (int [] order) {
@@ -2991,7 +3014,7 @@
 
 /**
  * Marks the receiver's header as visible if the argument is <code>true</code>,
- * and marks it invisible otherwise. 
+ * and marks it invisible otherwise.
  * <p>
  * If one of the receiver's ancestors is not visible or some
  * other condition makes the receiver not visible, marking
@@ -3004,7 +3027,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public void setHeaderVisible (boolean show) {
@@ -3028,7 +3051,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.1
  */
 public void setLinesVisible (boolean show) {
@@ -3100,7 +3123,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.2
  */
 public void setSelection (TreeItem item) {
@@ -3161,19 +3184,19 @@
 
 /**
  * Sets the column used by the sort indicator for the receiver. A null
- * value will clear the sort indicator.  The current sort column is cleared 
+ * value will clear the sort indicator.  The current sort column is cleared
  * before the new column is set.
  *
  * @param column the column used by the sort indicator or <code>null</code>
- * 
+ *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the column is disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the column is disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.2
  */
 public void setSortColumn (TreeColumn column) {
@@ -3190,16 +3213,16 @@
 }
 
 /**
- * Sets the direction of the sort indicator for the receiver. The value 
+ * Sets the direction of the sort indicator for the receiver. The value
  * can be one of <code>UP</code>, <code>DOWN</code> or <code>NONE</code>.
  *
- * @param direction the direction of the sort indicator 
+ * @param direction the direction of the sort indicator
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.2
  */
 public void setSortDirection  (int direction) {
@@ -3232,7 +3255,7 @@
  * </ul>
  *
  * @see Tree#getTopItem()
- * 
+ *
  * @since 2.1
  */
 public void setTopItem (TreeItem item) {
@@ -3249,7 +3272,7 @@
 		* However, prior to version 2.8 it does not scroll at all.  The fix is to determine
 		* the new location and use gtk_tree_view_scroll_to_point.
 		* If the widget is a pinhead, calling gtk_tree_view_scroll_to_point
-		* will have no effect. Therefore, it is still neccessary to call 
+		* will have no effect. Therefore, it is still neccessary to call
 		* gtk_tree_view_scroll_to_cell.
 		*/
 		OS.gtk_widget_realize (handle);
@@ -3307,10 +3330,10 @@
 	}
 }
 
-boolean showFirstColumn () {	
+boolean showFirstColumn () {
 	/*
 	* Bug in GTK.  If no columns are visible, changing the selection
-	* will fail.  The fix is to temporarily make a column visible. 
+	* will fail.  The fix is to temporarily make a column visible.
 	*/
 	int columnCount = Math.max (1, this.columnCount);
 	for (int i=0; i<columnCount; i++) {
@@ -3351,7 +3374,7 @@
 			OS.gtk_tree_path_append_index (tempPath, indices [i]);
 			OS.gtk_tree_view_expand_row (handle, tempPath, false);
 		}
-		OS.gtk_tree_path_free (tempPath);		
+		OS.gtk_tree_path_free (tempPath);
 	}
 	if (scroll) {
 		OS.gtk_widget_realize (handle);
@@ -3369,7 +3392,7 @@
 		if (!isHidden) {
 			if (ty[0] < visibleRect.y || ty[0] + cellRect.height > visibleRect.y + visibleRect.height) {
 				isHidden = true;
-			} 
+			}
 		}
 		if (isHidden) {
 			/*
@@ -3379,7 +3402,7 @@
 			* However, what actually happens is the cell is scrolled to the top.
 			* The fix is to determine the new location and use gtk_tree_view_scroll_to_point.
 			* If the widget is a pinhead, calling gtk_tree_view_scroll_to_point
-			* will have no effect. Therefore, it is still neccessary to 
+			* will have no effect. Therefore, it is still neccessary to
 			* call gtk_tree_view_scroll_to_cell.
 			*/
 			//	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, depth != 1, 0.5f, 0.0f);
Index: org/eclipse/swt/widgets/TableColumn.java
===================================================================
--- org/eclipse/swt/widgets/TableColumn.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TableColumn.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -650,7 +650,7 @@
  * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
Index: org/eclipse/swt/widgets/TableItem.java
===================================================================
--- org/eclipse/swt/widgets/TableItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TableItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -312,8 +312,8 @@
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 	
-	OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
-	rect.x += x [0];
+		OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
+		rect.x += x [0];
 		
 	if (parent.columnCount > 0) {
 		if (rect.x + rect.width > right) {
@@ -374,10 +374,10 @@
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	
 	if (index == 0 && (parent.style & SWT.CHECK) != 0) {
-		int [] x = new int [1], w = new int [1];
-		OS.gtk_tree_view_column_cell_get_position (column, parent.checkRenderer, x, w);
-		rect.x += x [0] + w [0];
-		rect.width -= x [0] + w [0];
+			int [] x = new int [1], w = new int [1];
+			OS.gtk_tree_view_column_cell_get_position (column, parent.checkRenderer, x, w);
+			rect.x += x [0] + w [0];
+			rect.width -= x [0] + w [0];
 	}
 	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
@@ -557,10 +557,10 @@
 	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
 	OS.gtk_tree_path_free (path);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-	int [] x = new int [1], w = new int[1];
-	OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
-	rect.x += x [0];
-	rect.width = w [0];
+		int [] x = new int [1], w = new int[1];
+		OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
+		rect.x += x [0];
+		rect.width = w [0];
 	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
@@ -689,8 +689,8 @@
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 	
-	OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
-	rect.x += x [0];
+		OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
+		rect.x += x [0];
 	if (parent.columnCount > 0) {
 		if (rect.x + rect.width > right) {
 			rect.width = Math.max (0, right - rect.x);
@@ -1157,23 +1157,23 @@
 	 * more space is required.
 	 */
 	if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
-		if (image != null) {
-			int /*long*/parentHandle = parent.handle;
-			int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
-			int [] w = new int [1];
-			int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
-			OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
-			if (w[0] < image.getBounds().width) {
-				/*
-				* There is no direct way to clear the cell renderer width so we
-				* are relying on the fact that it is done as part of modifying
-				* the style.
-				*/
-				int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
-				parent.modifyStyle (parentHandle, style);
-			}
-		} 
-	}
+			if (image != null) {
+				int /*long*/parentHandle = parent.handle;
+				int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+				int [] w = new int [1];
+				int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
+				OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
+				if (w[0] < image.getBounds().width) {
+					/*
+					* There is no direct way to clear the cell renderer width so we
+					* are relying on the fact that it is done as part of modifying
+					* the style.
+					*/
+					int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+					parent.modifyStyle (parentHandle, style);
+				}
+			} 
+		}
 	cached = true;
 }
 
Index: org/eclipse/swt/widgets/Shell.java
===================================================================
--- org/eclipse/swt/widgets/Shell.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Shell.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -659,9 +659,9 @@
 			if (!isUndecorated ()) {
 				OS.gtk_window_set_type_hint (shellHandle, OS.GDK_WINDOW_TYPE_HINT_DIALOG);
 			} else {
-				OS.gtk_window_set_skip_taskbar_hint (shellHandle, true);
+					OS.gtk_window_set_skip_taskbar_hint (shellHandle, true);
+				}
 			}
-		}
 		/*
 		* Feature in GTK.  The window size must be set when the window
 		* is created or it will not be allowed to be resized smaller that the
@@ -726,9 +726,9 @@
 						if (tooltipsHandle != 0 && OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
 						    OS.gtk_tooltips_enable (tooltipsHandle);
 						}
-						display.activeShell = this;
-						display.activePending = false;
-						sendEvent (SWT.Activate);
+					display.activeShell = this;
+					display.activePending = false;
+					sendEvent (SWT.Activate);
 						if (isDisposed ()) return 0;
 						if (isCustomResize ()) {
 							OS.gdk_window_invalidate_rect (OS.GTK_WIDGET_WINDOW (shellHandle), null, false);
@@ -1346,7 +1346,7 @@
 
 int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
 	if (widget == shellHandle) {
-		/* Stop menu mnemonics when the shell is disabled */
+	/* Stop menu mnemonics when the shell is disabled */
 		if ((state & DISABLED) != 0) return 1;
 		
 		if (menuBar != null && !menuBar.isDisposed ()) {
@@ -2272,9 +2272,9 @@
 		boolean update = false;
 		Shell shell = shells[i];
 		while (shell != null && shell != this && !shell.isUndecorated ()) {
-			shell = (Shell) shell.getParent ();
+				shell = (Shell) shell.getParent ();
 		}
-		if (shell != null && shell != this) update = true;
+			if (shell != null && shell != this) update = true;
 		if (update) {
 			if (minimized) {
 				if (shells[i].isVisible ()) {
@@ -2402,42 +2402,42 @@
 			same = true;
 		} else if (buffer != null && oldTooltip != 0) {
 			same = OS.strcmp (oldTooltip, buffer) == 0;
-		}
+			}
 		if (oldTooltip != 0) OS.g_free(oldTooltip);
 		if (same) return;
 
 		int /*long*/ eventPtr = 0;
 		if (OS.GTK_VERSION < OS.VERSION (2, 18, 0)) {
-			OS.gtk_widget_set_tooltip_text (rootWidget, null);
-			/*
-			 * Bug in GTK. In GTK 2.12, due to a miscalculation of window
-			 * coordinates, using gtk_tooltip_trigger_tooltip_query ()
+		OS.gtk_widget_set_tooltip_text (rootWidget, null);
+		/*
+		* Bug in GTK. In GTK 2.12, due to a miscalculation of window
+		* coordinates, using gtk_tooltip_trigger_tooltip_query ()
 			 * to update an existing a toboltip will result in the tooltip 
-			 * being displayed at a wrong position. The fix is to send out 
-			 * 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which 
-			 * contain the proper x and y coordinates.
-			 */
-			int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
-			if (tipWindow != 0) {
-				int [] x = new int [1], y = new int [1];
-				int /*long*/ window = OS.gdk_window_at_pointer (x, y);
-				int /*long*/ [] user_data = new int /*long*/ [1];
-				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);
-					GdkEventMotion event = new GdkEventMotion ();
-					event.type = OS.GDK_MOTION_NOTIFY;
-					event.window = OS.g_object_ref (tipWindow);
-					event.x = x [0];
-					event.y = y [0];
-					OS.gdk_window_get_origin (window, x, y);
-					event.x_root = event.x + x [0];
-					event.y_root = event.y + y [0];
-					OS.memmove (eventPtr, event, GdkEventMotion.sizeof);
-					OS.gtk_main_do_event (eventPtr);
-				}
+		* being displayed at a wrong position. The fix is to send out 
+		* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which 
+		* contain the proper x and y coordinates.
+		*/
+		int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
+		if (tipWindow != 0) {
+			int [] x = new int [1], y = new int [1];
+			int /*long*/ window = OS.gdk_window_at_pointer (x, y);
+			int /*long*/ [] user_data = new int /*long*/ [1];
+			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);
+				GdkEventMotion event = new GdkEventMotion ();
+				event.type = OS.GDK_MOTION_NOTIFY;
+				event.window = OS.g_object_ref (tipWindow);
+				event.x = x [0];
+				event.y = y [0];
+				OS.gdk_window_get_origin (window, x, y);
+				event.x_root = event.x + x [0];
+				event.y_root = event.y + y [0];
+				OS.memmove (eventPtr, event, GdkEventMotion.sizeof);
+				OS.gtk_main_do_event (eventPtr);
 			}
 		}
+		}
 		OS.gtk_widget_set_tooltip_text (rootWidget, buffer);
 		if (eventPtr != 0) {
 			OS.gtk_main_do_event (eventPtr);
@@ -2444,11 +2444,11 @@
 			OS.gdk_event_free (eventPtr);
 		}
 	} else {
-		byte [] buffer = null;
-		if (string != null && string.length () > 0) {
-			char [] chars = fixMnemonic (string, false);
-			buffer = Converter.wcsToMbcs (null, chars, true);
-		}
+	byte [] buffer = null;
+	if (string != null && string.length () > 0) {
+		char [] chars = fixMnemonic (string, false);
+		buffer = Converter.wcsToMbcs (null, chars, true);
+	}
 		int /*long*/ tipData = OS.gtk_tooltips_data_get(tipWidget);
 		if (tipData != 0) {
 			int /*long*/ oldTooltip = OS.GTK_TOOLTIPS_GET_TIP_TEXT(tipData);
@@ -2460,65 +2460,65 @@
 				}
 			}
 		}
-		if (tooltipsHandle == 0) {
-			tooltipsHandle = OS.gtk_tooltips_new ();
-			if (tooltipsHandle == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.g_object_ref (tooltipsHandle);
-			OS.gtk_object_sink (tooltipsHandle);
-		}
-	
-		/*
-		* Feature in GTK.  There is no API to position a tooltip.
-		* The fix is to connect to the size_allocate signal for
-		* the tooltip window and position it before it is mapped.
-		*
-		* Bug in Solaris-GTK.  Invoking gtk_tooltips_force_window()
-		* can cause a crash in older versions of GTK.  The fix is
-		* to avoid this call if the GTK version is older than 2.2.x.
+	if (tooltipsHandle == 0) {
+		tooltipsHandle = OS.gtk_tooltips_new ();
+		if (tooltipsHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		OS.g_object_ref (tooltipsHandle);
+		OS.gtk_object_sink (tooltipsHandle);
+	}
+
+	/*
+	* Feature in GTK.  There is no API to position a tooltip.
+	* The fix is to connect to the size_allocate signal for
+	* the tooltip window and position it before it is mapped.
+	*
+	* Bug in Solaris-GTK.  Invoking gtk_tooltips_force_window()
+	* can cause a crash in older versions of GTK.  The fix is
+	* to avoid this call if the GTK version is older than 2.2.x.
 		* The call is to be avoided on GTK versions newer than 2.12.0
 		* where it's deprecated.
-		*/
+	*/
 		OS.gtk_tooltips_force_window (tooltipsHandle);
-		int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);
-		if (tipWindow != 0 && tipWindow != tooltipWindow) {
-			OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
-			tooltipWindow = tipWindow;
-		}
-		
-		/*
-		* Bug in GTK.  If the cursor is inside the window when a new
-		* tooltip is set and the old tooltip is hidden, the new tooltip
-		* is not displayed until the mouse re-enters the window.  The
-		* fix is force the new tooltip to be active.
-		*/
-		boolean set = true;
-		if (tipWindow != 0) {
+	int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);
+	if (tipWindow != 0 && tipWindow != tooltipWindow) {
+		OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
+		tooltipWindow = tipWindow;
+	}
+	
+	/*
+	* Bug in GTK.  If the cursor is inside the window when a new
+	* tooltip is set and the old tooltip is hidden, the new tooltip
+	* is not displayed until the mouse re-enters the window.  The
+	* fix is force the new tooltip to be active.
+	*/
+	boolean set = true;
+	if (tipWindow != 0) {
 			if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) {
-				int [] x = new int [1], y = new int [1];
-				int /*long*/ window = OS.gdk_window_at_pointer (x, y);
-				if (window != 0) {
-					int /*long*/ [] user_data = new int /*long*/ [1];
-					OS.gdk_window_get_user_data (window, user_data);
+			int [] x = new int [1], y = new int [1];
+			int /*long*/ window = OS.gdk_window_at_pointer (x, y);
+			if (window != 0) {
+				int /*long*/ [] user_data = new int /*long*/ [1];
+				OS.gdk_window_get_user_data (window, user_data);
 					if (tipWidget == user_data [0]) {
-						/* 
-						* Feature in GTK.  Calling gtk_tooltips_set_tip() positions and
-						* shows the tooltip.  If the tooltip is already visible, moving
-						* it to a new location in the size_allocate signal causes flashing.
-						* The fix is to hide the tip window in the size_request signal
-						* and before the new tooltip is forced to be active. 
-						*/
-						set = false;
-						int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);
+					/* 
+					* Feature in GTK.  Calling gtk_tooltips_set_tip() positions and
+					* shows the tooltip.  If the tooltip is already visible, moving
+					* it to a new location in the size_allocate signal causes flashing.
+					* The fix is to hide the tip window in the size_request signal
+					* and before the new tooltip is forced to be active. 
+					*/
+					set = false;
+					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);
+					OS.gtk_widget_hide (tipWindow);
 						int /*long*/ data = OS.gtk_tooltips_data_get (tipWidget);
-						OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data);
+					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);
-					}
+					if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id);
 				}
 			}
 		}
+	}
 		if (set) OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
 	}
 		
Index: org/eclipse/swt/widgets/List.java
===================================================================
--- org/eclipse/swt/widgets/List.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/List.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1539,7 +1539,7 @@
 	if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
 		OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 	} else {
-		OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
+	OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 	}
 	if (ty[0] < visibleRect.y ) {
 		OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
Index: org/eclipse/swt/widgets/Control.java
===================================================================
--- org/eclipse/swt/widgets/Control.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Control.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -19,6 +20,11 @@
 import org.eclipse.swt.internal.cairo.*;
 import org.eclipse.swt.internal.gtk.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Control is the abstract superclass of all windowed user interface classes.
  * <p>
@@ -37,7 +43,7 @@
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
  * within the SWT implementation.
  * </p>
- * 
+ *
  * @see <a href="http://www.eclipse.org/swt/snippets/#control">Control snippets</a>
  * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
@@ -58,6 +64,14 @@
 	Accessible accessible;
 	Control labelRelation;
 
+// <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Control");
+// </QFS>
+
 Control () {
 }
 
@@ -67,7 +81,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -210,7 +224,7 @@
 	* have their own GtkFixed.  The fix is to look up the correct style
 	* for a child of a GtkNotebook and apply its background to any GtkFixed
 	* widgets that are direct children of an SWT TabFolder.
-	* 
+	*
 	* Note that this has to be when the theme settings changes and that it
 	* should not override the application background.
 	*/
@@ -237,12 +251,12 @@
  * constants <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
  *
  * @return the orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.7
  */
 public int getOrientation () {
@@ -275,7 +289,7 @@
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT], false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false);
-	
+
 	/* Connect enter/exit signals */
 	int /*long*/ enterExitHandle = enterExitHandle ();
 	int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
@@ -289,7 +303,7 @@
 	* correct GTK behavior but not correct for SWT.  The fix is to
 	* hook a signal after and stop the propagation using a negative
 	* event number to distinguish this case.
-	* 
+	*
 	* The signal is hooked to the fixedHandle to catch events sent to
 	* lightweight widgets.
 	*/
@@ -303,7 +317,7 @@
 	if (focusHandle != eventHandle) {
 		OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
 	}
-	
+
 	/* Connect the paint signal */
 	int /*long*/ paintHandle = paintHandle ();
 	int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK;
@@ -310,12 +324,12 @@
 	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);
 	/*
-	* As of GTK 2.17.11, obscured controls no longer send expose 
+	* As of GTK 2.17.11, obscured controls no longer send expose
 	* events. It is no longer necessary to track visiblity notify
 	* events.
 	*/
 	if (OS.GTK_VERSION < OS.VERSION (2, 17, 11)) {
-		OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [VISIBILITY_NOTIFY_EVENT], 0, display.closures [VISIBILITY_NOTIFY_EVENT], false);
+	OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [VISIBILITY_NOTIFY_EVENT], 0, display.closures [VISIBILITY_NOTIFY_EVENT], false);
 	}
 	OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT], true);
 
@@ -327,9 +341,9 @@
 		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);
 	}
-	
+
 	OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);
-   
+
 	int /*long*/ topHandle = topHandle ();
 	OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
 }
@@ -365,7 +379,7 @@
 
 /**
  * Prints the receiver and all children.
- * 
+ *
  * @param gc the gc where the drawing occurs
  * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
  *
@@ -377,7 +391,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.4
  */
 public boolean print (GC gc) {
@@ -414,7 +428,7 @@
 	OS.gdk_window_begin_paint_rect (window, rect);
 	int /*long*/ [] real_drawable = new int /*long*/ [1];
 	int [] x_offset = new int [1], y_offset = new int [1];
-	OS.gdk_window_get_internal_paint_info (window, real_drawable, x_offset, y_offset);	
+	OS.gdk_window_get_internal_paint_info (window, real_drawable, x_offset, y_offset);
 	int /*long*/ [] userData = new int /*long*/ [1];
 	OS.gdk_window_get_user_data (window, userData);
 	if (userData [0] != 0) {
@@ -502,8 +516,8 @@
  * best be displayed at. The width hint and height hint arguments
  * allow the caller to ask a control questions such as "Given a particular
  * width, how high does the control need to be to show all of the contents?"
- * To indicate that the caller does not wish to constrain a particular 
- * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 
+ * To indicate that the caller does not wish to constrain a particular
+ * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint.
  * </p>
  *
  * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)
@@ -579,7 +593,7 @@
 			state |= PARENT_BACKGROUND;
 			return;
 		}
-		if (composite == shell) break;		
+		if (composite == shell) break;
 		composite = composite.parent;
 	} while (true);
 }
@@ -618,14 +632,14 @@
  * best be displayed at. The width hint and height hint arguments
  * allow the caller to ask a control questions such as "Given a particular
  * width, how high does the control need to be to show all of the contents?"
- * To indicate that the caller does not wish to constrain a particular 
- * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 
+ * To indicate that the caller does not wish to constrain a particular
+ * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint.
  * </p><p>
  * If the changed flag is <code>true</code>, it indicates that the receiver's
  * <em>contents</em> have changed, therefore any caches that a layout manager
  * containing the control may have been keeping need to be flushed. When the
  * control is resized, the changed flag will be <code>false</code>, so layout
- * manager caches can be retained. 
+ * manager caches can be retained.
  * </p>
  *
  * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)
@@ -649,7 +663,7 @@
 	checkWidget();
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
-	return computeNativeSize (handle, wHint, hHint, changed);	
+	return computeNativeSize (handle, wHint, hHint, changed);
 }
 
 Point computeNativeSize (int /*long*/ h, int wHint, int hHint, boolean changed) {
@@ -703,10 +717,10 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Accessible#addAccessibleListener
  * @see Accessible#addAccessibleControlListener
- * 
+ *
  * @since 2.0
  */
 public Accessible getAccessible () {
@@ -747,7 +761,7 @@
 
 /**
  * Sets the receiver's size and location to the rectangular
- * area specified by the argument. The <code>x</code> and 
+ * area specified by the argument. The <code>x</code> and
  * <code>y</code> fields of the rectangle are relative to
  * the receiver's parent (or its display if its parent is null).
  * <p>
@@ -771,9 +785,9 @@
 
 /**
  * Sets the receiver's size and location to the rectangular
- * area specified by the arguments. The <code>x</code> and 
+ * area specified by the arguments. The <code>x</code> and
  * <code>y</code> arguments are relative to the receiver's
- * parent (or its display if its parent is null), unless 
+ * parent (or its display if its parent is null), unless
  * the receiver is a shell. In this case, the <code>x</code>
  * and <code>y</code> arguments are relative to the display.
  * <p>
@@ -804,8 +818,8 @@
 void modifyStyle (int /*long*/ handle, int /*long*/ style) {
 	super.modifyStyle(handle, style);
 	/*
-	* Bug in GTK.  When changing the style of a control that  
-	* has had a region set on it, the region is lost.  The 
+	* Bug in GTK.  When changing the style of a control that
+	* has had a region set on it, the region is lost.  The
 	* fix is to set the region again.
 	*/
 	if (region != null) OS.gdk_window_shape_combine_region (OS.GTK_WIDGET_WINDOW (topHandle ()), region.handle, 0, 0);
@@ -818,7 +832,7 @@
 	* Feature in GTK.  Calling gtk_fixed_move() to move a child causes
 	* the whole parent to redraw.  This is a performance problem. The
 	* fix is temporarily make the parent not visible during the move.
-	* 
+	*
 	* NOTE: Because every widget in SWT has an X window, the new and
 	* old bounds of the child are correctly redrawn.
 	*/
@@ -826,7 +840,7 @@
 	OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_VISIBLE);
 	OS.gtk_fixed_move (parentHandle, topHandle, x, y);
 	if ((flags & OS.GTK_VISIBLE) != 0) {
-		OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_VISIBLE);	
+		OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_VISIBLE);
 	}
 }
 
@@ -949,8 +963,8 @@
 /**
  * Returns a point describing the receiver's location relative
  * to its parent (or its display if its parent is null), unless
- * the receiver is a shell. In this case, the point is 
- * relative to the display. 
+ * the receiver is a shell. In this case, the point is
+ * relative to the display.
  *
  * @return the receiver's location
  *
@@ -974,9 +988,9 @@
 /**
  * Sets the receiver's location to the point specified by
  * the arguments which are relative to the receiver's
- * parent (or its display if its parent is null), unless 
- * the receiver is a shell. In this case, the point is 
- * relative to the display. 
+ * parent (or its display if its parent is null), unless
+ * the receiver is a shell. In this case, the point is
+ * relative to the display.
  *
  * @param location the new location for the receiver
  *
@@ -994,9 +1008,9 @@
 /**
  * Sets the receiver's location to the point specified by
  * the arguments which are relative to the receiver's
- * parent (or its display if its parent is null), unless 
- * the receiver is a shell. In this case, the point is 
- * relative to the display. 
+ * parent (or its display if its parent is null), unless
+ * the receiver is a shell. In this case, the point is
+ * relative to the display.
  *
  * @param x the new x coordinate for the receiver
  * @param y the new y coordinate for the receiver
@@ -1065,7 +1079,7 @@
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the region has been disposed</li>
- * </ul>  
+ * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1141,7 +1155,7 @@
 }
 
 boolean isFocusHandle (int /*long*/ widget) {
-	return widget == focusHandle (); 
+	return widget == focusHandle ();
 }
 
 /**
@@ -1154,13 +1168,13 @@
  * @param control the sibling control (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Control#moveBelow
  * @see Composite#getChildren
  */
@@ -1184,13 +1198,13 @@
  * @param control the sibling control (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see Control#moveAbove
  * @see Composite#getChildren
  */
@@ -1232,11 +1246,11 @@
  * <em>contents</em> have changed, therefore any caches that a layout manager
  * containing the control may have been keeping need to be flushed. When the
  * control is resized, the changed flag will be <code>false</code>, so layout
- * manager caches can be retained. 
+ * manager caches can be retained.
  * </p>
  *
  * @param changed whether or not the receiver's contents have changed
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1250,9 +1264,9 @@
 
 /**
  * Sets the layout data associated with the receiver to the argument.
- * 
+ *
  * @param layoutData the new layout data for the receiver.
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1276,7 +1290,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public Point toControl (int x, int y) {
@@ -1325,7 +1339,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public Point toDisplay (int x, int y) {
@@ -1360,7 +1374,7 @@
 	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
 	return toDisplay (point.x, point.y);
 }
- 
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when the control is moved or resized, by sending
@@ -1406,7 +1420,7 @@
  *
  * @see DragDetectListener
  * @see #removeDragDetectListener
- * 
+ *
  * @since 3.3
  */
 public void addDragDetectListener (DragDetectListener listener) {
@@ -1454,7 +1468,7 @@
  * must be invoked on it to specify that gesture events should be
  * sent instead of touch events.
  * </p>
- * 
+ *
  * @param listener the listener which should be notified
  *
  * @exception IllegalArgumentException <ul>
@@ -1468,7 +1482,7 @@
  * @see GestureListener
  * @see #removeGestureListener
  * @see #setTouchEnabled
- * 
+ *
  * @since 3.7
  */
 public void addGestureListener (GestureListener listener) {
@@ -1715,11 +1729,11 @@
  * one of the messages defined in the <code>TouchListener</code>
  * interface.
  * <p>
- * NOTE: You must also call <code>setTouchEnabled(true)</code> to 
+ * NOTE: You must also call <code>setTouchEnabled(true)</code> to
  * specify that touch events should be sent, which will cause gesture
  * events to not be sent.
  * </p>
- * 
+ *
  * @param listener the listener which should be notified
  *
  * @exception IllegalArgumentException <ul>
@@ -1733,7 +1747,7 @@
  * @see TouchListener
  * @see #removeTouchListener
  * @see #setTouchEnabled
- * 
+ *
  * @since 3.7
  */
 public void addTouchListener (TouchListener listener) {
@@ -1810,7 +1824,7 @@
  *
  * @see DragDetectListener
  * @see #addDragDetectListener
- * 
+ *
  * @since 3.3
  */
 public void removeDragDetectListener(DragDetectListener listener) {
@@ -1860,7 +1874,7 @@
  *
  * @see GestureListener
  * @see #addGestureListener
- * 
+ *
  * @since 3.7
  */
 public void removeGestureListener (GestureListener listener) {
@@ -2094,7 +2108,7 @@
  *
  * @see TouchListener
  * @see #addTouchListener
- * 
+ *
  * @since 3.7
  */
 public void removeTouchListener(TouchListener listener) {
@@ -2132,7 +2146,7 @@
  * Detects a drag and drop gesture.  This method is used
  * to detect a drag gesture when called from within a mouse
  * down listener.
- * 
+ *
  * <p>By default, a drag is detected when the gesture
  * occurs anywhere within the client area of a control.
  * Some controls, such as tables and trees, override this
@@ -2145,7 +2159,7 @@
  * </p>
  *
  * @param event the mouse down event
- * 
+ *
  * @return <code>true</code> if the gesture occurred, and <code>false</code> otherwise.
  *
  * @exception IllegalArgumentException <ul>
@@ -2155,13 +2169,13 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- *  
+ *
  * @see DragDetectListener
  * @see #addDragDetectListener
- * 
+ *
  * @see #getDragDetect
  * @see #setDragDetect
- * 
+ *
  * @since 3.3
  */
 public boolean dragDetect (Event event) {
@@ -2174,7 +2188,7 @@
  * Detects a drag and drop gesture.  This method is used
  * to detect a drag gesture when called from within a mouse
  * down listener.
- * 
+ *
  * <p>By default, a drag is detected when the gesture
  * occurs anywhere within the client area of a control.
  * Some controls, such as tables and trees, override this
@@ -2187,7 +2201,7 @@
  * </p>
  *
  * @param event the mouse down event
- * 
+ *
  * @return <code>true</code> if the gesture occurred, and <code>false</code> otherwise.
  *
  * @exception IllegalArgumentException <ul>
@@ -2197,13 +2211,13 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see DragDetectListener
  * @see #addDragDetectListener
- * 
+ *
  * @see #getDragDetect
  * @see #setDragDetect
- * 
+ *
  * @since 3.3
  */
 public boolean dragDetect (MouseEvent event) {
@@ -2219,6 +2233,16 @@
 }
 
 boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) {
+        // <QFS>
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("dragDetect(int,int,boolean,boolean [])");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("x: ").add(x)
+             .add(", y: ").add(y)
+             .add(", filter: ").add(filter)
+             .add(", consume: ").add(consume)).log(Log.MTD);
+        }
+        // </QFS>
 	boolean quit = false, dragging = false;
 	while (!quit) {
 		int /*long*/ eventPtr = 0;
@@ -2225,15 +2249,28 @@
 		/*
 		* There should be an event on the queue already, but
 		* in cases where there isn't one, stop trying after
-		* half a second. 
+		* half a second.
 		*/
 		long timeout = System.currentTimeMillis() + 500;
 		while (System.currentTimeMillis() < timeout) {
 			eventPtr = OS.gdk_event_get ();
+                    // <QFS>
+                    if (logger.level >= Log.DBG) {
+                        logger.build("dragDetect(int,int,boolean,boolean [])")
+                            .add("eventPtr: ").add(eventPtr)
+                            .add(", type: ")
+                            .add(eventPtr == 0 ? 0 : OS.GDK_EVENT_TYPE(eventPtr)).log(Log.DBG);
+                    }
+                    // </QFS>
 			if (eventPtr != 0) {
 				break;
 			} else {
-				try {Thread.sleep(50);} catch (Exception ex) {}
+                                // <QFS> Additional async message entry point and sleep reduced
+                                // from 50 to 20 ms to get better async response.
+                                // display.runAsyncMessages (false);
+                                display.runIdleProcs();
+				try {Thread.sleep(20);} catch (Exception ex) {}
+                                // </QFS>
 			}
 		}
 		if (eventPtr == 0) return dragOnTimeout;
@@ -2319,7 +2356,7 @@
 	return 0;
 }
 
-void fixModal(int /*long*/ group, int /*long*/ modalGroup) {	
+void fixModal(int /*long*/ group, int /*long*/ modalGroup) {
 }
 
 /**
@@ -2336,7 +2373,14 @@
  * @see #setFocus
  */
 public boolean forceFocus () {
-	checkWidget();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("forceFocus(x)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)).log(Log.MTD);
+    }
+    // </QFS>
+        checkWidget();
 	if (display.focusEvent == SWT.FocusOut) return false;
 	Shell shell = getShell ();
 	shell.setSavedFocus (this);
@@ -2346,6 +2390,14 @@
 }
 
 boolean forceFocus (int /*long*/ focusHandle) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("forceFocus(x,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", focusHandle: ").add(focusHandle)).log(Log.MTD);
+    }
+    // </QFS>
 	if (OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return true;
 	/* When the control is zero sized it must be realized */
 	OS.gtk_widget_realize (focusHandle);
@@ -2404,7 +2456,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.2
  */
 public Image getBackgroundImage () {
@@ -2462,7 +2514,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public Cursor getCursor () {
@@ -2472,15 +2524,15 @@
 
 /**
  * Returns <code>true</code> if the receiver is detecting
- * drag gestures, and  <code>false</code> otherwise. 
+ * drag gestures, and  <code>false</code> otherwise.
  *
  * @return the receiver's drag detect state
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public boolean getDragDetect () {
@@ -2500,7 +2552,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #isEnabled
  */
 public boolean getEnabled () {
@@ -2522,7 +2574,7 @@
 	checkWidget();
 	return font != null ? font : defaultFont ();
 }
-	
+
 int /*long*/ getFontDescription () {
 	int /*long*/ fontHandle = fontHandle ();
 	OS.gtk_widget_realize (fontHandle);
@@ -2605,14 +2657,14 @@
 
 /**
  * Returns the receiver's monitor.
- * 
+ *
  * @return the receiver's monitor
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.0
  */
 public Monitor getMonitor () {
@@ -2682,12 +2734,12 @@
 	return result;
 }
 
-/** 
+/**
  * Returns the region that defines the shape of the control,
  * or null if the control has the default shape.
  *
  * @return the region that defines the shape of the shell (or null)
- *	
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -2754,7 +2806,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #setTouchEnabled
  * @see Display#getTouchEnabled
  *
@@ -2792,10 +2844,20 @@
 }
 
 int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, boolean sendMouseDown) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_button_press_event(int,int,boolean)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("widget: ").add(widget)
+         .add(", event: ").add(event)
+         .add(", sendMouseDown: ").add(sendMouseDown)
+         .add(", this: ").add(this)).log(Log.MTD);
+    }
+    // </QFS>
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
 	if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-	
+
 	/*
 	* When a shell is created with SWT.ON_TOP and SWT.NO_FOCUS,
 	* do not activate the shell when the user clicks on the
@@ -2879,10 +2941,10 @@
 		 * Feature in GTK. Children of a shell will inherit and display the shell's
 		 * tooltip if they do not have a tooltip of their own. The fix is to use the
 		 * new tooltip API in GTK 2.12 to null the shell's tooltip when the control
-		 * being entered does not have any tooltip text set. 
+		 * being entered does not have any tooltip text set.
 		 */
 		byte [] buffer = null;
-		if (toolTipText != null && toolTipText.length() != 0) { 
+		if (toolTipText != null && toolTipText.length() != 0) {
 			char [] chars = fixMnemonic (toolTipText, false);
 			buffer = Converter.wcsToMbcs (null, chars, true);
 		}
@@ -2893,9 +2955,9 @@
 	GdkEventCrossing gdkEvent = new GdkEventCrossing ();
 	OS.memmove (gdkEvent, event, GdkEventCrossing.sizeof);
 	/*
-	 * It is possible to send out too many enter/exit events if entering a 
-	 * control through a subwindow. The fix is to return without sending any 
-	 * events if the GdkEventCrossing subwindow field is set and the control 
+	 * It is possible to send out too many enter/exit events if entering a
+	 * control through a subwindow. The fix is to return without sending any
+	 * events if the GdkEventCrossing subwindow field is set and the control
 	 * requests to check the field.
 	 */
 	if (gdkEvent.subwindow != 0 && checkSubwindow ()) return 0;
@@ -2947,12 +3009,12 @@
 			 * box to lose focus when focus is received for the menu.  The
 			 * fix is to check the current grab handle and see if it is a GTK_MENU
 			 * and ignore the focus event when the menu is both shown and hidden.
-			 * 
+			 *
 			 * NOTE: This code runs for all menus.
 			 */
 			Display display = this.display;
 			if (gdkEventFocus.in != 0) {
-				if (display.ignoreFocus) { 
+				if (display.ignoreFocus) {
 					display.ignoreFocus = false;
 					break;
 				}
@@ -3032,19 +3094,54 @@
 }
 
 int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
-	if (!hasFocus ()) return 0;
+// <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_key_press_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", widget: ").add(widget)
+         .add(", event: ").add(event)).log(Log.MTD);
+    }
+// </QFS>
+    if (!hasFocus ()) {
+// <QFS>
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "gtk_key_press_event(int,int)",
+                           "No focus");
+            }
+// </QFS>
+        return 0;
+    }
 	GdkEventKey gdkEvent = new GdkEventKey ();
 	OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
-	
-	if (translateMnemonic (gdkEvent.keyval, gdkEvent)) return 1;
+
+	if (translateMnemonic (gdkEvent.keyval, gdkEvent)) {
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "gtk_key_press_event(int,int)",
+                           "translateMnemonic returned true");
+            }
+            return 1;
+        }
 	// widget could be disposed at this point
 	if (isDisposed ()) return 0;
-	
-	if (filterKey (gdkEvent.keyval, event)) return 1;
+
+	if (filterKey (gdkEvent.keyval, event)) {
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "gtk_key_press_event(int,int)",
+                           "filterKey returned true");
+            }
+            return 1;
+        }
 	// widget could be disposed at this point
-	if (isDisposed ()) return 0;	
-	
-	if (translateTraversal (gdkEvent)) return 1;
+	if (isDisposed ()) return 0;
+
+	if (translateTraversal (gdkEvent)) {
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "gtk_key_press_event(int,int)",
+                           "translateTraversal returned true");
+            }
+            return 1;
+        }
 	// widget could be disposed at this point
 	if (isDisposed ()) return 0;
 	return super.gtk_key_press_event (widget, event);
@@ -3051,7 +3148,23 @@
 }
 
 int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {
-	if (!hasFocus ()) return 0;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_key_release_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("widget: ").add(widget)
+         .add(", event: ").add(event)).log(Log.MTD);
+    }
+    // </QFS>
+        if (!hasFocus ()) {
+            // <QFS>
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "gtk_key_release_event(int,int)",
+                           "No focus");
+            }
+            // </QFS>
+            return 0;
+        }
 	int /*long*/ imHandle = imHandle ();
 	if (imHandle != 0) {
 		if (OS.gtk_im_context_filter_keypress (imHandle, event)) return 1;
@@ -3170,12 +3283,12 @@
 int /*long*/ gtk_unrealize (int /*long*/ widget) {
 	int /*long*/ imHandle = imHandle ();
 	if (imHandle != 0) OS.gtk_im_context_set_client_window (imHandle, 0);
-	return 0;	
+	return 0;
 }
 
 int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) {
 	/*
-	* As of GTK 2.17.11, obscured controls no longer send expose 
+	* As of GTK 2.17.11, obscured controls no longer send expose
 	* events. It is no longer necessary to track visiblity notify
 	* events.
 	*/
@@ -3188,7 +3301,7 @@
 		if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {
 			state |= OBSCURED;
 		} else {
-			if ((state & OBSCURED) != 0) {		
+			if ((state & OBSCURED) != 0) {
 				int [] width = new int [1], height = new int [1];
 				OS.gdk_drawable_get_size (window, width, height);
 				GdkRectangle rect = new GdkRectangle ();
@@ -3203,10 +3316,10 @@
 }
 
 void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
-	OS.gtk_widget_size_request (widget, requisition);	
+	OS.gtk_widget_size_request (widget, requisition);
 }
 
-/**	 
+/**
  * Invokes platform specific functionality to allocate a new GC handle.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -3216,9 +3329,9 @@
  * application code.
  * </p>
  *
- * @param data the platform specific GC data 
+ * @param data the platform specific GC data
  * @return the platform specific GC handle
- * 
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 public int /*long*/ internal_new_GC (GCData data) {
@@ -3231,7 +3344,7 @@
 	} else {
 		gc = OS.gdk_gc_new (window);
 	}
-	if (gc == 0) error (SWT.ERROR_NO_HANDLES);	
+	if (gc == 0) error (SWT.ERROR_NO_HANDLES);
 	if (data != null) {
 		int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
 		if ((data.style & mask) == 0) {
@@ -3247,8 +3360,8 @@
 		Control control = findBackgroundControl ();
 		if (control == null) control = this;
 		data.background = control.getBackgroundColor ();
-		data.font = font != null ? font : defaultFont (); 
-	}	
+		data.font = font != null ? font : defaultFont ();
+	}
 	return gc;
 }
 
@@ -3256,7 +3369,7 @@
 	return 0;
 }
 
-/**	 
+/**
  * Invokes platform specific functionality to dispose a GC handle.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -3267,8 +3380,8 @@
  * </p>
  *
  * @param hDC the platform specific GC handle
- * @param data the platform specific GC data 
- * 
+ * @param data the platform specific GC data
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
@@ -3347,7 +3460,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #getEnabled
  */
 public boolean isEnabled () {
@@ -3452,7 +3565,7 @@
 
 /**
  * Causes the rectangular area of the receiver specified by
- * the arguments to be marked as needing to be redrawn. 
+ * the arguments to be marked as needing to be redrawn.
  * The next time a paint request is processed, that area of
  * the receiver will be painted, including the background.
  * If the <code>all</code> flag is <code>true</code>, any
@@ -3587,7 +3700,7 @@
 			int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
 			int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
 			int xScreen = OS.XDefaultScreen (xDisplay);
-			int flags = OS.CWStackMode | OS.CWSibling;			
+			int flags = OS.CWStackMode | OS.CWSibling;
 			XWindowChanges changes = new XWindowChanges ();
 			changes.sibling = OS.gdk_x11_drawable_get_xid (sibling);
 			changes.stack_mode = above ? OS.Above : OS.Below;
@@ -3612,7 +3725,14 @@
 }
 
 void sendFocusEvent (int type) {
-	Shell shell = _getShell ();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("sendFocusEvent(int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("type: ").add(type)).log(Log.MTD);
+    }
+    // </QFS>
+    Shell shell = _getShell ();
 	Display display = this.display;
 	display.focusControl = this;
 	display.focusEvent = type;
@@ -3627,7 +3747,7 @@
 	*/
 	if (!shell.isDisposed ()) {
 		switch (type) {
-			case SWT.FocusIn: 
+			case SWT.FocusIn:
 				shell.setActiveControl (this);
 				break;
 			case SWT.FocusOut:
@@ -3690,12 +3810,12 @@
 void setBackground () {
 	if ((state & BACKGROUND) == 0 && backgroundImage == null) {
 		if ((state & PARENT_BACKGROUND) != 0) {
-			setParentBackground ();
-		} else {
-			setWidgetBackground ();
-		}
-		redrawWidget (0, 0, 0, 0, true, false, false);
+		setParentBackground ();
+	} else {
+		setWidgetBackground ();
 	}
+	redrawWidget (0, 0, 0, 0, true, false, false);
+	}
 }
 
 /**
@@ -3709,7 +3829,7 @@
  * @param color the new color (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -3749,7 +3869,7 @@
 	int /*long*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);
 	if (ptr != 0) OS.g_free (ptr);
 	ptr = 0;
-	
+
 	String pixmapName = null;
 	int flags = OS.gtk_rc_style_get_color_flags (style, index);
 	if (color != null) {
@@ -3763,10 +3883,10 @@
 	}
 	if (pixmapName != null) {
 		byte[] buffer = Converter.wcsToMbcs (null, pixmapName, true);
-		ptr = OS.g_malloc (buffer.length);
-		OS.memmove (ptr, buffer, buffer.length);
+	ptr = OS.g_malloc (buffer.length);
+	OS.memmove (ptr, buffer, buffer.length);
 	}
-	
+
 	OS.gtk_rc_style_set_bg_pixmap_name (style, index, ptr);
 	OS.gtk_rc_style_set_bg (style, index, color);
 	OS.gtk_rc_style_set_color_flags (style, index, flags);
@@ -3789,14 +3909,14 @@
  * @param image the new image (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
- *    <li>ERROR_INVALID_ARGUMENT - if the argument is not a bitmap</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument is not a bitmap</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.2
  */
 public void setBackgroundImage (Image image) {
@@ -3823,7 +3943,7 @@
 			* TODO This code code is commented because it does not work since the pixmap
 			* created with gdk_pixmap_foreign_new() does not have colormap. Another option
 			* would be to create a pixmap on the fly from the surface.
-			* 
+			*
 			* For now draw background in windowProc().
 			*/
 //			int /*long*/ surface = image.surface;
@@ -3875,7 +3995,7 @@
  * @param cursor the new cursor (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -3913,7 +4033,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public void setDragDetect (boolean dragDetect) {
@@ -3990,7 +4110,7 @@
 }
 
 /**
- * Causes the receiver to have the <em>keyboard focus</em>, 
+ * Causes the receiver to have the <em>keyboard focus</em>,
  * such that all keyboard events will be delivered to it.  Focus
  * reassignment will respect applicable platform constraints.
  *
@@ -4017,7 +4137,7 @@
  * @param font the new font (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -4042,7 +4162,7 @@
 	}
 	setFontDescription (fontDesc);
 }
-	
+
 void setFontDescription (int /*long*/ font) {
 	OS.gtk_widget_modify_font (handle, font);
 }
@@ -4057,7 +4177,7 @@
  * @param color the new color (or null)
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -4106,7 +4226,7 @@
 		if ((parent.style & SWT.MIRRORED) != 0) {
 			OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ());
 		} else {
-			OS.GTK_WIDGET_SET_X (topHandle, 0);
+		OS.GTK_WIDGET_SET_X (topHandle, 0);
 		}
 		OS.GTK_WIDGET_SET_Y (topHandle, 0);
 	} else {
@@ -4133,7 +4253,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_MENU_NOT_POP_UP - the menu is not a pop up menu</li>
  *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -4167,12 +4287,12 @@
  * <p>
  *
  * @param orientation new orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.7
  */
 public void setOrientation (int orientation) {
@@ -4197,7 +4317,7 @@
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
- *    <li>ERROR_NULL_ARGUMENT - if the parent is <code>null</code></li> 
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is <code>null</code></li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -4288,7 +4408,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #redraw(int, int, int, int, boolean)
  * @see #update()
  */
@@ -4320,7 +4440,7 @@
 					int mouseMask = OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK |
 						OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK |
 						OS.GDK_POINTER_MOTION_MASK | OS.GDK_POINTER_MOTION_HINT_MASK |
-						OS.GDK_BUTTON_MOTION_MASK | OS.GDK_BUTTON1_MOTION_MASK | 
+						OS.GDK_BUTTON_MOTION_MASK | OS.GDK_BUTTON1_MOTION_MASK |
 						OS.GDK_BUTTON2_MOTION_MASK | OS.GDK_BUTTON3_MOTION_MASK;
 					OS.gdk_window_set_events (window, OS.gdk_window_get_events (window) & ~mouseMask);
 					OS.gdk_window_set_back_pixmap (redrawWindow, 0, false);
@@ -4338,7 +4458,7 @@
 
 /**
  * Sets the receiver's tool tip text to the argument, which
- * may be null indicating that the default tool tip for the 
+ * may be null indicating that the default tool tip for the
  * control will be shown. For a control that has a default
  * tool tip, such as the Tree control on Windows, setting
  * the tool tip text to an empty string replaces the default,
@@ -4345,10 +4465,10 @@
  * causing no tool tip text to be shown.
  * <p>
  * The mnemonic indicator (character '&amp;') is not displayed in a tool tip.
- * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
+ * To display a single '&amp;' in the tool tip, the character '&amp;' can be
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
@@ -4370,9 +4490,9 @@
 		* a set on a shell only. In order to force the shell tooltip
 		* to update when a new tip string is set, the existing string
 		* in the tooltip is set to null, followed by running a query.
-		* The real tip text can then be set. 
-		* 
-		* Note that this will only run if the control for which the 
+		* The real tip text can then be set.
+		*
+		* Note that this will only run if the control for which the
 		* tooltip is being set is the current control (i.e. the control
 		* under the pointer).
 		*/
@@ -4380,7 +4500,7 @@
 			shell.setToolTipText (shell.handle, eventHandle (), newString);
 		}
 	} else {
-		shell.setToolTipText (eventHandle (), newString);
+	shell.setToolTipText (eventHandle (), newString);
 	}
 }
 
@@ -4389,9 +4509,9 @@
  * Setting this to <code>false</code> causes the receiver to send gesture events
  * instead.  No exception is thrown if a touch-based input device is not
  * detected (this can be determined with <code>Display#getTouchEnabled()</code>).
- * 
+ *
  * @param enabled the new touch-enabled state
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -4406,7 +4526,7 @@
 
 /**
  * Marks the receiver as visible if the argument is <code>true</code>,
- * and marks it invisible otherwise. 
+ * and marks it invisible otherwise.
  * <p>
  * If one of the receiver's ancestors is not visible or some
  * other condition makes the receiver not visible, marking
@@ -4443,10 +4563,10 @@
 		* focus causes a focus_out_event to be sent. If the client disposes
 		* the widget inside the event, GTK GP's.  The fix is to reassign focus
 		* before hiding the widget.
-		* 
+		*
 		* NOTE: In order to stop the same widget from taking focus,
 		* temporarily clear and set the GTK_VISIBLE flag.
-		*/		
+		*/
 		Control control = null;
 		boolean fixFocus = false;
 		if (display.focusEvent != SWT.FocusOut) {
@@ -4586,11 +4706,13 @@
 	setBackgroundColor (handle, color);
 }
 
-boolean showMenu (int x, int y) {
+// <QFS/> Made public.
+public boolean showMenu (int x, int y) {
 	return showMenu (x, y, SWT.MENU_MOUSE);
 }
 
-boolean showMenu (int x, int y, int detail) {
+// <QFS/> Made public.
+public boolean showMenu (int x, int y, int detail) {
 	Event event = new Event ();
 	event.x = x;
 	event.y = y;
@@ -4602,9 +4724,12 @@
 		if (menu != null && !menu.isDisposed ()) {
 			boolean hooksKeys = hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
 			menu.createIMMenu (hooksKeys ? imHandle() : 0);
-			if (event.x != x || event.y != y) {
+                        // <QFS> Always force desired location, otherwise the popup will always
+                        // appear at the location of the mouse cursor
+			// if (event.x != x || event.y != y) {
 				menu.setLocation (event.x, event.y);
-			}
+			// }
+                        // </QFS>
 			menu.setVisible (true);
 			return true;
 		}
@@ -4645,8 +4770,8 @@
 /**
  * Based on the argument, perform one of the expected platform
  * traversal action. The argument should be one of the constants:
- * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>, 
- * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>, 
+ * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>,
+ * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_ARROW_NEXT</code>, <code>SWT.TRAVERSE_ARROW_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_PAGE_NEXT</code> and <code>SWT.TRAVERSE_PAGE_PREVIOUS</code>.
  *
@@ -4668,11 +4793,11 @@
 
 /**
  * Performs a platform traversal action corresponding to a <code>KeyDown</code> event.
- * 
+ *
  * <p>Valid traversal values are
  * <code>SWT.TRAVERSE_NONE</code>, <code>SWT.TRAVERSE_MNEMONIC</code>,
  * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>,
- * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>, 
+ * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_ARROW_NEXT</code>, <code>SWT.TRAVERSE_ARROW_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_PAGE_NEXT</code> and <code>SWT.TRAVERSE_PAGE_PREVIOUS</code>.
  * If <code>traversal</code> is <code>SWT.TRAVERSE_NONE</code> then the Traverse
@@ -4679,13 +4804,13 @@
  * event is created with standard values based on the KeyDown event.  If
  * <code>traversal</code> is one of the other traversal constants then the Traverse
  * event is created with this detail, and its <code>doit</code> is taken from the
- * KeyDown event. 
+ * KeyDown event.
  * </p>
  *
  * @param traversal the type of traversal, or <code>SWT.TRAVERSE_NONE</code> to compute
  * this from <code>event</code>
  * @param event the KeyDown event
- * 
+ *
  * @return <code>true</code> if the traversal succeeded
  *
  * @exception IllegalArgumentException <ul>
@@ -4706,11 +4831,11 @@
 
 /**
  * Performs a platform traversal action corresponding to a <code>KeyDown</code> event.
- * 
+ *
  * <p>Valid traversal values are
  * <code>SWT.TRAVERSE_NONE</code>, <code>SWT.TRAVERSE_MNEMONIC</code>,
  * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>,
- * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>, 
+ * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_ARROW_NEXT</code>, <code>SWT.TRAVERSE_ARROW_PREVIOUS</code>,
  * <code>SWT.TRAVERSE_PAGE_NEXT</code> and <code>SWT.TRAVERSE_PAGE_PREVIOUS</code>.
  * If <code>traversal</code> is <code>SWT.TRAVERSE_NONE</code> then the Traverse
@@ -4717,13 +4842,13 @@
  * event is created with standard values based on the KeyDown event.  If
  * <code>traversal</code> is one of the other traversal constants then the Traverse
  * event is created with this detail, and its <code>doit</code> is taken from the
- * KeyDown event. 
+ * KeyDown event.
  * </p>
  *
  * @param traversal the type of traversal, or <code>SWT.TRAVERSE_NONE</code> to compute
  * this from <code>event</code>
  * @param event the KeyDown event
- * 
+ *
  * @return <code>true</code> if the traversal succeeded
  *
  * @exception IllegalArgumentException <ul>
@@ -4886,7 +5011,7 @@
 			detail = SWT.TRAVERSE_RETURN;
 			break;
 		}
-		case OS.GDK_ISO_Left_Tab: 
+		case OS.GDK_ISO_Left_Tab:
 		case OS.GDK_Tab: {
 			boolean next = (keyEvent.state & OS.GDK_SHIFT_MASK) == 0;
 			detail = next ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
@@ -4893,7 +5018,7 @@
 			break;
 		}
 		case OS.GDK_Up:
-		case OS.GDK_Left: 
+		case OS.GDK_Left:
 		case OS.GDK_Down:
 		case OS.GDK_Right: {
 			boolean next = key == OS.GDK_Down || key == OS.GDK_Right;
@@ -4942,7 +5067,7 @@
 	* code could have disposed the widget in the traverse
 	* event.  If this happens, return true to stop further
 	* event processing.
-	*/	
+	*/
 	sendEvent (SWT.Traverse, event);
 	if (isDisposed ()) return true;
 	if (!event.doit) return false;
@@ -4954,7 +5079,7 @@
 		case SWT.TRAVERSE_TAB_PREVIOUS:	return traverseGroup (false);
 		case SWT.TRAVERSE_ARROW_NEXT:		return traverseItem (true);
 		case SWT.TRAVERSE_ARROW_PREVIOUS:	return traverseItem (false);
-		case SWT.TRAVERSE_MNEMONIC:		return traverseMnemonic (event.character);	
+		case SWT.TRAVERSE_MNEMONIC:		return traverseMnemonic (event.character);
 		case SWT.TRAVERSE_PAGE_NEXT:		return traversePage (true);
 		case SWT.TRAVERSE_PAGE_PREVIOUS:	return traversePage (false);
 	}
@@ -5056,7 +5181,7 @@
 
 void update (boolean all, boolean flush) {
 //	checkWidget();
-	if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return; 
+	if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return;
 	if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
 	int /*long*/ window = paintWindow ();
 	if (flush) display.flushExposes (window, all);
@@ -5105,7 +5230,7 @@
 					OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);
 					OS.gdk_gc_set_fill (gdkGC, OS.GDK_TILED);
 					OS.gdk_gc_set_ts_origin (gdkGC, -dest_x [0], -dest_y [0]);
-					OS.gdk_gc_set_tile (gdkGC, control.backgroundImage.pixmap); 
+					OS.gdk_gc_set_tile (gdkGC, control.backgroundImage.pixmap);
 					OS.gdk_draw_rectangle (window, gdkGC, 1, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
 					OS.g_object_unref (gdkGC);
 				}
Index: org/eclipse/swt/widgets/Event.java
===================================================================
--- org/eclipse/swt/widgets/Event.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Event.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -203,7 +203,7 @@
 	 */
 	public String text;
 
-	/** 
+	/**
 	 * Bidi segment offsets
 	 * @since 3.8
 	 */
Index: org/eclipse/swt/widgets/MenuItem.java
===================================================================
--- org/eclipse/swt/widgets/MenuItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/MenuItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -19,7 +20,7 @@
 
 /**
  * Instances of this class represent a selectable user interface object
- * that issues notification when pressed and released. 
+ * that issues notification when pressed and released.
  * <dl>
  * <dt><b>Styles:</b></dt>
  * <dd>CHECK, CASCADE, PUSH, RADIO, SEPARATOR</dd>
@@ -40,7 +41,7 @@
 	Menu parent, menu;
 	int /*long*/ groupHandle;
 	int accelerator, userId;
-	
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Menu</code>) and a style value
@@ -49,7 +50,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -89,7 +90,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -203,7 +204,7 @@
  * was selected by the user. During <code>widgetSelected</code> the application can use
  * <code>getSelection()</code> to determine the current selected state of the receiver.
  * </p>
- * 
+ *
  * @param listener the listener which should be notified when the menu item is selected by the user
  *
  * @exception IllegalArgumentException <ul>
@@ -275,7 +276,7 @@
 		OS.gtk_accel_label_set_accel_widget (label, 0);
 	}
 	int /*long*/ parentHandle = parent.handle;
-	boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);     
+	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);
 	if (!enabled) OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
@@ -317,7 +318,8 @@
 	return shell.menuBar == menu ? shell.accelGroup : 0;
 }
 
-/*public*/ Rectangle getBounds () {
+// <QFS/> Made public.
+public Rectangle getBounds () {
 	checkWidget();
 	if (!OS.GTK_WIDGET_MAPPED (handle)) {
 		return new Rectangle (0, 0, 0, 0);
@@ -341,7 +343,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #isEnabled
  */
 public boolean getEnabled () {
@@ -369,7 +371,7 @@
 /**
  * Returns the receiver's cascade menu if it has one or null
  * if it does not. Only <code>CASCADE</code> menu items can have
- * a pull down menu. The sequence of key strokes, button presses 
+ * a pull down menu. The sequence of key strokes, button presses
  * and/or button releases that are used to request a pull down
  * menu is platform specific.
  *
@@ -483,7 +485,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #getEnabled
  */
 public boolean isEnabled () {
@@ -596,7 +598,7 @@
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
 	eventTable.unhook (SWT.Selection, listener);
-	eventTable.unhook (SWT.DefaultSelection,listener);	
+	eventTable.unhook (SWT.DefaultSelection,listener);
 }
 void reskinChildren (int flags) {
 	if (menu != null) {
@@ -776,9 +778,9 @@
 		if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
 			OS.gtk_menu_item_set_submenu (handle, 0);
 		} else {
-		    OS.gtk_menu_item_remove_submenu (handle);
-		}
+		OS.gtk_menu_item_remove_submenu (handle);
 	}
+	}
 	if ((this.menu = menu) != null) {
 		menu.cascade = this;
 		OS.gtk_menu_item_set_submenu (handle, menu.handle);
@@ -793,7 +795,7 @@
         OS.gtk_widget_set_direction (handle, dir);
         OS.gtk_container_forall (handle, display.setDirectionProc, dir);
         if (menu != null) menu._setOrientation (parent.style & (SWT.RIGHT_TO_LEFT | SWT.LEFT_TO_RIGHT));
-    }
+	}
 }
 
 boolean setRadioSelection (boolean value) {
@@ -851,7 +853,7 @@
  * accelerator key sequence. The accelerator key sequence
  * is installed using #setAccelerator.
  * </p>
- * 
+ *
  * @param string the new text
  *
  * @exception IllegalArgumentException <ul>
@@ -861,7 +863,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #setAccelerator
  */
 public void setText (String string) {
@@ -881,14 +883,14 @@
 	byte [] buffer = Converter.wcsToMbcs (null, chars, true);
 	int /*long*/ label = OS.gtk_bin_get_child (handle);
 	if (label != 0 && OS.GTK_IS_LABEL(label)) {
-		OS.gtk_label_set_text_with_mnemonic (label, buffer);
-		buffer = Converter.wcsToMbcs (null, accelString, true);
-		int /*long*/ ptr = OS.g_malloc (buffer.length);
-		OS.memmove (ptr, buffer, buffer.length);
+	OS.gtk_label_set_text_with_mnemonic (label, buffer);
+	buffer = Converter.wcsToMbcs (null, accelString, true);
+	int /*long*/ ptr = OS.g_malloc (buffer.length);
+	OS.memmove (ptr, buffer, buffer.length);
 		if (OS.GTK_IS_ACCEL_LABEL(label)) {
-			int /*long*/ oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);
-			OS.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);
-			if (oldPtr != 0) OS.g_free (oldPtr);
+	int /*long*/ oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);
+	OS.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);
+	if (oldPtr != 0) OS.g_free (oldPtr);
 		}
 	}
 }
Index: org/eclipse/swt/widgets/Text.java
===================================================================
--- org/eclipse/swt/widgets/Text.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Text.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -18,6 +19,11 @@
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class are selectable user interface
  * objects that allow the user to enter and modify text.
@@ -63,7 +69,7 @@
 	int fixStart = -1, fixEnd = -1;
 	boolean doubleClick;
 	String message = "";
-	
+
 	static final char LTR_MARK = '\u200e';
 	static final char RTL_MARK = '\u200f';
 	int[] segments;
@@ -70,7 +76,7 @@
 
 	static final int ITER_SIZEOF = OS.GtkTextIter_sizeof();
 	static final int SPACE_FOR_CURSOR = 1;
-	
+
 	/**
 	* The maximum number of characters that can be entered
 	* into a text widget.
@@ -96,6 +102,12 @@
 		DELIMITER = "\n";
 	}
 
+    /**
+     * <QFS/> The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Text");
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -102,7 +114,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -163,10 +175,10 @@
 	if ((style & SWT.SEARCH) != 0) {
 		style |= SWT.SINGLE | SWT.BORDER;
 		style &= ~SWT.PASSWORD;
-		/* 
+		/*
 		* NOTE: ICON_CANCEL has the same value as H_SCROLL and
 		* ICON_SEARCH has the same value as V_SCROLL so they are
-		* cleared because SWT.SINGLE is set. 
+		* cleared because SWT.SINGLE is set.
 		*/
 	}
 	if ((style & SWT.SINGLE) != 0 && (style & SWT.MULTI) != 0) {
@@ -225,7 +237,7 @@
 			OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
 		}
 		int just = OS.GTK_JUSTIFY_LEFT;
-		if ((style & SWT.CENTER) != 0) just = OS.GTK_JUSTIFY_CENTER; 
+		if ((style & SWT.CENTER) != 0) just = OS.GTK_JUSTIFY_CENTER;
 		if ((style & SWT.RIGHT) != 0) just = OS.GTK_JUSTIFY_RIGHT;
 		OS.gtk_text_view_set_justification (handle, just);
 	}
@@ -572,7 +584,7 @@
 		trim.width += innerBorder.left + innerBorder.right;
 		trim.height += innerBorder.top + innerBorder.bottom;
 	} else {
-		int borderWidth = OS.gtk_container_get_border_width (handle);  
+		int borderWidth = OS.gtk_container_get_border_width (handle);
 		xborder += borderWidth;
 		yborder += borderWidth;
 	}
@@ -726,10 +738,46 @@
 boolean filterKey (int keyval, int /*long*/ event) {
 	int time = OS.gdk_event_get_time (event);
 	if (time != lastEventTime) {
+            // <QFS>
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "filterKey(int,int)",
+                           "times differ");
+            }
+            // </QFS>
 		lastEventTime = time;
 		int /*long*/ imContext = imContext ();
+                // <QFS>
+                if (logger.level >= Log.DBG) {
+                    logger.build("filterKey(int,int)")
+                        .add("imContext: ").add(imContext).log(Log.DBG);
+                }
+                // </QFS>
 		if (imContext != 0) {
-			return OS.gtk_im_context_filter_keypress (imContext, event);
+                    // <QFS> was: return OS.gtk_im_context_filter_keypress (imContext, event);
+                    boolean ret = OS.gtk_im_context_filter_keypress (imContext, event);
+                    if (logger.level >= Log.DBG) {
+                        logger.build("filterKey(int,int)")
+                            .add("ret: ").add(ret).log(Log.DBG);
+                    }
+                    if (!ret && display.charOverrideHead > display.charOverrideTail) {
+                        // XXX We could also check that the event key code actually matches
+                        // the expected value
+                        long val = display.charOverride[display.charOverrideTail++];
+                        if (logger.level >= Log.DBG) {
+                            logger.build("filterKey(int,int)")
+                                .add("char override: ").addHex(val).log(Log.DBG);
+                        }
+                        char c = (char) (val >> 32 & 0xffff);
+                        byte[] buffer = Converter.wcsToMbcs
+                            (null, new char[] {c}, true);
+                        int text = OS.g_malloc(buffer.length);
+                        OS.memmove(text, buffer, buffer.length);
+                        gtk_commit(imContext, text);
+                        OS.g_free(text);
+                        ret = true;
+                    }
+                    return ret;
+                    // </QFS>
 		}
 	}
 	gdkEventKey = event;
@@ -740,8 +788,8 @@
 	/*
 	*  The IM filter has to be called one time for each key press event.
 	*  When the IM is open the key events are duplicated. The first event
-	*  is filtered by SWT and the second event is filtered by GTK.  In some 
-	*  cases the GTK handler does not run (the widget is destroyed, the 
+	*  is filtered by SWT and the second event is filtered by GTK.  In some
+	*  cases the GTK handler does not run (the widget is destroyed, the
 	*  application code consumes the event, etc), for these cases the IM
 	*  filter has to be called by SWT.
 	*/
@@ -850,14 +898,14 @@
 		int /*long*/ ptr = OS.gtk_entry_get_text (handle);
 		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (handle));
 	} else {
-		byte [] position = new byte [ITER_SIZEOF];
-		int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-		OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
-		byte [] zero = new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-		int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
+	byte [] position = new byte [ITER_SIZEOF];
+	int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+	OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
+	byte [] zero = new byte [ITER_SIZEOF];
+	OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+	int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
 		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (position));
-		OS.g_free (ptr);
+	OS.g_free (ptr);
 	}
 	return untranslateOffset (result);
 }
@@ -879,12 +927,12 @@
 		int /*long*/ ptr = OS.gtk_entry_get_text (handle);
 		result = (int)/*64*/OS.g_utf16_strlen (ptr, -1);
 	} else {
-		byte [] startIter =  new byte [ITER_SIZEOF];
-		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-		int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+	byte [] startIter =  new byte [ITER_SIZEOF];
+	byte [] endIter =  new byte [ITER_SIZEOF];
+	OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+	int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
 		result = (int)/*64*/OS.g_utf16_strlen(ptr, -1);
-		OS.g_free (ptr);
+	OS.g_free (ptr);
 	}
 	return untranslateOffset (result);
 }
@@ -896,7 +944,7 @@
  * default action of the text widget when the user
  * double clicks.
  * </p>
- * 
+ *
  * @return whether or not double click is enabled
  *
  * @exception SWTException <ul>
@@ -916,7 +964,7 @@
  * displayed when the user enters text or the
  * text is changed by the programmer.
  * </p>
- * 
+ *
  * @return the echo character
  *
  * @exception SWTException <ul>
@@ -923,7 +971,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #setEchoChar
  */
 public char getEchoChar () {
@@ -940,7 +988,7 @@
  * Returns the editable state.
  *
  * @return whether or not the receiver is editable
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -983,7 +1031,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #DELIMITER
  */
 public String getLineDelimiter () {
@@ -1012,7 +1060,7 @@
  * <p>
  * Typically this is used in conjunction with <code>SWT.SEARCH</code>.
  * </p>
- * 
+ *
  * @return the widget message
  *
  * @exception SWTException <ul>
@@ -1019,7 +1067,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public String getMessage () {
@@ -1032,12 +1080,12 @@
  * constants <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
  *
  * @return the orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public int getOrientation () {
@@ -1097,15 +1145,15 @@
 		end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
 		selection = new Point (start [0], end [0]);
 	} else {
-		byte [] startIter =  new byte [ITER_SIZEOF];
-		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
-		byte [] zero = new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-		int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
-		int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (startIter));
-		int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (endIter));
-		OS.g_free (ptr);
+	byte [] startIter =  new byte [ITER_SIZEOF];
+	byte [] endIter =  new byte [ITER_SIZEOF];
+	OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
+	byte [] zero = new byte [ITER_SIZEOF];
+	OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+	int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
+	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (startIter));
+	int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (endIter));
+	OS.g_free (ptr);
 		selection = new Point (start, end);
 	}
 	selection.x = untranslateOffset (selection.x);
@@ -1133,7 +1181,7 @@
  * Gets the selected text, or an empty string if there is no current selection.
  *
  * @return the selected text
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1216,9 +1264,9 @@
 	if (!(start <= end && 0 <= end)) return "";
 	String str = getText ();
 	int length = str.length ();
-	end = Math.min (end, length - 1);
-	if (start > end) return "";
-	start = Math.max (0, start);
+		end = Math.min (end, length - 1);
+		if (start > end) return "";
+		start = Math.max (0, start);
 	/*
 	* NOTE: The current implementation uses substring ()
 	* which can reference a potentially large character
@@ -1268,19 +1316,19 @@
 }
 
 /**
- * Returns the maximum number of characters that the receiver is capable of holding. 
+ * Returns the maximum number of characters that the receiver is capable of holding.
  * <p>
  * If this has not been changed by <code>setTextLimit()</code>,
  * it will be the constant <code>Text.LIMIT</code>.
  * </p>
- * 
+ *
  * @return the text limit
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #LIMIT
  */
 public int getTextLimit () {
@@ -1365,7 +1413,6 @@
 	return result;
 }
 
-
 int /*long*/ gtk_changed (int /*long*/ widget) {
 	/*
 	* Feature in GTK.  When the user types, GTK positions
@@ -1401,7 +1448,15 @@
 }
 
 int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
-	if (text == 0) return 0;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_commit(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("imContext: ").add(imContext)
+         .add(", text: ").add(text)).log(Log.MTD);
+    }
+    // </QFS>
+    if (text == 0) return 0;
 	if ((style & SWT.SINGLE) != 0) {
 		if (!OS.gtk_editable_get_editable (handle)) return 0;
 	}
@@ -1432,7 +1487,7 @@
 	}
 	OS.g_signal_handlers_unblock_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
 	OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, handle);
-	if ((style & SWT.SINGLE) != 0) { 
+	if ((style & SWT.SINGLE) != 0) {
 		if (fixStart != -1 && fixEnd != -1) {
 			OS.gtk_editable_set_position (handle, fixStart);
 			OS.gtk_editable_select_region (handle, fixStart, fixEnd);
@@ -1586,7 +1641,7 @@
 				case SWT.CENTER: x = (width - rect.width) / 2; break;
 				case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
 			}
-			int /*long*/ style = OS.gtk_widget_get_style (handle);	
+			int /*long*/ style = OS.gtk_widget_get_style (handle);
 			GdkColor textColor = new GdkColor ();
 			OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
 			GdkColor baseColor = new GdkColor ();
@@ -1599,8 +1654,8 @@
 				Cairo.cairo_destroy(cairo);
 			} else {
 				int /*long*/ gc = OS.gdk_gc_new	(window);
-				OS.gdk_draw_layout_with_colors (window, gc, x, y, layout, textColor, baseColor);
-				OS.g_object_unref (gc);
+			OS.gdk_draw_layout_with_colors (window, gc, x, y, layout, textColor, baseColor);
+			OS.g_object_unref (gc);
 			}
 			OS.g_object_unref (layout);
 		}
@@ -1649,7 +1704,7 @@
 	String oldText = new String (Converter.mbcsToWcs (null, buffer));
 	int [] pos = new int [1];
 	OS.memmove (pos, position, 4);
-	int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+		int /*long*/ ptr = OS.gtk_entry_get_text (handle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	/* Use the selection when the text was deleted */
 	int start = pos [0], end = pos [0];
@@ -1690,6 +1745,15 @@
 }
 
 int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_key_press_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", widget: ").add(widget)
+         .add(", event: ").add(event)).log(Log.MTD);
+    }
+    // </QFS>
 	boolean handleSegments = false, segmentsCleared = false;
 	if (hooks (SWT.Segments) || filters (SWT.Segments)) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
@@ -1702,7 +1766,7 @@
 			}
 		}
 	}
-	int /*long*/ result = super.gtk_key_press_event (widget, event);
+        int /*long*/ result = super.gtk_key_press_event (widget, event);
 	if (result != 0) fixIM ();
 	if (gdkEventKey == -1) result = 1;
 	gdkEventKey = 0;
@@ -1798,7 +1862,7 @@
 int /*long*/ imContext () {
 	if ((style & SWT.SINGLE) != 0) {
 		return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;
-	} 
+	}
 	return OS.GTK_TEXTVIEW_IM_CONTEXT (handle);
 }
 
@@ -1850,9 +1914,9 @@
 		if (children != 0) {
 			/*
 			* When search or cancel icons are added to Text, those
-			* icon window(s) are added to the beginning of the list. 
+			* icon window(s) are added to the beginning of the list.
 			* In order to always return the correct window for Text,
-			* browse to the end of the list. 
+			* browse to the end of the list.
 			*/
 			do {
 				window = OS.g_list_data (children);
@@ -1898,8 +1962,8 @@
 
 void releaseWidget () {
 	super.releaseWidget ();
-	fixIM ();	
-	if (OS.GTK_VERSION < OS.VERSION (2, 6, 0)) {		 
+	fixIM ();
+	if (OS.GTK_VERSION < OS.VERSION (2, 6, 0)) {
 		/*
 		* Bug in GTK.  Any text copied into the clipboard will be lost when
 		* the GtkTextView is destroyed.  The fix is to paste the contents as
@@ -1935,7 +1999,7 @@
 	checkWidget ();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
-	eventTable.unhook (SWT.Modify, listener);	
+	eventTable.unhook (SWT.Modify, listener);
 }
 
 /**
@@ -1990,7 +2054,7 @@
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
 	eventTable.unhook(SWT.Selection, listener);
-	eventTable.unhook(SWT.DefaultSelection,listener);	
+	eventTable.unhook(SWT.DefaultSelection,listener);
 }
 
 /**
@@ -2014,7 +2078,7 @@
 	checkWidget ();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
-	eventTable.unhook (SWT.Verify, listener);	
+	eventTable.unhook (SWT.Verify, listener);
 }
 
 /**
@@ -2063,7 +2127,7 @@
  * Note: This operation is a hint and is not supported on
  * platforms that do not have this concept.
  * </p>
- * 
+ *
  * @param doubleClick the new double click flag
  *
  * @exception SWTException <ul>
@@ -2141,7 +2205,7 @@
  * <p>
  * Typically this is used in conjunction with <code>SWT.SEARCH</code>.
  * </p>
- * 
+ *
  * @param message the new message
  *
  * @exception IllegalArgumentException <ul>
@@ -2151,7 +2215,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public void setMessage (String message) {
@@ -2170,12 +2234,12 @@
  * </p>
  *
  * @param orientation new orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public void setOrientation (int orientation) {
@@ -2334,7 +2398,7 @@
 	if (tabs < 0) return;
 	setTabStops (this.tabs = tabs);
 }
-	
+
 void setTabStops (int tabs) {
 	if ((style & SWT.SINGLE) != 0) return;
 	int tabWidth = getTabWidth (tabs);
@@ -2363,9 +2427,9 @@
 	checkWidget ();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
 	/*
-	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and 
+	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and
 	* insertion of the text.  This is not wrong, but is inconsistent with other platforms.  The
-	* fix is to block the firing of these events and fire them ourselves in a consistent manner. 
+	* fix is to block the firing of these events and fire them ourselves in a consistent manner.
 	*/
 	if (hooks (SWT.Verify) || filters (SWT.Verify)) {
 		string = verifyText (string, 0, getCharCount ());
@@ -2399,9 +2463,9 @@
 	checkWidget ();
 	if (text == null) error (SWT.ERROR_NULL_ARGUMENT);
 	/*
-	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and 
+	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and
 	* insertion of the text.  This is not wrong, but is inconsistent with other platforms.  The
-	* fix is to block the firing of these events and fire them ourselves in a consistent manner. 
+	* fix is to block the firing of these events and fire them ourselves in a consistent manner.
 	*/
 	if (hooks (SWT.Verify) || filters (SWT.Verify)) {
 		String string = verifyText (new String(text), 0, getCharCount ());
@@ -2468,7 +2532,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #LIMIT
  */
 public void setTextLimit (int limit) {
@@ -2506,7 +2570,7 @@
  * in the receiver, this method simply returns.  Otherwise,
  * lines are scrolled until the selection is visible.
  * </p>
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -2525,7 +2589,7 @@
 	if (segments == null) return offset;
 	for (int i = 0, nSegments = segments.length; i < nSegments && offset - i >= segments[i]; i++) {
 		offset++;
-	}	
+	}
 	return offset;
 }
 
Index: org/eclipse/swt/widgets/TabItem.java
===================================================================
--- org/eclipse/swt/widgets/TabItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TabItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -271,9 +271,9 @@
 				if (selectedControl == newControl) return;
 			}
 			newControl.setVisible(false);
-			return;
-		}
+		return;
 	}
+	}
 	if (newControl != null) {
 		newControl.setBounds (parent.getClientArea ());
 		newControl.setVisible (true);
@@ -375,7 +375,7 @@
  * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
Index: org/eclipse/swt/widgets/FontDialog.java
===================================================================
--- org/eclipse/swt/widgets/FontDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/FontDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -58,7 +59,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -102,7 +103,7 @@
 /**
  * Returns a FontData object describing the font that was
  * selected in the dialog, or null if none is available.
- * 
+ *
  * @return the FontData for the selected font, or null
  * @deprecated use #getFontList ()
  */
@@ -113,7 +114,7 @@
 /**
  * Returns a FontData set describing the font that was
  * selected in the dialog, or null if none is available.
- * 
+ *
  * @return the FontData for the selected font, or null
  * @since 2.1.1
  */
@@ -131,7 +132,7 @@
  * @return the RGB value for the selected color, or null
  *
  * @see PaletteData#getRGBs
- * 
+ *
  * @since 2.1
  */
 public RGB getRGB () {
@@ -180,6 +181,9 @@
 		OS.g_free (fontName);
 		OS.gtk_font_selection_dialog_set_font_name (handle, buffer);
 	}
+        // <QFS>
+        display.runDialogShownHooks(this, handle);
+        // </QFS>
 	display.addIdleProc ();
 	Dialog oldModal = null;
 	if (OS.gtk_window_get_modal (handle)) {
@@ -206,7 +210,7 @@
 	if (OS.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	boolean success = response == OS.GTK_RESPONSE_OK; 
+	boolean success = response == OS.GTK_RESPONSE_OK;
 	if (success) {
 		int /*long*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle);
 		int length = OS.strlen (fontName);
@@ -216,8 +220,17 @@
 		int /*long*/ fontDesc = OS.pango_font_description_from_string (buffer);
 		Font font = Font.gtk_new (display, fontDesc);
 		fontData = font.getFontData () [0];
-		OS.pango_font_description_free (fontDesc);		
+		OS.pango_font_description_free (fontDesc);
 	}
+        // <QFS>
+        Object[] replaced = (Object[]) display.runDialogClosedHooks
+            (this, success ? new Object[] {fontData, null} : null);
+        if (replaced != null) {
+            fontData = (FontData) replaced[0];
+            rgb = (RGB) replaced[1];
+            success = true;
+        }
+        // </QFS>
 	display.removeIdleProc ();
 	OS.gtk_widget_destroy(handle);
 	if (!success) return null;
@@ -243,7 +256,7 @@
  * Sets a FontData object describing the font to be
  * selected by default in the dialog, or null to let
  * the platform choose one.
- * 
+ *
  * @param fontData the FontData to use initially, or null
  * @deprecated use #setFontList (FontData [])
  */
@@ -255,12 +268,12 @@
  * Sets the set of FontData objects describing the font to
  * be selected by default in the dialog, or null to let
  * the platform choose one.
- * 
+ *
  * @param fontData the set of FontData objects to use initially, or null
  *        to let the platform select a default when open() is called
  *
  * @see Font#getFontData
- * 
+ *
  * @since 2.1.1
  */
 public void setFontList (FontData [] fontData) {
@@ -278,7 +291,7 @@
  *        the platform select a default when open() is called
  *
  * @see PaletteData#getRGBs
- * 
+ *
  * @since 2.1
  */
 public void setRGB (RGB rgb) {
Index: org/eclipse/swt/widgets/Table.java
===================================================================
--- org/eclipse/swt/widgets/Table.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Table.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -163,7 +163,7 @@
 	* applications have consistent scroll bar behavior.
 	*/
 	if ((style & SWT.NO_SCROLL) == 0) {
-		style |= SWT.H_SCROLL | SWT.V_SCROLL;
+	style |= SWT.H_SCROLL | SWT.V_SCROLL;
 	}
 	/* GTK is always FULL_SELECTION */
 	style |= SWT.FULL_SELECTION;
@@ -216,14 +216,14 @@
 		}
 	}
 	if (customDraw) {
-		if (!ownerDraw) {
-			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
-			if (ptr [0] != 0) {
-				OS.g_object_set (cell, OS.cell_background_gdk, ptr [0], 0);
-				OS.gdk_color_free (ptr [0]);
+			if (!ownerDraw) {
+				ptr [0] = 0;
+				OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
+				if (ptr [0] != 0) {
+					OS.g_object_set (cell, OS.cell_background_gdk, ptr [0], 0);
+					OS.gdk_color_free (ptr [0]);
+				}
 			}
-		}
 		if (!isPixbuf) {
 			ptr [0] = 0;
 			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
@@ -528,8 +528,8 @@
 						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
 						OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
 						if (ptr [0] != 0) {
-							if (types [j] == OS.G_TYPE_STRING ()) {
-								OS.g_free ((ptr [0]));
+						if (types [j] == OS.G_TYPE_STRING ()) {
+							OS.g_free ((ptr [0]));
 							} else if (types [j] == OS.GDK_TYPE_COLOR()) {
 								OS.gdk_color_free (ptr [0]);
 							} else if (types [j] == OS.GDK_TYPE_PIXBUF()) {
@@ -624,8 +624,8 @@
 	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
 	if ((style & SWT.BORDER) != 0) OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
 	if ((style & SWT.VIRTUAL) != 0) {
-		OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
-	}
+			OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
+		}
 	if (!searchEnabled ()) {
 		/*
 		* Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE)
@@ -742,8 +742,8 @@
 	if ((style & SWT.CHECK) != 0 && check) {
 		OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
 		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
-		if (!ownerDraw) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
+			if (!ownerDraw) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
 		if (ownerDraw) {
 			OS.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
 			OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
@@ -788,10 +788,10 @@
 
 	/* Add attributes */
 	OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
-	if (!ownerDraw) {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-	}
+		if (!ownerDraw) {
+			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+		}
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
 	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
@@ -1660,7 +1660,7 @@
  */
 public int getSelectionIndex () {
 	checkWidget();
-	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+		int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
 	if (list != 0) {
 		int count = OS.g_list_length (list);
@@ -2579,7 +2579,7 @@
 			
 			if ((drawState & SWT.SELECTED) == 0) {
 				if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
-					Control control = findBackgroundControl ();
+				Control control = findBackgroundControl ();
 					if (control != null) {
 						drawBackground (control, window, 0, rect.x, rect.y, rect.width, rect.height);
 					}
@@ -3537,7 +3537,7 @@
 	if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
 		OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 	} else {
-		OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
+	OS.gtk_tree_view_widget_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 	}
 	if (ty[0] < visibleRect.y ) {
 		OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
Index: org/eclipse/swt/widgets/EventTable.java
===================================================================
--- org/eclipse/swt/widgets/EventTable.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/EventTable.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -40,7 +40,7 @@
 		if (types [i] == eventType) {
 			result [count++] = listeners [i];
 		}
-	}
+	}	
 	return result;
 }
 
Index: org/eclipse/swt/widgets/Tracker.java
===================================================================
--- org/eclipse/swt/widgets/Tracker.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Tracker.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -22,7 +23,7 @@
  *  These rectangles can be specified to respond to mouse and key events
  *  by either moving or resizing themselves accordingly.  Trackers are
  *  typically used to represent window geometries in a lightweight manner.
- *  
+ *
  * <dl>
  * <dt><b>Styles:</b></dt>
  * <dd>LEFT, RIGHT, UP, DOWN, RESIZE</dd>
@@ -58,7 +59,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -96,7 +97,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -104,7 +105,7 @@
  * </p><p>
  * Note: Currently, null can be passed in for the display argument.
  * This has the effect of creating the tracker on the currently active
- * display if there is one. If there is no current display, the 
+ * display if there is one. If there is no current display, the
  * tracker is created on a "default" display. <b>Passing in null as
  * the display argument is not considered to be good coding style,
  * and may not be supported in a future release of SWT.</b>
@@ -117,7 +118,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
- * 
+ *
  * @see SWT#LEFT
  * @see SWT#RIGHT
  * @see SWT#UP
@@ -189,14 +190,14 @@
 	addListener(SWT.KeyDown,typedListener);
 }
 
-Point adjustMoveCursor () {	
+Point adjustMoveCursor () {
 	if (bounds == null) return null;
 	int newX = bounds.x + bounds.width / 2;
 	int newY = bounds.y;
-	
+
 	Point point = display.map (parent, null, newX, newY);
 	display.setCursorLocation (point);
-	
+
 	/*
 	 * The call to XWarpPointer does not always place the pointer on the
 	 * exact location that is specified, so do a query (below) to get the
@@ -218,7 +219,7 @@
 	} else {
 		newX = bounds.x + bounds.width / 2;
 	}
-	
+
 	if ((cursorOrientation & SWT.UP) != 0) {
 		newY = bounds.y;
 	} else if ((cursorOrientation & SWT.DOWN) != 0) {
@@ -229,7 +230,7 @@
 
 	Point point = display.map (parent, null, newX, newY);
 	display.setCursorLocation (point);
-	
+
 	/*
 	 * The call to XWarpPointer does not always place the pointer on the
 	 * exact location that is specified, so do a query (below) to get the
@@ -268,16 +269,16 @@
 	int yMin = rectangles [0].y;
 	int xMax = rectangles [0].x + rectangles [0].width;
 	int yMax = rectangles [0].y + rectangles [0].height;
-	
+
 	for (int i = 1; i < rectangles.length; i++) {
 		if (rectangles [i].x < xMin) xMin = rectangles [i].x;
 		if (rectangles [i].y < yMin) yMin = rectangles [i].y;
 		int rectRight = rectangles [i].x + rectangles [i].width;
-		if (rectRight > xMax) xMax = rectRight;		
+		if (rectRight > xMax) xMax = rectRight;
 		int rectBottom = rectangles [i].y + rectangles [i].height;
 		if (rectBottom > yMax) yMax = rectBottom;
 	}
-	
+
 	return new Rectangle (xMin, yMin, xMax - xMin, yMax - yMin);
 }
 
@@ -299,7 +300,7 @@
 			} else {
 				height = 100;
 			}
-			result [i] = new Rectangle (x, y, width, height);			
+			result [i] = new Rectangle (x, y, width, height);
 		}
 	}
 	return result;
@@ -309,7 +310,7 @@
 	int /*long*/ window = OS.gdk_get_default_root_window();
 	if (parent != null) {
 		window = OS.GTK_WIDGET_WINDOW (parent.paintHandle());
-	} 
+	}
 	if (window == 0) return;
 	//TODO: Use Cairo
 	int /*long*/ gc = OS.gdk_gc_new (window);
@@ -335,7 +336,7 @@
  * coordinates.
  *
  * @return the bounds of the Rectangles being drawn
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -382,9 +383,9 @@
 	GdkEventKey keyEvent = new GdkEventKey ();
 	OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
 	int stepSize = ((keyEvent.state & OS.GDK_CONTROL_MASK) != 0) ? STEPSIZE_SMALL : STEPSIZE_LARGE;
-	int xChange = 0, yChange = 0;	
+	int xChange = 0, yChange = 0;
 	switch (keyEvent.keyval) {
-		case OS.GDK_Escape: 
+		case OS.GDK_Escape:
 			cancelled = true;
 			// fallthrough
 		case OS.GDK_Return:
@@ -652,9 +653,9 @@
  * Displays the Tracker rectangles for manipulation by the user.  Returns when
  * the user has either finished manipulating the rectangles or has cancelled the
  * Tracker.
- * 
+ *
  * @return <code>true</code> if the user did not cancel the Tracker, <code>false</code> otherwise
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -665,10 +666,27 @@
 	window = OS.gdk_get_default_root_window();
 	if (parent != null) {
 		window = OS.GTK_WIDGET_WINDOW (parent.paintHandle());
-	} 
+	}
 	if (window == 0) return false;
 	cancelled = false;
 	tracking = true;
+        // <QFS>
+        // Check if we're running a eclipse.ui DnD loop and inform the display if necessary.
+        java.io.ByteArrayOutputStream os = new java.io.ByteArrayOutputStream();
+        java.io.PrintWriter pw = new java.io.PrintWriter (os);
+        try {
+            throw new Exception();
+        } catch (Exception ex) {
+            ex.printStackTrace(pw);
+        }
+        pw.close();
+        String dump = os.toString();
+        boolean insideDnD = dump.indexOf("org.eclipse.ui.internal.dnd.DragUtil.performDrag") > 0;
+        if (insideDnD) {
+            display.runDNDTrackerHooks(true, false);
+        }
+        // </QFS>
+
 	update ();
 	drawRectangles (rectangles);
 	int [] oldX = new int [1], oldY = new int [1], state = new int [1];
@@ -687,7 +705,7 @@
 		cursorOrientation |= hStyle;
 	}
 
-	int mask = OS.GDK_BUTTON1_MASK | OS.GDK_BUTTON2_MASK | OS.GDK_BUTTON3_MASK; 
+	int mask = OS.GDK_BUTTON1_MASK | OS.GDK_BUTTON2_MASK | OS.GDK_BUTTON3_MASK;
 	boolean mouseDown = (state [0] & mask) != 0;
 	if (!mouseDown) {
 		Point cursorPos = null;
@@ -703,7 +721,7 @@
 	}
 	this.oldX = oldX [0];
 	this.oldY = oldY [0];
-	
+
 	grabbed = grab ();
 	lastCursor = this.cursor != null ? this.cursor.handle : 0;
 
@@ -720,10 +738,20 @@
 			if (eventPtr != 0) {
 				break;
 			} else {
-				display.runAsyncMessages (false);
-				try { Thread.sleep(50); } catch (Exception ex) {}
+                                // <QFS> Additional async message entry point and sleep reduced
+                                // from 50 to 20 ms to get better async response.
+                                // display.runAsyncMessages (false);
+                                display.runIdleProcs();
+                                try {Thread.sleep(20);} catch (Exception ex) {}
+                                // </QFS>
 			}
 		}
+                // <QFS> Optional event filter at Gdk level
+                if (! display.runGdkEventFilters(eventPtr, OS.GDK_EVENT_TYPE(eventPtr))) {
+                    OS.gdk_event_free (eventPtr);
+                    continue;
+                }
+                // </QFS>
 		OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
 		int /*long*/ widget = OS.gtk_get_event_widget (eventPtr);
 		switch (gdkEvent.type) {
@@ -756,6 +784,11 @@
 	}
 	ungrab ();
 	window = 0;
+        // <QFS>
+        if (insideDnD) {
+            display.runDNDTrackerHooks(false, cancelled);
+        }
+        // </QFS>
 	return !cancelled;
 }
 
@@ -835,12 +868,12 @@
 	if (yChange > 0 && ((style & SWT.DOWN) != 0) && ((cursorOrientation & SWT.UP) == 0)) {
 		cursorOrientation |= SWT.DOWN;
 	}
-	
+
 	/*
 	 * If the bounds will flip about the x or y axis then apply the adjustment
 	 * up to the axis (ie.- where bounds width/height becomes 0), change the
 	 * cursor's orientation accordingly, and flip each Rectangle's origin (only
-	 * necessary for > 1 Rectangles) 
+	 * necessary for > 1 Rectangles)
 	 */
 	if ((cursorOrientation & SWT.LEFT) != 0) {
 		if (xChange > bounds.width) {
@@ -902,7 +935,7 @@
 			}
 		}
 	}
-	
+
 	// apply the bounds adjustment
 	if ((cursorOrientation & SWT.LEFT) != 0) {
 		bounds.x += xChange;
@@ -916,7 +949,7 @@
 	} else if ((cursorOrientation & SWT.DOWN) != 0) {
 		bounds.height += yChange;
 	}
-	
+
 	Rectangle [] newRects = new Rectangle [rectangles.length];
 	for (int i = 0; i < rectangles.length; i++) {
 		Rectangle proportion = proportions[i];
@@ -926,7 +959,7 @@
 			proportion.width * bounds.width / 100,
 			proportion.height * bounds.height / 100);
 	}
-	rectangles = newRects;	
+	rectangles = newRects;
 }
 
 /**
@@ -934,7 +967,7 @@
  * then the cursor reverts to the default.
  *
  * @param newCursor the new <code>Cursor</code> to display
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
Index: org/eclipse/swt/widgets/DateTime.java
===================================================================
--- org/eclipse/swt/widgets/DateTime.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/DateTime.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -123,16 +123,16 @@
 }
 
 void createText(boolean dropDown) {
-	calendar = Calendar.getInstance();
-	formatSymbols = new DateFormatSymbols();
-	text = new Text(this, SWT.SINGLE);
-	/* disable the native drag and drop for the date/time text field */
-	OS.gtk_drag_dest_unset(text.handle);
+		calendar = Calendar.getInstance();
+		formatSymbols = new DateFormatSymbols();
+		text = new Text(this, SWT.SINGLE);
+		/* disable the native drag and drop for the date/time text field */
+		OS.gtk_drag_dest_unset(text.handle);
 	if ((style & SWT.DATE) != 0) {
 		setFormat((style & SWT.SHORT) != 0 ? DEFAULT_SHORT_DATE_FORMAT : (style & SWT.LONG) != 0 ? DEFAULT_LONG_DATE_FORMAT : DEFAULT_MEDIUM_DATE_FORMAT);
 	} else { /* SWT.TIME */
 		setFormat((style & SWT.SHORT) != 0 ? DEFAULT_SHORT_TIME_FORMAT : (style & SWT.LONG) != 0 ? DEFAULT_LONG_TIME_FORMAT : DEFAULT_MEDIUM_TIME_FORMAT);
-	}
+		}
 	text.setText(getFormattedString(style));
 	
 	addListener(SWT.Resize, new Listener() {
@@ -140,9 +140,9 @@
 			onResize(event);
 		}
 	});
-	Listener listener = new Listener() {
-		public void handleEvent(Event event) {
-			switch(event.type) {
+		Listener listener = new Listener() {
+			public void handleEvent(Event event) {
+				switch(event.type) {
 				case SWT.KeyDown: onTextKeyDown(event); break;
 				case SWT.FocusIn: onTextFocusIn(event); break;
 				case SWT.FocusOut: onTextFocusOut(event); break;
@@ -150,9 +150,9 @@
 				case SWT.MouseUp: onTextMouseClick(event); break;
 				case SWT.MenuDetect: notifyListeners(SWT.MenuDetect, event); break;
 				case SWT.Verify: onTextVerify(event); break;
+				}
 			}
-		}
-	};
+		};
 	int [] listeners = new int [] {SWT.KeyDown, SWT.FocusIn, SWT.FocusOut, SWT.MouseDown, SWT.MouseUp, SWT.MenuDetect, SWT.Verify};
 	for (int i = 0; i < listeners.length; i++) {
 		text.addListener(listeners [i], listener);
@@ -187,7 +187,7 @@
 	down = new Button(this, SWT.ARROW  | SWT.DOWN);
 	OS.GTK_WIDGET_UNSET_FLAGS(down.handle, OS.GTK_CAN_FOCUS);
 	down.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
+			public void handleEvent(Event event) {
 			boolean dropped = isDropped();
 			popupCalendar.calendarDisplayed = !dropped;
 			setFocus();
@@ -214,9 +214,9 @@
 					public void run() {
 						if (isDisposed()) return;
 						handleFocus (SWT.FocusOut);
-					}
-				});
 			}
+		});
+	}
 		}
 	};
 	popupFilter = new Listener() {
@@ -343,8 +343,8 @@
 		handle = OS.gtk_calendar_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 		OS.gtk_container_add (fixedHandle, handle);
-		OS.gtk_calendar_set_display_options(handle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
-	} else {
+			OS.gtk_calendar_set_display_options(handle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
+		} else {
 		super.createHandle(index);
 	}
 }
@@ -836,7 +836,7 @@
 				popupShell = null;
 				popupCalendar = null;
 				createPopupShell (year, month, day);
-			}
+	}
 			break;
 		case SWT.FocusIn: {
 			handleFocus (SWT.FocusIn);
@@ -849,11 +849,11 @@
 			if (rect.contains(point)) {
 				boolean popupShellActivated = getDisplay().getActiveShell() == getShell();
 				if (!popupShellActivated) dropDownCalendar(false);
-				break;
+			break;
 			}
 			dropDownCalendar(false);
-			break;
-		}
+					break;
+			}
 		case SWT.MouseUp: {
 			if (event.button != 1) return;
 			/*
@@ -865,7 +865,7 @@
 				OS.gtk_calendar_clear_marks(popupCalendar.handle);
 			} else {
 				dropDownCalendar (false);
-			}
+	}
 			break;
 		}
 		case SWT.Selection: {
@@ -880,7 +880,7 @@
 			notifyListeners (SWT.Selection, e);
 			event.doit = e.doit;
 			break;
-		}
+	}
 		case SWT.Traverse: {
 			switch (event.detail) {
 				case SWT.TRAVERSE_RETURN:
@@ -887,7 +887,7 @@
 				case SWT.TRAVERSE_ESCAPE:
 				case SWT.TRAVERSE_ARROW_PREVIOUS:
 				case SWT.TRAVERSE_ARROW_NEXT:
-					event.doit = false;
+	event.doit = false;
 					break;
 				case SWT.TRAVERSE_TAB_NEXT:
 				case SWT.TRAVERSE_TAB_PREVIOUS:
@@ -897,8 +897,8 @@
 					return;
 				case SWT.TRAVERSE_PAGE_NEXT:
 				case SWT.TRAVERSE_PAGE_PREVIOUS:
-					return;
-			}
+		return;
+	}
 			Event e = new Event ();
 			e.time = event.time;
 			e.detail = event.detail;
@@ -918,7 +918,7 @@
 			e.stateMask = event.stateMask;
 			notifyListeners (SWT.KeyUp, e);
 			break;
-		}
+	}
 		case SWT.KeyDown: {
 			if (event.character == SWT.ESC) {
 				/* Escape key cancels popupCalendar and reverts date */
@@ -943,8 +943,8 @@
 			e.stateMask = event.stateMask;
 			notifyListeners(SWT.KeyDown, e);
 			break;
-		}
 	}
+				}
 }
 
 void handleFocus (int type) {
@@ -963,7 +963,7 @@
 			Event e = new Event ();
 			notifyListeners (SWT.FocusIn, e);
 			break;
-		}
+			}
 		case SWT.FocusOut: {
 			if (!hasFocus) return;
 			Control focusControl = getDisplay ().getFocusControl ();
@@ -1177,15 +1177,15 @@
 	int prependCount = end - start - buffer.length();
 	for (int i = 0; i < prependCount; i++) {
 		switch (fieldName) {
-			case Calendar.MINUTE:
-			case Calendar.SECOND:
-				buffer.insert(0, 0);
-				break;
-			default:
-				buffer.insert(0, ' ');
-				break;
+		case Calendar.MINUTE:
+		case Calendar.SECOND:
+			buffer.insert(0, 0);
+		break;
+		default:
+		buffer.insert(0, ' ');
+		break;
 		}
-	}		
+	}
 	newValue = buffer.toString();
 	ignoreVerify = true;
 	text.insert(newValue);
Index: org/eclipse/swt/widgets/Synchronizer.java
===================================================================
--- org/eclipse/swt/widgets/Synchronizer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Synchronizer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -14,7 +15,12 @@
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.Compatibility;
- 
+
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class provide synchronization support
  * for displays. A default instance is created automatically
@@ -25,7 +31,7 @@
  * needs to deal with this class. It is provided only to
  * allow applications which require non-standard
  * synchronization behavior to plug in the support they
- * require. <em>Subclasses which override the methods in 
+ * require. <em>Subclasses which override the methods in
  * this class must ensure that the superclass methods are
  * invoked in their implementations</em>
  * </p>
@@ -39,6 +45,13 @@
 	RunnableLock [] messages;
 	Object messageLock = new Object ();
 	Thread syncThread;
+    // <QFS>
+    /**
+     * The logger used for logging.
+     */
+    private final static Logger logger = new Logger("org.eclipse.swt.widgets.Synchronizer");
+    // </QFS>
+
 	static final int GROW_SIZE = 4;
 	static final int MESSAGE_LIMIT = 64;
 
@@ -49,13 +62,22 @@
 
 /**
  * Constructs a new instance of this class.
- * 
+ *
  * @param display the display to create the synchronizer on
  */
 public Synchronizer (Display display) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("Synchronizer(Display)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", display: ").add(display)).log(Log.MTD);
+    }
+    // </QFS>
+
 	this.display = display;
 }
-	
+
 void addLast (RunnableLock lock) {
 	boolean wake = false;
 	synchronized (messageLock) {
@@ -67,14 +89,66 @@
 		}
 		messages [messageCount++] = lock;
 		wake = messageCount == 1;
-	}	
+	}
 	if (wake) display.wakeThread ();
 }
 
+    // <QFS> Delegate to asyncExec except for special cases where QF-Test calls must not be
+    // blocked in a derived class.
+    /**
+     * Causes the <code>run()</code> method of the runnable to
+     * be invoked by the user-interface thread at the next
+     * reasonable opportunity. The caller of this method continues
+     * to run in parallel, and is not notified when the
+     * runnable has completed.
+     *
+     * @param runnable code to run on the user-interface thread.
+     *
+     * @see #syncExec
+     */
+    protected void internalAsyncExec (Runnable runnable) {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("internalAsyncExec(Runnable)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("runnable: ").add(runnable)).log(Log.MTD);
+        }
+        if (runnable != null
+            && "org.eclipse.ui.internal.UISynchronizer".equals(getClass().getName())
+            && runnable.getClass().getName().startsWith("de.qfs.")) {
+            trueAsyncExec(runnable);
+        } else {
+            asyncExec(runnable);
+        }
+    }
+    // </QFS>
+
+    // <QFS> Delegate to trueAsyncExec.
+    /**
+     * Causes the <code>run()</code> method of the runnable to
+     * be invoked by the user-interface thread at the next
+     * reasonable opportunity. The caller of this method continues
+     * to run in parallel, and is not notified when the
+     * runnable has completed.
+     *
+     * @param runnable code to run on the user-interface thread.
+     *
+     * @see #syncExec
+     */
+    protected void asyncExec (Runnable runnable) {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("asyncExec(Runnable)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("runnable: ").add(runnable)).log(Log.MTD);
+        }
+        trueAsyncExec(runnable);
+    }
+    // </QFS>
+
+    // <QFS/> Copy of original asyncExec.
 /**
  * Causes the <code>run()</code> method of the runnable to
- * be invoked by the user-interface thread at the next 
- * reasonable opportunity. The caller of this method continues 
+ * be invoked by the user-interface thread at the next
+ * reasonable opportunity. The caller of this method continues
  * to run in parallel, and is not notified when the
  * runnable has completed.
  *
@@ -82,14 +156,22 @@
  *
  * @see #syncExec
  */
-protected void asyncExec (Runnable runnable) {
+void trueAsyncExec (Runnable runnable) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("trueAsyncExec(Runnable)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", runnable: ").add(runnable)).log(Log.MTD);
+    }
+    // </QFS>
 	if (runnable == null) {
 		//TEMPORARY CODE
 		if (!(IS_CARBON || IS_GTK || IS_COCOA)) {
-			display.wake ();
-			return;
-		}
+		display.wake ();
+		return;
 	}
+	}
 	addLast (new RunnableLock (runnable));
 }
 
@@ -124,6 +206,14 @@
 }
 
 boolean runAsyncMessages (boolean all) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("runAsyncMessages(boolean)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", all: ").add(all)).log(Log.MTD);
+    }
+    // </QFS>
 	boolean run = false;
 	do {
 		RunnableLock lock = removeFirst ();
@@ -145,9 +235,67 @@
 	return run;
 }
 
+    // <QFS> Delegate to syncExec except for special cases where QF-Test calls must not be
+    // blocked in a derived class.
+    /**
+     * Causes the <code>run()</code> method of the runnable to
+     * be invoked by the user-interface thread at the next
+     * reasonable opportunity. The thread which calls this method
+     * is suspended until the runnable completes.
+     *
+     * @param runnable code to run on the user-interface thread.
+     *
+     * @exception SWTException <ul>
+     *    <li>ERROR_FAILED_EXEC - if an exception occurred when executing the runnable</li>
+     * </ul>
+     *
+     * @see #asyncExec
+     */
+    protected void internalSyncExec (Runnable runnable) {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("internalSyncExec(Runnable)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("runnable: ").add(runnable)).log(Log.MTD);
+        }
+        if (runnable != null
+            && "org.eclipse.ui.internal.UISynchronizer".equals(getClass().getName())
+            && runnable.getClass().getName().startsWith("de.qfs.")) {
+            trueSyncExec(runnable);
+        } else {
+            syncExec(runnable);
+        }
+    }
+    // </QFS>
+
+    // <QFS> Delegate to trueSyncExec.
+    /**
+     * Causes the <code>run()</code> method of the runnable to
+     * be invoked by the user-interface thread at the next
+     * reasonable opportunity. The thread which calls this method
+     * is suspended until the runnable completes.
+     *
+     * @param runnable code to run on the user-interface thread.
+     *
+     * @exception SWTException <ul>
+     *    <li>ERROR_FAILED_EXEC - if an exception occurred when executing the runnable</li>
+     * </ul>
+     *
+     * @see #asyncExec
+     */
+    protected void syncExec (Runnable runnable) {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("syncExec(Runnable)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("runnable: ").add(runnable)).log(Log.MTD);
+        }
+        trueSyncExec(runnable);
+    }
+    // </QFS>
+
+    // <QFS/> Copy of original syncExec.
 /**
  * Causes the <code>run()</code> method of the runnable to
- * be invoked by the user-interface thread at the next 
+ * be invoked by the user-interface thread at the next
  * reasonable opportunity. The thread which calls this method
  * is suspended until the runnable completes.
  *
@@ -159,21 +307,29 @@
  *
  * @see #asyncExec
  */
-protected void syncExec (Runnable runnable) {
+protected void trueSyncExec (Runnable runnable) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("trueSyncExec(Runnable)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", runnable: ").add(runnable)).log(Log.MTD);
+    }
+    // </QFS>
 	RunnableLock lock = null;
 	synchronized (Device.class) {
 		if (display == null || display.isDisposed ()) SWT.error (SWT.ERROR_DEVICE_DISPOSED);
 		if (!display.isValidThread ()) {
-			if (runnable == null) {
-				display.wake ();
-				return;
-			}
+                        if (runnable == null) {
+                                display.wake ();
+                                return;
+                        }
 			lock = new RunnableLock (runnable);
-			/*
-			 * Only remember the syncThread for syncExec.
-			 */
-			lock.thread = Thread.currentThread();
-			addLast (lock);
+                        /*
+                         * Only remember the syncThread for syncExec.
+                         */
+                        lock.thread = Thread.currentThread();
+                        addLast (lock);
 		}
 	}
 	if (lock == null) {
Index: org/eclipse/swt/widgets/MessageBox.java
===================================================================
--- org/eclipse/swt/widgets/MessageBox.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/MessageBox.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -15,6 +16,11 @@
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class are used to inform or warn the user.
  * <dl>
@@ -39,6 +45,13 @@
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class MessageBox extends Dialog {
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Dialog");
+    // </QFS>
 
 	String message = "";
 	int /*long*/ handle;
@@ -65,7 +78,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -81,7 +94,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
- * 
+ *
  * @see SWT#ICON_ERROR
  * @see SWT#ICON_INFORMATION
  * @see SWT#ICON_QUESTION
@@ -117,7 +130,7 @@
  * visible on the dialog while it is open.
  *
  * @param string the message
- * 
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
@@ -149,7 +162,7 @@
 	if ((style & (SWT.ICON_WARNING)) != 0)  messageType = OS.GTK_MESSAGE_WARNING;
 	if ((style & (SWT.ICON_QUESTION)) != 0) messageType = OS.GTK_MESSAGE_QUESTION;
 	if ((style & (SWT.ICON_ERROR)) != 0)    messageType = OS.GTK_MESSAGE_ERROR;
-	
+
 	byte [] buffer = Converter.wcsToMbcs (null, fixPercent (message), true);
 	handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);
 	if (handle == 0) error(SWT.ERROR_NO_HANDLES);
@@ -164,6 +177,9 @@
 	createButtons (display.getDismissalAlignment ());
 	buffer = Converter.wcsToMbcs(null, title, true);
 	OS.gtk_window_set_title(handle,buffer);
+        // <QFS>
+        _qfGetDisplay().runDialogShownHooks(this, handle);
+        // </QFS>
 	display.addIdleProc ();
 	Dialog oldModal = null;
 	/*
@@ -185,7 +201,7 @@
 	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);
-	}	
+	}
 	int response = OS.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
@@ -199,15 +215,24 @@
 	}
 	if (OS.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
-	}	
+	}
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy (handle);
+        // <QFS>
+        Object ret = _qfGetDisplay().runDialogClosedHooks(this, new Integer (response));
+        if (logger.level >= Log.DBG) {
+            logger.build("open()").add("ret: ").add(ret).log(Log.DBG);
+        }
+        if (ret instanceof Integer) {
+            response = ((Integer) ret).intValue();
+        }
+        // </QFS>
+	OS.gtk_widget_destroy(handle);
 	return response;
 }
 
 private void createButtons (int alignment) {
 	if (alignment == SWT.LEFT) {
-		if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
+	if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
 		if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
 		if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
 		if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
@@ -214,14 +239,14 @@
 		if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-no", true), SWT.NO);
 		if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
 		if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
-	} else {		
-		if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
+	} else {
+	if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
 		if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
 		if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-no", true), SWT.NO);
-		if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
+	if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
 		if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
 		if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
-		if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
+	if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
 	}
 }
 
@@ -249,6 +274,6 @@
 		}
 		result [j++] = text [i++];
 	}
-	return result;    
+	return result;
 }
 }
Index: org/eclipse/swt/widgets/Caret.java
===================================================================
--- org/eclipse/swt/widgets/Caret.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Caret.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -41,7 +41,7 @@
 	int blinkRate;
 	Image image;
 	Font font;
-	
+
 	static final int DEFAULT_WIDTH = 1;
 
 /**
Index: org/eclipse/swt/widgets/Dialog.java
===================================================================
--- org/eclipse/swt/widgets/Dialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Dialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,11 +7,16 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
 
 import org.eclipse.swt.*;
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
 
 /**
  * This class is the abstract superclass of the classes
@@ -27,7 +32,7 @@
  * <pre><code>
  * public class MyDialog extends Dialog {
  *	Object result;
- *		
+ *
  *	public MyDialog (Shell parent, int style) {
  *		super (parent, style);
  *	}
@@ -54,7 +59,7 @@
  * by every subclass on every platform. If a modality style is
  * not supported, it is "upgraded" to a more restrictive modality
  * style that is supported.  For example, if <code>PRIMARY_MODAL</code>
- * is not supported by a particular dialog, it would be upgraded to 
+ * is not supported by a particular dialog, it would be upgraded to
  * <code>APPLICATION_MODAL</code>. In addition, as is the case
  * for shells, the window manager for the desktop on which the
  * instance is visible has ultimate control over the appearance
@@ -69,7 +74,7 @@
  * Note: Only one of the styles APPLICATION_MODAL, PRIMARY_MODAL,
  * and SYSTEM_MODAL may be specified.
  * </p>
- * 
+ *
  * @see Shell
  * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
@@ -76,6 +81,14 @@
  */
 
 public abstract class Dialog {
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Dialog");
+    // </QFS>
+
 	int style;
 	Shell parent;
 	String title;
@@ -103,7 +116,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -118,7 +131,7 @@
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  * </ul>
- * 
+ *
  * @see SWT#PRIMARY_MODAL
  * @see SWT#APPLICATION_MODAL
  * @see SWT#SYSTEM_MODAL
@@ -128,6 +141,9 @@
 	this.parent = parent;
 	this.style = style;
 	title = "";
+        // <QFS>
+        _qfGetDisplay().runDialogCreationHooks(this);
+        // </QFS>
 }
 
 /**
@@ -198,6 +214,17 @@
 	SWT.error(code);
 }
 
+    // <QFS>
+    /**
+     * Get the display of the dialog.
+     *
+     * @return  The display of the dialog.
+     */
+    protected final Display _qfGetDisplay() {
+        return parent != null ? parent.display : Display.getCurrent ();
+    }
+    // </QFS>
+
 /**
  * Returns the receiver's parent, which must be a <code>Shell</code>
  * or null.
@@ -218,7 +245,7 @@
  * <p>
  * Note that, the value which is returned by this method <em>may
  * not match</em> the value which was provided to the constructor
- * when the receiver was created. 
+ * when the receiver was created.
  * </p>
  *
  * @return the style bits
@@ -235,7 +262,7 @@
 /**
  * Returns the receiver's text, which is the string that the
  * window manager will typically display as the receiver's
- * <em>title</em>. If the text has not previously been set, 
+ * <em>title</em>. If the text has not previously been set,
  * returns an empty string.
  *
  * @return the text
@@ -252,7 +279,7 @@
 /**
  * Sets the receiver's text, which is the string that the
  * window manager will typically display as the receiver's
- * <em>title</em>, to the argument, which must not be null. 
+ * <em>title</em>, to the argument, which must not be null.
  *
  * @param string the new text
  *
Index: org/eclipse/swt/widgets/Combo.java
===================================================================
--- org/eclipse/swt/widgets/Combo.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Combo.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -16,10 +17,14 @@
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
 
 /**
  * Instances of this class are controls that allow the user
- * to choose an item from a list of items, or optionally 
+ * to choose an item from a list of items, or optionally
  * enter a new value by typing it into an editable text
  * field. Often, <code>Combo</code>s are used in the same place
  * where a single selection <code>List</code> widget could
@@ -32,7 +37,7 @@
  * which access one versus the other (compare for example,
  * <code>clearSelection()</code> and <code>deselectAll()</code>).
  * The API documentation is careful to indicate either "the
- * receiver's list" or the "the receiver's text field" to 
+ * receiver's list" or the "the receiver's text field" to
  * distinguish between the two cases.
  * </p><p>
  * Note that although this class is a subclass of <code>Composite</code>,
@@ -69,7 +74,7 @@
 	 * that the text field in an instance of this class can hold
 	 */
 	public final static int LIMIT;
-	
+
 	/*
 	* These values can be different on different platforms.
 	* Therefore they are not initialized in the declaration
@@ -79,6 +84,12 @@
 		LIMIT = 0xFFFF;
 	}
 
+    /**
+     * <QFS/> The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Text");
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -85,7 +96,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -169,10 +180,10 @@
 	System.arraycopy (items, index, newItems, index + 1, items.length - index);
 	items = newItems;
 	byte [] buffer = Converter.wcsToMbcs (null, string, true);
-	OS.gtk_combo_box_insert_text (handle, index, buffer);
-	if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-		OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
-	}
+		OS.gtk_combo_box_insert_text (handle, index, buffer);
+		if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
+			OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
+		}
 }
 
 /**
@@ -251,7 +262,7 @@
  *
  * @see VerifyListener
  * @see #removeVerifyListener
- * 
+ *
  * @since 3.1
  */
 public void addVerifyListener (VerifyListener listener) {
@@ -275,7 +286,7 @@
 	* all platforms.
 	*/
 	style &= ~SWT.BORDER;
-	
+
 	/*
 	* Even though it is legal to create this widget
 	* with scroll bars, they serve no useful purpose
@@ -299,7 +310,7 @@
  * text field is editable, this has the effect of placing the
  * i-beam at the start of the text.
  * <p>
- * Note: To clear the selected items in the receiver's list, 
+ * Note: To clear the selected items in the receiver's list,
  * use <code>deselectAll()</code>.
  * </p>
  *
@@ -319,24 +330,24 @@
 }
 
 void clearText () {
-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	if ((style & SWT.READ_ONLY) != 0) {
-		int index = OS.gtk_combo_box_get_active (handle);
-		if (index != -1) {
-			int /*long*/ modelHandle = OS.gtk_combo_box_get_model (handle);
-			int /*long*/ [] ptr = new int /*long*/ [1];
-			int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-			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);
-			if (ptr [0] != 0 && OS.strlen (ptr [0]) > 0) postEvent (SWT.Modify);
-			OS.g_free (ptr [0]);
+		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		if ((style & SWT.READ_ONLY) != 0) {
+			int index = OS.gtk_combo_box_get_active (handle);
+			if (index != -1) {
+				int /*long*/ modelHandle = OS.gtk_combo_box_get_model (handle);
+				int /*long*/ [] ptr = new int /*long*/ [1];
+				int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+				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);
+				if (ptr [0] != 0 && OS.strlen (ptr [0]) > 0) postEvent (SWT.Modify);
+				OS.g_free (ptr [0]);
+			}
+		} else {
+			OS.gtk_entry_set_text (entryHandle, new byte[1]);
 		}
-	} else {
-		OS.gtk_entry_set_text (entryHandle, new byte[1]);
-	}
-	OS.gtk_combo_box_set_active (handle, -1);
-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		OS.gtk_combo_box_set_active (handle, -1);
+ 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
 public Point computeSize (int wHint, int hHint, boolean changed) {
@@ -384,7 +395,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public void copy () {
@@ -397,61 +408,61 @@
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	OS.gtk_fixed_set_has_window (fixedHandle, true);
-	int /*long*/ oldList = OS.gtk_window_list_toplevels ();  
-	if ((style & SWT.READ_ONLY) != 0) {
-		handle = OS.gtk_combo_box_new_text ();
-		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		cellHandle = OS.gtk_bin_get_child (handle);
-		if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	} else {
-		handle = OS.gtk_combo_box_entry_new_text ();
-		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		entryHandle = OS.gtk_bin_get_child (handle);
-		if (entryHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	}
-	popupHandle = findPopupHandle (oldList);    
-	OS.gtk_container_add (fixedHandle, handle);
-	textRenderer = OS.gtk_cell_renderer_text_new ();
-	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
-	/*
-	* Feature in GTK. In order to make a read only combo box the same
-	* height as an editable combo box the ypad must be set to 0. In 
-	* versions 2.4.x of GTK, a pad of 0 will clip some letters. The
-	* fix is to set the pad to 1.
-	*/
-	int pad = 0;
-	if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) pad = 1;
-	OS.g_object_set (textRenderer, OS.ypad, pad, 0);
-	/*
-	* Feature in GTK.  In version 2.4.9 of GTK, a warning is issued
-	* when a call to gtk_cell_layout_clear() is made. The fix is to hide
-	* the warning.
-	*/
-	boolean warnings = display.getWarnings ();
-	display.setWarnings (false);
-	OS.gtk_cell_layout_clear (handle);
-	display.setWarnings (warnings);
-	OS.gtk_cell_layout_pack_start (handle, textRenderer, true);
-	OS.gtk_cell_layout_set_attributes (handle, textRenderer, OS.text, 0, 0);
-	/*
-	* Feature in GTK. Toggle button creation differs between GTK versions. The 
-	* fix is to call size_request() to force the creation of the button 
-	* for those versions of GTK that defer the creation. 
-	*/
-	if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
-		OS.gtk_widget_size_request(handle, new GtkRequisition());
-	}
-	if (popupHandle != 0) findMenuHandle ();
-	findButtonHandle ();
-	/*
-	* Feature in GTK. By default, read only combo boxes 
-	* process the RETURN key rather than allowing the 
-	* default button to process the key. The fix is to
-	* clear the GTK_RECEIVES_DEFAULT flag.
-	*/
-	if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) {
-		OS.GTK_WIDGET_UNSET_FLAGS (buttonHandle, OS.GTK_RECEIVES_DEFAULT);
-	}
+		int /*long*/ oldList = OS.gtk_window_list_toplevels ();  
+		if ((style & SWT.READ_ONLY) != 0) {
+			handle = OS.gtk_combo_box_new_text ();
+			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+			cellHandle = OS.gtk_bin_get_child (handle);
+			if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		} else {
+			handle = OS.gtk_combo_box_entry_new_text ();
+			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+			entryHandle = OS.gtk_bin_get_child (handle);
+			if (entryHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		}
+		popupHandle = findPopupHandle (oldList);    
+		OS.gtk_container_add (fixedHandle, handle);
+		textRenderer = OS.gtk_cell_renderer_text_new ();
+		if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
+		/*
+		* Feature in GTK. In order to make a read only combo box the same
+		* height as an editable combo box the ypad must be set to 0. In
+		* versions 2.4.x of GTK, a pad of 0 will clip some letters. The
+		* fix is to set the pad to 1.
+		*/
+		int pad = 0;
+		if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) pad = 1;
+		OS.g_object_set (textRenderer, OS.ypad, pad, 0);
+		/*
+		* Feature in GTK.  In version 2.4.9 of GTK, a warning is issued
+		* when a call to gtk_cell_layout_clear() is made. The fix is to hide
+		* the warning.
+		*/
+		boolean warnings = display.getWarnings ();
+		display.setWarnings (false);
+		OS.gtk_cell_layout_clear (handle);
+		display.setWarnings (warnings);
+		OS.gtk_cell_layout_pack_start (handle, textRenderer, true);
+		OS.gtk_cell_layout_set_attributes (handle, textRenderer, OS.text, 0, 0);
+		/*
+		* Feature in GTK. Toggle button creation differs between GTK versions. The 
+		* fix is to call size_request() to force the creation of the button 
+		* for those versions of GTK that defer the creation. 
+		*/
+		if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
+			OS.gtk_widget_size_request(handle, new GtkRequisition());
+		}
+		if (popupHandle != 0) findMenuHandle ();
+		findButtonHandle ();
+		/*
+		* Feature in GTK. By default, read only combo boxes 
+		* process the RETURN key rather than allowing the 
+		* default button to process the key. The fix is to
+		* clear the GTK_RECEIVES_DEFAULT flag.
+		*/
+		if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) {
+			OS.GTK_WIDGET_UNSET_FLAGS (buttonHandle, OS.GTK_RECEIVES_DEFAULT);
+		}
 }
 
 /**
@@ -465,7 +476,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public void cut () {
@@ -489,7 +500,31 @@
 		lastEventTime = time;
 		int /*long*/ imContext = imContext ();
 		if (imContext != 0) {
-			return OS.gtk_im_context_filter_keypress (imContext, event);
+                    // <QFS> was: return OS.gtk_im_context_filter_keypress (imContext, event);
+                    boolean ret = OS.gtk_im_context_filter_keypress (imContext, event);
+                    if (logger.level >= Log.DBG) {
+                        logger.build("filterKey(int,int)")
+                            .add("ret: ").add(ret).log(Log.DBG);
+                    }
+                    if (!ret && display.charOverrideHead > display.charOverrideTail) {
+                        // XXX We could also check that the event key code actually matches
+                        // the expected value
+                        long val = display.charOverride[display.charOverrideTail++];
+                        if (logger.level >= Log.DBG) {
+                            logger.build("filterKey(int,int)")
+                                .add("char override: ").addHex(val).log(Log.DBG);
+                        }
+                        char c = (char) (val >> 32 & 0xffff);
+                        byte[] buffer = Converter.wcsToMbcs
+                            (null, new char[] {c}, true);
+                        int text = OS.g_malloc(buffer.length);
+                        OS.memmove(text, buffer, buffer.length);
+                        gtk_commit(imContext, text);
+                        OS.g_free(text);
+                        ret = true;
+                    }
+                    return ret;
+                    // </QFS>
 		}
 	}
 	gdkEventKey = event;
@@ -553,7 +588,7 @@
 void findMenuHandle() {
 	OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
 	if (display.allChildren != 0) {
-	    int /*long*/ list = display.allChildren;
+	int /*long*/ list = display.allChildren;
 		while (list != 0) {
 		int /*long*/ widget = OS.g_list_data (list);
 		if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) {
@@ -562,8 +597,8 @@
 		}
 		list = OS.g_list_next (list);
 	}
-	    OS.g_list_free (display.allChildren);
-	    display.allChildren = 0;
+	OS.g_list_free (display.allChildren);
+	display.allChildren = 0;
 	}
 }
 	
@@ -583,11 +618,11 @@
 	/*
 	*  The IM filter has to be called one time for each key press event.
 	*  When the IM is open the key events are duplicated. The first event
-	*  is filtered by SWT and the second event is filtered by GTK.  In some 
-	*  cases the GTK handler does not run (the widget is destroyed, the 
+	*  is filtered by SWT and the second event is filtered by GTK.  In some
+	*  cases the GTK handler does not run (the widget is destroyed, the
 	*  application code consumes the event, etc), for these cases the IM
 	*  filter has to be called by SWT.
-	*/	
+	*/
 	if (gdkEventKey != 0 && gdkEventKey != -1) {
 		int /*long*/ imContext = imContext ();
 		if (imContext != 0) {
@@ -605,7 +640,7 @@
 }
 
 int /*long*/ focusHandle () {
-	if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
+		if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
 	if (entryHandle != 0) return entryHandle;
 	return super.focusHandle ();
 }
@@ -618,7 +653,7 @@
 
 void hookEvents () {
 	super.hookEvents ();
-	OS.g_signal_connect_closure (handle, OS.changed, display.closures [CHANGED], true);
+		OS.g_signal_connect_closure (handle, OS.changed, display.closures [CHANGED], true);
 
 	if (entryHandle != 0) {
 		OS.g_signal_connect_closure (entryHandle, OS.changed, display.closures [CHANGED], true);
@@ -627,7 +662,7 @@
 		OS.g_signal_connect_closure (entryHandle, OS.activate, display.closures [ACTIVATE], false);
 		OS.g_signal_connect_closure (entryHandle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
 	}
-	int eventMask =	OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | 
+	int eventMask =	OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |
 		OS.GDK_BUTTON_RELEASE_MASK;
  	int /*long*/ [] handles = new int /*long*/ [] {buttonHandle, entryHandle, menuHandle};
 	for (int i=0; i<handles.length; i++) {
@@ -671,7 +706,7 @@
 }
 
 /**
- * Deselects the item at the given zero-relative index in the receiver's 
+ * Deselects the item at the given zero-relative index in the receiver's
  * list.  If the item at the index was already deselected, it remains
  * deselected. Indices that are out of range are ignored.
  *
@@ -706,7 +741,7 @@
  */
 public void deselectAll () {
 	checkWidget();
-	clearText ();
+		clearText ();
 }
 
 boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[] consume) {
@@ -860,11 +895,11 @@
 
 /**
  * Returns a (possibly empty) array of <code>String</code>s which are
- * the items in the receiver's list. 
+ * the items in the receiver's list.
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
  * @return the items in the receiver's list
@@ -902,7 +937,7 @@
  */
 public boolean getListVisible () {
 	checkWidget ();
-	return popupHandle != 0 && OS.GTK_WIDGET_VISIBLE (popupHandle); 
+		return popupHandle != 0 && OS.GTK_WIDGET_VISIBLE (popupHandle); 
 }
 
 String getNameText () {
@@ -913,12 +948,12 @@
  * Returns the orientation of the receiver.
  *
  * @return the orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public int getOrientation () {
@@ -948,8 +983,8 @@
 	checkWidget ();
 	if ((style & SWT.READ_ONLY) != 0) {
 		int length = 0;
-		int index = OS.gtk_combo_box_get_active (handle);
-		if (index != -1) length = getItem (index).length ();
+			int index = OS.gtk_combo_box_get_active (handle);
+			if (index != -1) length = getItem (index).length ();
 		return new Point (0, length);
 	}
 	int [] start = new int [1];
@@ -976,7 +1011,7 @@
  */
 public int getSelectionIndex () {
 	checkWidget();
-	return OS.gtk_combo_box_get_active (handle);
+		return OS.gtk_combo_box_get_active (handle);
 }
 
 /**
@@ -1001,7 +1036,7 @@
 		OS.memmove (buffer, str, length);
 		return new String (Converter.mbcsToWcs (null, buffer));
 	} else {
-		int index = OS.gtk_combo_box_get_active (handle);		  
+		int index = OS.gtk_combo_box_get_active (handle);
 		return index != -1 ? getItem (index) : "";
 	}
 }
@@ -1037,9 +1072,9 @@
  * text field is capable of holding. If this has not been changed
  * by <code>setTextLimit()</code>, it will be the constant
  * <code>Combo.LIMIT</code>.
- * 
+ *
  * @return the text limit
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1067,7 +1102,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.0
  */
 public int getVisibleItemCount () {
@@ -1086,36 +1121,36 @@
 	* the left mouse button event from being propagated. The fix is to
 	* send the mouse event from the event_after handler.
 	*/
-	GdkEventButton gdkEvent = new GdkEventButton ();
-	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.type == OS.GDK_BUTTON_PRESS && gdkEvent.button == 1) {
-		return gtk_button_press_event(widget, event, false);
-	}
+		GdkEventButton gdkEvent = new GdkEventButton ();
+		OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
+		if (gdkEvent.type == OS.GDK_BUTTON_PRESS && gdkEvent.button == 1) {
+			return gtk_button_press_event(widget, event, false);
+		}
 	return super.gtk_button_press_event (widget, event);
 }
 
 int /*long*/ gtk_changed (int /*long*/ widget) {
-	if (widget == handle) {
-		if (entryHandle == 0) {
-			sendEvent(SWT.Modify);
-			if (isDisposed ()) return 0;
+		if (widget == handle) {
+			if (entryHandle == 0) {
+				sendEvent(SWT.Modify);
+				if (isDisposed ()) return 0;
+			}
+			/*
+			* Feature in GTK.  GTK emits a changed signal whenever
+			* the contents of a combo box are altered by typing or
+			* by selecting an item in the list, but the event should
+			* only be sent when the list is selected. The fix is to
+			* only send out a selection event when there is a selected
+			* item.
+			*
+			* NOTE: This code relies on GTK clearing the selected
+			* item and not matching the item as the user types.
+			*/
+			int index = OS.gtk_combo_box_get_active (handle);
+			if (index != -1) sendSelectionEvent (SWT.Selection);
+			indexSelected = -1;
+			return 0;
 		}
-		/*
-		* Feature in GTK.  GTK emits a changed signal whenever
-		* the contents of a combo box are altered by typing or
-		* by selecting an item in the list, but the event should
-		* only be sent when the list is selected. The fix is to
-		* only send out a selection event when there is a selected
-		* item. 
-		* 
-		* NOTE: This code relies on GTK clearing the selected
-		* item and not matching the item as the user types.
-		*/
-		int index = OS.gtk_combo_box_get_active (handle);
-		if (index != -1) sendSelectionEvent (SWT.Selection);
-		indexSelected = -1;
-		return 0;
-	}
 	/*
 	* Feature in GTK.  When the user types, GTK positions
 	* the caret after sending the changed signal.  This
@@ -1220,52 +1255,52 @@
 	* user clicks on the drop down button focus is assigned to the text 
 	* field.
 	*/
-	GdkEvent event = new GdkEvent ();
-	OS.memmove (event, gdkEvent, GdkEvent.sizeof);
-	switch (event.type) {
-		case OS.GDK_BUTTON_PRESS: {
-			if (OS.GTK_VERSION < OS.VERSION (2, 8, 0) && !selectionAdded) {
-				int /*long*/ grabHandle = OS.gtk_grab_get_current ();
-				if (grabHandle != 0) {
-					if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
-						menuHandle = grabHandle;
-						OS.g_signal_connect_closure_by_id (menuHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
-						OS.g_signal_connect_closure_by_id (menuHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);
-						OS.g_signal_connect_closure (menuHandle, OS.selection_done, display.closures [SELECTION_DONE], false);
-						display.addWidget (menuHandle, this);
-						selectionAdded = true;
+		GdkEvent event = new GdkEvent ();
+		OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+		switch (event.type) {
+			case OS.GDK_BUTTON_PRESS: {
+				if (OS.GTK_VERSION < OS.VERSION (2, 8, 0) && !selectionAdded) {
+					int /*long*/ grabHandle = OS.gtk_grab_get_current ();
+					if (grabHandle != 0) {
+						if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
+							menuHandle = grabHandle;
+							OS.g_signal_connect_closure_by_id (menuHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
+							OS.g_signal_connect_closure_by_id (menuHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);
+							OS.g_signal_connect_closure (menuHandle, OS.selection_done, display.closures [SELECTION_DONE], false);
+							display.addWidget (menuHandle, this);
+							selectionAdded = true;
+						}
 					}
 				}
-			}
-			GdkEventButton gdkEventButton = new GdkEventButton ();
-			OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
-			if (gdkEventButton.button == 1) {
-				if (!sendMouseEvent (SWT.MouseDown, gdkEventButton.button, display.clickCount, 0, false, gdkEventButton.time, gdkEventButton.x_root, gdkEventButton.y_root, false, gdkEventButton.state)) {
-					return 1;
-				}
-				if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
-					if ((style & SWT.READ_ONLY) == 0 && widget == buttonHandle) {
-						OS.gtk_widget_grab_focus (entryHandle);
+				GdkEventButton gdkEventButton = new GdkEventButton ();
+				OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
+				if (gdkEventButton.button == 1) {
+					if (!sendMouseEvent (SWT.MouseDown, gdkEventButton.button, display.clickCount, 0, false, gdkEventButton.time, gdkEventButton.x_root, gdkEventButton.y_root, false, gdkEventButton.state)) {
+						return 1;
 					}
+					if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+						if ((style & SWT.READ_ONLY) == 0 && widget == buttonHandle) {
+							OS.gtk_widget_grab_focus (entryHandle);
+						}
+					}
 				}
+				break;
 			}
-			break;
-		}
-		case OS.GDK_FOCUS_CHANGE: {
-			if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
-				if ((style & SWT.READ_ONLY) == 0) {
-					GdkEventFocus gdkEventFocus = new GdkEventFocus ();
-					OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
-					if (gdkEventFocus.in != 0) {
-						OS.gtk_combo_box_set_focus_on_click (handle, false);
-					} else {
-						OS.gtk_combo_box_set_focus_on_click (handle, true);
+			case OS.GDK_FOCUS_CHANGE: {
+				if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+					if ((style & SWT.READ_ONLY) == 0) {
+						GdkEventFocus gdkEventFocus = new GdkEventFocus ();
+						OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
+						if (gdkEventFocus.in != 0) {
+							OS.gtk_combo_box_set_focus_on_click (handle, false);
+						} else {
+							OS.gtk_combo_box_set_focus_on_click (handle, true);
+						}
 					}
 				}
+				break;
 			}
-			break;
 		}
-	}
 	return super.gtk_event_after(widget, gdkEvent);
 }
 
@@ -1275,7 +1310,7 @@
 }
 
 int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {
-	if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;	
+	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];
 	OS.memmove (buffer, new_text, buffer.length);
@@ -1282,7 +1317,7 @@
 	String oldText = new String (Converter.mbcsToWcs (null, buffer));
 	int [] pos = new int [1];
 	OS.memmove (pos, position, 4);
-	int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);
+		int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]);
 	String newText = verifyText (oldText, start, start);
@@ -1385,7 +1420,7 @@
 }
 /**
  * Searches the receiver's list starting at the first item
- * (index 0) until an item is found that is equal to the 
+ * (index 0) until an item is found that is equal to the
  * argument, and returns the index of that item. If no item
  * is found, returns -1.
  *
@@ -1406,7 +1441,7 @@
 }
 
 /**
- * Searches the receiver's list starting at the given, 
+ * Searches the receiver's list starting at the given,
  * zero-relative index until an item is found that is equal
  * to the argument, and returns the index of that item. If
  * no item is found or the starting index is out of range,
@@ -1435,16 +1470,16 @@
 }
 
 boolean isFocusHandle(int widget) {
-	if (buttonHandle != 0 && widget == buttonHandle) return true;
-	if (entryHandle != 0 && widget == entryHandle) return true;
+		if (buttonHandle != 0 && widget == buttonHandle) return true;
+		if (entryHandle != 0 && widget == entryHandle) return true;
 	return super.isFocusHandle (widget);
 }
 
 int /*long*/ paintWindow () {
-	int /*long*/ childHandle =  entryHandle != 0 ? entryHandle : handle;	
+	int /*long*/ childHandle =  entryHandle != 0 ? entryHandle : handle;
 	OS.gtk_widget_realize (childHandle);
 	int /*long*/ window = OS.GTK_WIDGET_WINDOW (childHandle);
-	if ((style & SWT.READ_ONLY) != 0) return window;
+		if ((style & SWT.READ_ONLY) != 0) return window;
 	int /*long*/ children = OS.gdk_window_get_children (window);
 	if (children != 0) window = OS.g_list_data (children);
 	OS.g_list_free (children);
@@ -1462,7 +1497,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public void paste () {
@@ -1519,13 +1554,13 @@
 	System.arraycopy (oldItems, 0, newItems, 0, index);
 	System.arraycopy (oldItems, index + 1, newItems, index, oldItems.length - index - 1);
 	items = newItems;
-	if (OS.gtk_combo_box_get_active (handle) == index) clearText ();
-	OS.gtk_combo_box_remove_text (handle, index);
+		if (OS.gtk_combo_box_get_active (handle) == index) clearText ();
+		OS.gtk_combo_box_remove_text (handle, index);
 }
 
 /**
  * Removes the items from the receiver's list which are
- * between the given zero-relative start and end 
+ * between the given zero-relative start and end
  * indices (inclusive).
  *
  * @param start the start of the range
@@ -1550,16 +1585,16 @@
 	System.arraycopy (oldItems, 0, newItems, 0, start);
 	System.arraycopy (oldItems, end + 1, newItems, start, oldItems.length - end - 1);
 	items = newItems;
-	int index = OS.gtk_combo_box_get_active (handle);
-	if (start <= index && index <= end) clearText();
-	for (int i = end; i >= start; i--) {
-		OS.gtk_combo_box_remove_text (handle, i);
-	}
+		int index = OS.gtk_combo_box_get_active (handle);
+		if (start <= index && index <= end) clearText();
+		for (int i = end; i >= start; i--) {
+			OS.gtk_combo_box_remove_text (handle, i);
+		}
 }
 
 /**
  * Searches the receiver's list starting at the first item
- * until an item is found that is equal to the argument, 
+ * until an item is found that is equal to the argument,
  * and removes that item from the list.
  *
  * @param string the item to remove
@@ -1594,10 +1629,10 @@
 	checkWidget();
 	int count = items.length;
 	items = new String[0];
-	clearText ();
-	for (int i = count - 1; i >= 0; i--) {
-		OS.gtk_combo_box_remove_text (handle, i);
-	}
+		clearText ();
+		for (int i = count - 1; i >= 0; i--) {
+			OS.gtk_combo_box_remove_text (handle, i);
+		}
 }
 
 /**
@@ -1621,7 +1656,7 @@
 	checkWidget();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
-	eventTable.unhook (SWT.Modify, listener);	
+	eventTable.unhook (SWT.Modify, listener);
 }
 
 /**
@@ -1646,7 +1681,7 @@
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
 	eventTable.unhook (SWT.Selection, listener);
-	eventTable.unhook (SWT.DefaultSelection,listener);	
+	eventTable.unhook (SWT.DefaultSelection,listener);
 }
 
 /**
@@ -1665,7 +1700,7 @@
  *
  * @see VerifyListener
  * @see #addVerifyListener
- * 
+ *
  * @since 3.1
  */
 public void removeVerifyListener (VerifyListener listener) {
@@ -1672,11 +1707,11 @@
 	checkWidget ();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (eventTable == null) return;
-	eventTable.unhook (SWT.Verify, listener);	
+	eventTable.unhook (SWT.Verify, listener);
 }
 
 /**
- * Selects the item at the given zero-relative index in the receiver's 
+ * Selects the item at the given zero-relative index in the receiver's
  * list.  If the item at the index was already selected, it remains
  * selected. Indices that are out of range are ignored.
  *
@@ -1691,24 +1726,24 @@
 	checkWidget();
 	if (index < 0 || index >= items.length) return;
 	int selected = OS.gtk_combo_box_get_active (handle);
-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_combo_box_set_active (handle, index);
-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		OS.gtk_combo_box_set_active (handle, index);
+		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if ((style & SWT.READ_ONLY) != 0 && selected != index) {
-		/*
-		* Feature in GTK. Read Only combo boxes do not get a chance to send out a 
-		* Modify event in the gtk_changed callback. The fix is to send a Modify event 
-		* here.
-		*/
-		sendEvent (SWT.Modify);
-	}
+			/*
+			* Feature in GTK. Read Only combo boxes do not get a chance to send out a 
+			* Modify event in the gtk_changed callback. The fix is to send a Modify event 
+			* here.
+			*/
+			sendEvent (SWT.Modify);
+		}
 }
 
 void setBackgroundColor (GdkColor color) {
 	super.setBackgroundColor (color);
-	if (entryHandle != 0) OS.gtk_widget_modify_base (entryHandle, 0, color);
-	if (cellHandle != 0) OS.g_object_set (cellHandle, OS.background_gdk, color, 0);
-	OS.g_object_set (textRenderer, OS.background_gdk, color, 0);
+		if (entryHandle != 0) OS.gtk_widget_modify_base (entryHandle, 0, color);
+		if (cellHandle != 0) OS.g_object_set (cellHandle, OS.background_gdk, color, 0);
+		OS.g_object_set (textRenderer, OS.background_gdk, color, 0);
 }
 
 int setBounds (int x, int y, int width, int height, boolean move, boolean resize) {
@@ -1719,26 +1754,26 @@
 
 void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
-	if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
-	OS.g_object_set (textRenderer, OS.font_desc, font, 0);
-	if ((style & SWT.READ_ONLY) != 0) {
-		/*
-		* Bug in GTK.  Setting the font can leave the combo box with an
-		* invalid minimum size.  The fix is to temporarily change the
-		* selected item to force the combo box to resize.
-		*/
-		int index = OS.gtk_combo_box_get_active (handle);
-		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-		OS.gtk_combo_box_set_active (handle, -1);
-		OS.gtk_combo_box_set_active (handle, index);
-		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	}
+		if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
+		OS.g_object_set (textRenderer, OS.font_desc, font, 0);
+		if ((style & SWT.READ_ONLY) != 0) {
+			/*
+			* Bug in GTK.  Setting the font can leave the combo box with an
+			* invalid minimum size.  The fix is to temporarily change the
+			* selected item to force the combo box to resize.
+			*/
+			int index = OS.gtk_combo_box_get_active (handle);
+			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+			OS.gtk_combo_box_set_active (handle, -1);
+			OS.gtk_combo_box_set_active (handle, index);
+			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		}
 }
 
 void setForegroundColor (GdkColor color) {
 	super.setForegroundColor (handle, color, false);
 	if (entryHandle != 0) setForegroundColor (entryHandle, color, false);
-	OS.g_object_set (textRenderer, OS.foreground_gdk, color, 0);
+		OS.g_object_set (textRenderer, OS.foreground_gdk, color, 0);
 }
 
 /**
@@ -1765,11 +1800,11 @@
 	}
 	items [index] = string;
 	byte [] buffer = Converter.wcsToMbcs (null, string, true);
-	OS.gtk_combo_box_remove_text (handle, index);
-	OS.gtk_combo_box_insert_text (handle, index, buffer);
-	if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-		OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
-	}
+		OS.gtk_combo_box_remove_text (handle, index);
+		OS.gtk_combo_box_insert_text (handle, index, buffer);
+		if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
+			OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
+		}
 }
 
 /**
@@ -1795,18 +1830,18 @@
 	int count = this.items.length;
 	this.items = new String [items.length];
 	System.arraycopy (items, 0, this.items, 0, items.length);
-	clearText ();
-	for (int i = count - 1; i >= 0; i--) {
-		OS.gtk_combo_box_remove_text (handle, i);
-	}
-	for (int i = 0; i < items.length; i++) {
-		String string = items [i];
-		byte [] buffer = Converter.wcsToMbcs (null, string, true);
-		OS.gtk_combo_box_insert_text (handle, i, buffer);
-		if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-			OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
+		clearText ();
+		for (int i = count - 1; i >= 0; i--) {
+			OS.gtk_combo_box_remove_text (handle, i);
 		}
-	}
+		for (int i = 0; i < items.length; i++) {
+			String string = items [i];
+			byte [] buffer = Converter.wcsToMbcs (null, string, true);
+			OS.gtk_combo_box_insert_text (handle, i, buffer);
+			if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
+				OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);    
+			}
+		}
 }
 
 /**
@@ -1829,11 +1864,11 @@
  */
 public void setListVisible (boolean visible) {
 	checkWidget ();
-	if (visible) {
-		OS.gtk_combo_box_popup (handle);
-	} else {
-		OS.gtk_combo_box_popdown (handle);
-	}
+		if (visible) {
+			OS.gtk_combo_box_popup (handle);
+		} else {
+			OS.gtk_combo_box_popdown (handle);
+		}
 }
 
 void setOrientation (boolean create) {
@@ -1854,12 +1889,12 @@
  * <p>
  *
  * @param orientation new orientation style
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public void setOrientation (int orientation) {
@@ -1870,7 +1905,7 @@
  * Sets the selection in the receiver's text field to the
  * range specified by the argument whose x coordinate is the
  * start of the selection and whose y coordinate is the end
- * of the selection. 
+ * of the selection.
  *
  * @param selection a point representing the new selection start and end
  *
@@ -1906,7 +1941,7 @@
  * Note: The text field in a <code>Combo</code> is typically
  * only capable of displaying a single line of text. Thus,
  * setting the text to a string containing line breaks or
- * other special characters will probably cause it to 
+ * other special characters will probably cause it to
  * display incorrectly.
  * </p>
  *
@@ -1927,12 +1962,12 @@
 		int index = indexOf (string);
 		if (index == -1) return;
 		select (index);
-		return;
-	}
+			return;
+		}
 	/*
-	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and 
+	* Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and
 	* insertion of the text.  This is not wrong, but is inconsistent with other platforms.  The
-	* fix is to block the firing of these events and fire them ourselves in a consistent manner. 
+	* fix is to block the firing of these events and fire them ourselves in a consistent manner.
 	*/
 	if (hooks (SWT.Verify) || filters (SWT.Verify)) {
 		int /*long*/ ptr = OS.gtk_entry_get_text (entryHandle);
@@ -1940,12 +1975,12 @@
 		if (string == null) return;
 	}
 	byte [] buffer = Converter.wcsToMbcs (null, string, true);
-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 	OS.gtk_entry_set_text (entryHandle, buffer);
-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 	OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
@@ -1969,7 +2004,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #LIMIT
  */
 public void setTextLimit (int limit) {
@@ -1997,7 +2032,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 3.0
  */
 public void setVisibleItemCount (int count) {
@@ -2015,7 +2050,7 @@
 	switch (key) {
 		case OS.GDK_KP_Enter:
 		case OS.GDK_Return: {
-			int /*long*/ imContext = imContext (); 
+			int /*long*/ imContext = imContext ();
 			if (imContext != 0) {
 				int /*long*/ [] preeditString = new int /*long*/ [1];
 				OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
Index: org/eclipse/swt/widgets/FileDialog.java
===================================================================
--- org/eclipse/swt/widgets/FileDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/FileDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -15,6 +16,11 @@
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class allow the user to navigate
  * the file system and select or enter a file name.
@@ -29,7 +35,7 @@
  * </p><p>
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
- * 
+ *
  * @see <a href="http://www.eclipse.org/swt/snippets/#filedialog">FileDialog snippets</a>
  * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
@@ -49,7 +55,14 @@
 	static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
 	static final char EXTENSION_SEPARATOR = ';';
 	static final char FILE_EXTENSION_SEPARATOR = '.';
-	
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.FileDialog");
+    // </QFS>
+
 /**
  * Constructs a new instance of this class given only its parent.
  *
@@ -72,7 +85,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -89,7 +102,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
- * 
+ *
  * @see SWT#SAVE
  * @see SWT#OPEN
  * @see SWT#MULTI
@@ -148,28 +161,28 @@
 		if (uriMode) {
 			utf8Ptr = OS.gtk_file_chooser_get_uri (handle);
 		} else {
-			int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
-			if (path != 0) {
+		int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
+		if (path != 0) {
 				utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
 				if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
 				if (path != utf8Ptr) OS.g_free (path);
 			}
 		}
-		if (utf8Ptr != 0) {
-			int /*long*/ [] items_written = new int /*long*/ [1];
-			int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
-			OS.g_free (utf8Ptr);
-			if (utf16Ptr != 0) {
-				int clength = (int)/*64*/items_written [0];
-				char [] chars = new char [clength];
-				OS.memmove (chars, utf16Ptr, clength * 2);
-				OS.g_free (utf16Ptr);
-				fullPath = new String (chars);
-				fileNames = new String [1];
-				fileNames[0] = fullPath.substring (fullPath.lastIndexOf (SEPARATOR) + 1);
+			if (utf8Ptr != 0) {
+				int /*long*/ [] items_written = new int /*long*/ [1];
+				int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+				OS.g_free (utf8Ptr);
+				if (utf16Ptr != 0) {
+					int clength = (int)/*64*/items_written [0];
+					char [] chars = new char [clength];
+					OS.memmove (chars, utf16Ptr, clength * 2);
+					OS.g_free (utf16Ptr);
+					fullPath = new String (chars);
+					fileNames = new String [1];
+					fileNames[0] = fullPath.substring (fullPath.lastIndexOf (SEPARATOR) + 1);
+				}
 			}
 		}
-	}
 	filterIndex = -1;
 	int /*long*/ filter = OS.gtk_file_chooser_get_filter (handle);
 	if (filter != 0) {
@@ -210,7 +223,7 @@
 				if (!extension.equals ("*") && !extension.equals ("*.*")) {
 					if (extension.startsWith ("*.")) extension = extension.substring (1);
 					fullPath = fullPath + extension;
-				}	
+				}
 			}
 		}
 	}
@@ -221,7 +234,7 @@
  * Returns the path of the first file that was
  * selected in the dialog relative to the filter path, or an
  * empty string if no such file has been selected.
- * 
+ *
  * @return the relative path of the file
  */
 public String getFileName () {
@@ -230,7 +243,7 @@
 /**
  * Returns a (possibly empty) array with the paths of all files
  * that were selected in the dialog relative to the filter path.
- * 
+ *
  * @return the relative paths of the files
  */
 public String [] getFileNames () {
@@ -255,10 +268,10 @@
  * </p>
  *
  * @return index the file extension filter index
- * 
+ *
  * @see #getFilterExtensions
  * @see #getFilterNames
- * 
+ *
  * @since 3.4
  */
 public int getFilterIndex () {
@@ -279,7 +292,7 @@
  * in the dialog, filtered according to the filter extensions.
  *
  * @return the directory path string
- * 
+ *
  * @see #setFilterExtensions
  */
 public String getFilterPath () {
@@ -291,7 +304,7 @@
  * overwrite if the selected file already exists.
  *
  * @return true if the dialog will prompt for file overwrite, false otherwise
- * 
+ *
  * @since 3.4
  */
 public boolean getOverwrite () {
@@ -341,6 +354,9 @@
 	presetChooserDialog ();
 	display.addIdleProc ();
 	String answer = null;
+        // <QFS>
+        _qfGetDisplay().runDialogShownHooks(this, handle);
+        // </QFS>
 	Dialog oldModal = null;
 	if (OS.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
@@ -351,13 +367,13 @@
 	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);
-	}	
+	}
 	int response = OS.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
 	* code outside of SWT (i.e AWT, etc). It ensures that the current
-	* thread leaves the GTK lock acquired by the function above. 
+	* thread leaves the GTK lock acquired by the function above.
 	*/
 	OS.gdk_threads_leave();
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -369,12 +385,19 @@
 	if (response == OS.GTK_RESPONSE_OK) {
 		answer = computeResultChooserDialog ();
 	}
+        // <QFS>
+        Object ret = _qfGetDisplay().runDialogClosedHooks(this, answer);
+        if ((ret instanceof String)
+            || ret == null) {
+            answer = (String) ret;
+        }
+        // </QFS>
 	display.removeIdleProc ();
 	OS.gtk_widget_destroy (handle);
 	return answer;
 }
 void presetChooserDialog () {
-	/* MULTI is only valid if the native dialog's action is Open */   
+	/* MULTI is only valid if the native dialog's action is Open */
 	if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {
 		OS.gtk_file_chooser_set_select_multiple (handle, true);
 	}
@@ -381,20 +404,20 @@
 	if (filterPath == null) filterPath = "";
 	if (fileName == null) fileName = "";
 	if ((style & SWT.SAVE) != 0) {
-		if (filterPath.length () > 0) {
+	if (filterPath.length () > 0) {
 			if (uriMode) {
 				byte [] buffer = Converter.wcsToMbcs (null, filterPath, true);
 				OS.gtk_file_chooser_set_current_folder_uri (handle, buffer);
 			} else {
-				/* filename must be a full path */
+		/* filename must be a full path */
 				byte [] buffer = Converter.wcsToMbcs (null, SEPARATOR + filterPath, true);
-				
-				/*
-				* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
-				* when setting a file name that is not a true canonical path. 
-				* The fix is to use the canonical path.
-				*/
-				int /*long*/ ptr = OS.realpath (buffer, null);
+
+			/*
+			* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+			* when setting a file name that is not a true canonical path.
+			* The fix is to use the canonical path.
+			*/
+			int /*long*/ ptr = OS.realpath (buffer, null);
 				OS.gtk_file_chooser_set_current_folder (handle, ptr);
 				OS.g_free (ptr);
 			}
@@ -403,7 +426,7 @@
 			byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
 			OS.gtk_file_chooser_set_current_name (handle, buffer);
 		}
-	} else {
+		} else {
 		StringBuffer stringBuffer = new StringBuffer();
 		if (filterPath.length () > 0) {
 			if (!uriMode) {
@@ -419,24 +442,24 @@
 		byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString(), true);
 		if (uriMode) {
 			OS.gtk_file_chooser_set_uri (handle, buffer);
-		} else {
-			/*
-			* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
-			* when setting a file name that is not a true canonical path. 
-			* The fix is to use the canonical path.
-			*/
-			int /*long*/ ptr = OS.realpath (buffer, null);
-			if (ptr != 0) {
+	} else {
+				/*
+				* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+				* when setting a file name that is not a true canonical path.
+				* The fix is to use the canonical path.
+				*/
+				int /*long*/ ptr = OS.realpath (buffer, null);
+				if (ptr != 0) {
 				if (fileName.length() > 0) {
 					OS.gtk_file_chooser_set_filename (handle, ptr);
-				} else { 
-					OS.gtk_file_chooser_set_current_folder (handle, ptr);	
+				} else {
+					OS.gtk_file_chooser_set_current_folder (handle, ptr);
 				}
-				OS.g_free (ptr);
+					OS.g_free (ptr);
+				}
 			}
 		}
-	}
-	
+
 	/* Set overwrite mode */
 	if ((style & SWT.SAVE) != 0) {
 		if (OS.GTK_VERSION >= OS.VERSION (2, 8, 0)) {
@@ -475,7 +498,7 @@
 				initialFilter = filter;
 			}
 		}
-	}
+		}
 	if (initialFilter != 0) {
 		OS.gtk_file_chooser_set_filter(handle, initialFilter);
 	}
@@ -487,7 +510,7 @@
  * select by default when opened to the argument,
  * which may be null.  The name will be prefixed with
  * the filter path when one is supplied.
- * 
+ *
  * @param string the file name
  */
 public void setFileName (String string) {
@@ -506,7 +529,7 @@
  * </p>
  *
  * @param extensions the file extension filter
- * 
+ *
  * @see #setFilterNames to specify the user-friendly
  * names corresponding to the extensions
  */
@@ -523,10 +546,10 @@
  * </p>
  *
  * @param index the file extension filter index
- * 
+ *
  * @see #setFilterExtensions
  * @see #setFilterNames
- * 
+ *
  * @since 3.4
  */
 public void setFilterIndex (int index) {
@@ -543,7 +566,7 @@
  * </p>
  *
  * @param names the list of filter names, or null for no filter names
- * 
+ *
  * @see #setFilterExtensions
  */
 public void setFilterNames (String [] names) {
@@ -563,7 +586,7 @@
  * </p>
  *
  * @param string the directory path
- * 
+ *
  * @see #setFilterExtensions
  */
 public void setFilterPath (String string) {
@@ -576,7 +599,7 @@
  * overwrite if the selected file already exists.
  *
  * @param overwrite true if the dialog will prompt for file overwrite, false otherwise
- * 
+ *
  * @since 3.4
  */
 public void setOverwrite (boolean overwrite) {
@@ -583,11 +606,11 @@
 	this.overwrite = overwrite;
 }
 /* Sets URI Mode.
- * 
+ *
  * When the FileDialog is in URI mode it returns
  * a URI (instead of a file name) for the following
  * methods: open() and getFilterPath().
- * The input argment for setFilterPath() should also 
+ * The input argment for setFilterPath() should also
  * be a URI.
  */
 /*public*/ void setURIMode (boolean uriMode) {
Index: org/eclipse/swt/widgets/Composite.java
===================================================================
--- org/eclipse/swt/widgets/Composite.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Composite.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -227,8 +227,8 @@
 		}
 	} else {
 		size = minimumSize (wHint, hHint, changed);
-		if (size.x == 0) size.x = DEFAULT_WIDTH;
-		if (size.y == 0) size.y = DEFAULT_HEIGHT;
+	if (size.x == 0) size.x = DEFAULT_WIDTH;
+	if (size.y == 0) size.y = DEFAULT_HEIGHT;
 	}
 	if (wHint != SWT.DEFAULT) size.x = wHint;
 	if (hHint != SWT.DEFAULT) size.y = hHint;
@@ -378,13 +378,13 @@
 				int /*long*/ surface = control.backgroundImage.surface;
 				if (surface == 0) {
 					int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
-					int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());
-					int /*long*/ drawable = control.backgroundImage.pixmap;
-					int /*long*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);				
-					int [] w = new int [1], h = new int [1];
-					OS.gdk_drawable_get_size (drawable, w, h);
+				int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());
+				int /*long*/ drawable = control.backgroundImage.pixmap;
+				int /*long*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);				
+				int [] w = new int [1], h = new int [1];
+				OS.gdk_drawable_get_size (drawable, w, h);
 					surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);
-					if (surface == 0) error (SWT.ERROR_NO_HANDLES);
+				if (surface == 0) error (SWT.ERROR_NO_HANDLES);
 				} else {
 					Cairo.cairo_surface_reference(surface);
 				}
@@ -1053,47 +1053,47 @@
 public void layout (Control [] changed, int flags) {
 	checkWidget ();
 	if (changed != null) {
-		for (int i=0; i<changed.length; i++) {
-			Control control = changed [i];
-			if (control == null) error (SWT.ERROR_INVALID_ARGUMENT);
-			if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
-			boolean ancestor = false;
-			Composite composite = control.parent;
-			while (composite != null) {
-				ancestor = composite == this;
-				if (ancestor) break;
-				composite = composite.parent;
-			}
-			if (!ancestor) error (SWT.ERROR_INVALID_PARENT);
+	for (int i=0; i<changed.length; i++) {
+		Control control = changed [i];
+		if (control == null) error (SWT.ERROR_INVALID_ARGUMENT);
+		if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+		boolean ancestor = false;
+		Composite composite = control.parent;
+		while (composite != null) {
+			ancestor = composite == this;
+			if (ancestor) break;
+			composite = composite.parent;
 		}
-		int updateCount = 0;
-		Composite [] update = new Composite [16];
-		for (int i=0; i<changed.length; i++) {
-			Control child = changed [i];
-			Composite composite = child.parent;
-			while (child != this) {
-				if (composite.layout != null) {
-					composite.state |= LAYOUT_NEEDED;
-					if (!composite.layout.flushCache (child)) {
-						composite.state |= LAYOUT_CHANGED;
-					}
+		if (!ancestor) error (SWT.ERROR_INVALID_PARENT);
+	}
+	int updateCount = 0;
+	Composite [] update = new Composite [16];
+	for (int i=0; i<changed.length; i++) {
+		Control child = changed [i];
+		Composite composite = child.parent;
+		while (child != this) {
+			if (composite.layout != null) {
+				composite.state |= LAYOUT_NEEDED;
+				if (!composite.layout.flushCache (child)) {
+					composite.state |= LAYOUT_CHANGED;
 				}
-				if (updateCount == update.length) {
-					Composite [] newUpdate = new Composite [update.length + 16];
-					System.arraycopy (update, 0, newUpdate, 0, update.length);
-					update = newUpdate;
-				}
-				child = update [updateCount++] = composite;
-				composite = child.parent;
 			}
+			if (updateCount == update.length) {
+				Composite [] newUpdate = new Composite [update.length + 16];
+				System.arraycopy (update, 0, newUpdate, 0, update.length);
+				update = newUpdate;
+			}
+			child = update [updateCount++] = composite;
+			composite = child.parent;
 		}
+	}
 		if ((flags & SWT.DEFER) != 0) {
 			setLayoutDeferred (true);
 			display.addLayoutDeferred (this);
 		}
-		for (int i=updateCount-1; i>=0; i--) {
-			update [i].updateLayout (false);
-		}
+	for (int i=updateCount-1; i>=0; i--) {
+		update [i].updateLayout (false);
+	}
 	} else {
 		if (layout == null && (flags & SWT.ALL) == 0) return;
 		markLayout ((flags & SWT.CHANGED) != 0, (flags & SWT.ALL) != 0);
Index: org/eclipse/swt/widgets/ToolBar.java
===================================================================
--- org/eclipse/swt/widgets/ToolBar.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ToolBar.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -54,7 +54,7 @@
 		menuItemSelectedFunc = new Callback(ToolBar.class, "MenuItemSelectedProc", 2);
 		if (menuItemSelectedFunc.getAddress() == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
 	}
-	
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -105,7 +105,7 @@
 	}
 	int orientation = (style & SWT.VERTICAL) != 0 ? OS.GTK_ORIENTATION_VERTICAL : OS.GTK_ORIENTATION_HORIZONTAL;
 	if (OS.GTK_VERSION < OS.VERSION (2, 16, 0)) {
-		OS.gtk_toolbar_set_orientation (handle, orientation);
+	OS.gtk_toolbar_set_orientation (handle, orientation);
 	} else {
 		OS.gtk_orientable_set_orientation(handle, orientation);
 	}
@@ -392,12 +392,12 @@
 	switch (gdkEvent.keyval) {
 		case OS.GDK_Down: {
 			if (OS.GTK_VERSION < OS.VERSION (2, 6, 0) && (currentFocusItem != null) && (currentFocusItem.style & SWT.DROP_DOWN) != 0) {
-				Event event = new Event ();
-				event.detail = SWT.ARROW;
+					Event event = new Event ();
+					event.detail = SWT.ARROW;
 				int /*long*/ topHandle = currentFocusItem.topHandle ();
-				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;
+					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;
 				currentFocusItem.sendSelectionEvent  (SWT.Selection, event, false);
 				/*
 				 * Stop GTK from processing the event further as key_down binding
@@ -404,8 +404,8 @@
 				 * will move the focus to the next item.
 				 */
 				return 1;
+				}
 			}
-		}
 		default: return result;
 	}
 }
Index: org/eclipse/swt/widgets/Menu.java
===================================================================
--- org/eclipse/swt/widgets/Menu.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Menu.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -16,6 +17,11 @@
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class are user interface objects that contain
  * menu items.
@@ -39,6 +45,13 @@
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class Menu extends Widget {
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Menu");
+    // </QFS>
 	int x, y;
 	boolean hasLocation;
 	MenuItem cascade, selectedItem;
@@ -81,7 +94,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -192,32 +205,41 @@
 	return checkBits (style, SWT.POP_UP, SWT.BAR, SWT.DROP_DOWN, 0, 0, 0);
 }
 
-void _setVisible (boolean visible) {
-	if (visible == OS.GTK_WIDGET_MAPPED (handle)) return;
+// <QFS/> made public
+public void _setVisible (boolean visible) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("_setVisible(boolean)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("visible: ").add(visible)
+         .add(", mapped: ").add(OS.GTK_WIDGET_MAPPED(handle))).log(Log.MTD);
+    }
+    // </QFS>
+    if (visible == OS.GTK_WIDGET_MAPPED (handle)) return;
 	if (visible) {
 		sendEvent (SWT.Show);
 		if (getItemCount () != 0) {
 			if ((OS.GTK_VERSION >=  OS.VERSION (2, 8, 0))) {
 				/*
-				* Feature in GTK. ON_TOP shells will send out 
+				* Feature in GTK. ON_TOP shells will send out
 				* SWT.Deactivate whenever a context menu is shown.
 				* The fix is to prevent the menu from taking focus
 				* when it is being shown in an ON_TOP shell.
 				*/
 				if ((parent._getShell ().style & SWT.ON_TOP) != 0) {
-					OS.gtk_menu_shell_set_take_focus (handle, false);
-				}
+				OS.gtk_menu_shell_set_take_focus (handle, false);
 			}
+			}
 			int /*long*/ address = hasLocation ? display.menuPositionProc: 0;
 			hasLocation = false;
 			int /*long*/ data = 0;
 			if ((OS.GTK_VERSION >=  OS.VERSION (2, 10, 0))) {
 				/*
-				* Popup-menu to the status icon should be aligned to  
-				* Tray rather than to cursor position. There is a 
-				* possibility (unlikely) that TrayItem might have  
-				* been disposed in the listener, for which case  
-				* the menu should be shown in the cursor position. 
+				* Popup-menu to the status icon should be aligned to
+				* Tray rather than to cursor position. There is a
+				* possibility (unlikely) that TrayItem might have
+				* been disposed in the listener, for which case
+				* the menu should be shown in the cursor position.
 				*/
 				TrayItem item = display.currentTrayItem;
 				if (item != null && !item.isDisposed()) {
@@ -231,7 +253,45 @@
 			* will fail.  The fix is to ensure that the timestamp of the last
 			* event processed is used.
 			*/
+                        // <QFS>
+                        if (logger.level >= Log.DBG) {
+                            logger.log(Log.DBG, "_setVisible(boolean)",
+                                       "Calling gtk_menu_popup with address " + address +
+                                       " and time " +
+                                       display.getLastEventTime());
+                        }
+                        // </QFS>
+
 			OS.gtk_menu_popup (handle, 0, 0, address, data, 0, display.getLastEventTime ());
+                        // <QFS>
+                        boolean mapped = OS.GTK_WIDGET_MAPPED (handle);
+                        if (logger.level >= Log.DBG) {
+                            logger.build("_setVisible(boolean)")
+                                .add("mapped: ").add(mapped).log(Log.DBG);
+                        }
+                        if (! mapped
+                            && "true".equals(System.getProperty("qftest.swt.testing"))) {
+                            // Comment from gtkmenu.c:
+                            //
+                            // We failed to make our pointer/keyboard grab. Rather than leaving
+                            // the user with a stuck up window, we just abort here. Presumably the
+                            // user will try again.
+                            //
+                            // That may be acceptable for a real user, but it will break a test
+                            // badly. So we fake a grab and try again to force the issue.
+                            if (logger.level >= Log.MSG) {
+                                logger.log(Log.MSG, "_setVisible(boolean)",
+                                           "Failed to map menu. Fake grab and try again.");
+                            }
+                            OS.gtk_menu_popup_fake_xgrab(handle);
+                            OS.gtk_menu_popup (handle, 0, 0, address, data, 0, display.getLastEventTime ());
+                            mapped = OS.GTK_WIDGET_MAPPED (handle);
+                            if (logger.level >= Log.DBG) {
+                                logger.build("_setVisible(boolean)")
+                                    .add("mapped after fake and retry: ").add(mapped).log(Log.DBG);
+                            }
+                        }
+                        // </QFS>
 		} else {
 			sendEvent (SWT.Hide);
 		}
@@ -337,7 +397,7 @@
 	}
 	if (this.imHandle == imHandle) return;
 	this.imHandle = imHandle;
-	
+
 	if (imSeparator == 0) {
 		imSeparator = OS.gtk_separator_menu_item_new ();
 		OS.gtk_widget_show (imSeparator);
@@ -370,7 +430,8 @@
 	this.parent = newParent;
 }
 
-/*public*/ Rectangle getBounds () {
+// <QFS/> Made public.
+public Rectangle getBounds () {
 	checkWidget();
 	if (!OS.GTK_WIDGET_MAPPED (handle)) {
 		return new Rectangle (0, 0, 0, 0);
@@ -414,12 +475,12 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #isEnabled
  */
 public boolean getEnabled () {
 	checkWidget();
-	return OS.GTK_WIDGET_SENSITIVE (handle);     
+	return OS.GTK_WIDGET_SENSITIVE (handle);
 }
 
 /**
@@ -474,11 +535,11 @@
 
 /**
  * Returns a (possibly empty) array of <code>MenuItem</code>s which
- * are the items in the receiver. 
+ * are the items in the receiver.
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
  * @return the items in the receiver
@@ -500,7 +561,7 @@
 	for (int i=0; i<count; i++) {
 		int /*long*/ data = OS.g_list_nth_data (list, i);
 		MenuItem item = (MenuItem) display.getWidget (data);
-		if (item != null) items [index++] = item; 
+		if (item != null) items [index++] = item;
 	}
 	OS.g_list_free (list);
 	if (index != items.length) {
@@ -517,9 +578,10 @@
 	int length = items.length;
 	if (length > 0) {
 		for (int i=0; i<length-1; i++) {
-			result = result + items [i].getNameText() + ", ";
+                        // <QFS/>: Fixed NPE
+			result = result + (items [i] == null ? "null" : items[i].getNameText()) + ", ";
 		}
-		result = result + items [length-1].getNameText ();
+		result = result + (items [length - 1] == null ? "null" : items [length-1].getNameText ());
 	}
 	return result;
 }
@@ -651,10 +713,10 @@
 	} else {
 		/*
 		* Bug in GTK.  In GTK 2.4 and earlier
-		* a crash could occur if a menu item 
+		* a crash could occur if a menu item
 		* was disposed within gtk_hide.  The
 		* workaroud is to post the event instead
-		* of send it on these platforms  
+		* of send it on these platforms
 		*/
 		postEvent (SWT.Hide);
 	}
@@ -672,7 +734,7 @@
 	if ((style & SWT.POP_UP) != 0) {
 		if (display.activeShell != null) display.activeShell = getShell ();
 		return 0;
-	} 
+	}
 	sendEvent (SWT.Show);
 	if (OS.ubuntu_menu_proxy_get() != 0) {
 		MenuItem[] items = getItems();
@@ -702,7 +764,7 @@
 
 /**
  * Searches the receiver's list starting at the first item
- * (index 0) until an item is found that is equal to the 
+ * (index 0) until an item is found that is equal to the
  * argument, and returns the index of that item. If no item
  * is found, returns -1.
  *
@@ -739,7 +801,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see #getEnabled
  */
 public boolean isEnabled () {
@@ -771,13 +833,26 @@
 }
 
 int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
-	/*
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("menuPositionProc(int,int,int,int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("menu: ").add(menu)
+         .add(", x: ").add(x)
+         .add(", this.x: ").add(this.x)
+         .add(", y: ").add(y)
+         .add(", this.y: ").add(this.y)
+         .add(", push_in: ").add(push_in)
+         .add(", user_data: ").add(user_data)).log(Log.MTD);
+    }
+    // </QFS>
+    /*
 	* 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
 	* add a scroll arrow at the bottom and position the first menu entry at
 	* the specified position.  The fix is to flip the menu location to be
 	* completely inside the screen.
-	* 
+	*
 	* NOTE: This code doesn't work for multiple monitors.
 	*/
     GtkRequisition requisition = new GtkRequisition ();
@@ -786,7 +861,7 @@
 	int reqy = this.y;
 	if (reqy + requisition.height > screenHeight) {
     	reqy = Math.max (0, reqy - requisition.height);
-	} 
+    }
     int screenWidth = OS.gdk_screen_width ();
 	int reqx = this.x;
     if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -825,7 +900,7 @@
 
 void releaseWidget () {
 	super.releaseWidget ();
-	if (parent != null) parent.removeMenu (this); 
+	if (parent != null) parent.removeMenu (this);
 	parent = null;
 	cascade = null;
 	imItem = imSeparator = imHandle = 0;
@@ -916,11 +991,11 @@
 /**
  * Sets the default menu item to the argument or removes
  * the default emphasis when the argument is <code>null</code>.
- * 
+ *
  * @param item the default menu item or null
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the menu item has been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu item has been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -978,7 +1053,7 @@
 	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
 	this.x = x;
 	this.y = y;
-	hasLocation = true;	
+	hasLocation = true;
 }
 
 /**
@@ -1002,7 +1077,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public void setLocation (Point location) {
@@ -1026,7 +1101,7 @@
  * @since 3.7  
  */
 public void setOrientation (int orientation) {
-    checkWidget ();    
+    checkWidget ();
     if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
     _setOrientation (orientation);
 }
@@ -1048,12 +1123,12 @@
         for (int i = 0; i < items.length; i++) {
             items [i].setOrientation (create);
         }
-    }
+	}
 }
 
 /**
  * Marks the receiver as visible if the argument is <code>true</code>,
- * and marks it invisible otherwise. 
+ * and marks it invisible otherwise.
  * <p>
  * If one of the receiver's ancestors is not visible or some
  * other condition makes the receiver not visible, marking
@@ -1068,7 +1143,17 @@
  * </ul>
  */
 public void setVisible (boolean visible) {
-	checkWidget();
+     // <QFS>
+     if (logger.level >= Log.MTD) {
+         Logger.Builder lb = logger.build("setVisible(boolean)");
+         (logger.level < Log.MTDDETAIL ? lb : lb
+          .add("visible: ").add(visible)).log(Log.MTD);
+     }
+     if (logger.level >= Log.DBG) {
+         logger.dumpStack(Log.DBG, "setVisible(boolean)", "");
+     }
+     // </QFS>
+    checkWidget();
 	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
 	if (visible) {
 		display.addPopup (this);
Index: org/eclipse/swt/widgets/ExpandBar.java
===================================================================
--- org/eclipse/swt/widgets/ExpandBar.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ExpandBar.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -114,36 +114,36 @@
 }
 
 public Point computeSize (int wHint, int hHint, boolean changed) {
-	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
-	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
-	Point size = computeNativeSize (handle, wHint, hHint, changed);
+		if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
+		if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
+		Point size = computeNativeSize (handle, wHint, hHint, changed);
 	if (size.x == 0 && wHint == SWT.DEFAULT) size.x = DEFAULT_WIDTH;
 	if (size.y == 0 && hHint == SWT.DEFAULT) size.y = DEFAULT_HEIGHT;
-	int border = OS.gtk_container_get_border_width (handle);
-	size.x += 2 * border;
-	size.y += 2 * border;
-	return size;
+		int border = OS.gtk_container_get_border_width (handle);
+		size.x += 2 * border;
+		size.y += 2 * border;
+		return size;
 }
 
 void createHandle (int index) {
 	state |= HANDLE;
-	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);
-	handle = OS.gtk_vbox_new (false, 0);
-	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	if ((style & SWT.V_SCROLL) != 0) {
-		scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
-		if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
-		OS.gtk_container_add (fixedHandle, scrolledHandle);
-		OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
-		int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
-		OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
-	} else {
-		OS.gtk_container_add (fixedHandle, handle);
-	}
-	OS.gtk_container_set_border_width (handle, 0);
+		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);
+		handle = OS.gtk_vbox_new (false, 0);
+		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+		if ((style & SWT.V_SCROLL) != 0) {
+			scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+			if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
+			OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
+			OS.gtk_container_add (fixedHandle, scrolledHandle);
+			OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
+			int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
+			OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
+		} else {
+			OS.gtk_container_add (fixedHandle, handle);
+		}
+		OS.gtk_container_set_border_width (handle, 0);
 }
 
 void createItem (ExpandItem item, int style, int index) {
@@ -183,27 +183,27 @@
 }
 
 boolean forceFocus (int /*long*/ focusHandle) {
-	if (lastFocus != null && lastFocus.setFocus ()) return true;
-	for (int i = 0; i < itemCount; i++) {
-		ExpandItem item = items [i];
-		if (item.setFocus ()) return true;
-	}
+		if (lastFocus != null && lastFocus.setFocus ()) return true;
+		for (int i = 0; i < itemCount; i++) {
+			ExpandItem item = items [i];
+			if (item.setFocus ()) return true;
+		}
 	return super.forceFocus (focusHandle);
 }
 
 boolean hasFocus () {
-	for (int i=0; i<itemCount; i++) {
-		ExpandItem item = items [i];
-		if (item.hasFocus ()) return true;
-	}
+		for (int i=0; i<itemCount; i++) {
+			ExpandItem item = items [i];
+			if (item.hasFocus ()) return true;
+		}
 	return super.hasFocus();
 }
 
 void hookEvents () {
 	super.hookEvents ();
-	if (scrolledHandle != 0) {
-		OS.g_signal_connect_closure (scrolledHandle, OS.size_allocate, display.closures [SIZE_ALLOCATE], true);
-	}
+		if (scrolledHandle != 0) {
+			OS.g_signal_connect_closure (scrolledHandle, OS.size_allocate, display.closures [SIZE_ALLOCATE], true);
+		}
 }
 
 int getBandHeight () {
@@ -289,30 +289,30 @@
 }
 
 int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
-	if (!hasFocus ()) return 0;
-	int /*long*/ result = super.gtk_key_press_event (widget, event);
-	if (result != 0) return result;
-	int index = 0;
-	while (index < itemCount) {
-		if (items [index].hasFocus ()) break;
-		index++;
-	}
-	GdkEventKey gdkEvent = new GdkEventKey ();
-	OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
-	boolean next = false;
-	switch (gdkEvent.keyval) {
-		case OS.GDK_Up:
-		case OS.GDK_Left: next = false; break;
-		case OS.GDK_Down: 
-		case OS.GDK_Right: next = true; break;
-		default: return result;
-	}
-	int start = index, offset = next ? 1 : -1;
-	while ((index = (index + offset + itemCount) % itemCount) != start) {
-		ExpandItem item = items [index];
-		if (item.setFocus ()) return result;
-	}
-	return result;
+		if (!hasFocus ()) return 0;
+		int /*long*/ result = super.gtk_key_press_event (widget, event);
+		if (result != 0) return result;
+		int index = 0;
+		while (index < itemCount) {
+			if (items [index].hasFocus ()) break;
+			index++;
+		}
+		GdkEventKey gdkEvent = new GdkEventKey ();
+		OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
+		boolean next = false;
+		switch (gdkEvent.keyval) {
+			case OS.GDK_Up:
+			case OS.GDK_Left: next = false; break;
+			case OS.GDK_Down: 
+			case OS.GDK_Right: next = true; break;
+			default: return result;
+		}
+		int start = index, offset = next ? 1 : -1;
+		while ((index = (index + offset + itemCount) % itemCount) != start) {
+			ExpandItem item = items [index];
+			if (item.setFocus ()) return result;
+		}
+		return result;
 }
 
 /**
@@ -343,10 +343,10 @@
 }
 
 void layoutItems (int index, boolean setScrollbar) {
-	for (int i = 0; i < itemCount; i++) {
-		ExpandItem item = items [i];
-		if (item != null) item.resizeControl (yCurrentScroll);
-	}
+		for (int i = 0; i < itemCount; i++) {
+			ExpandItem item = items [i];
+			if (item != null) item.resizeControl (yCurrentScroll);
+		}
 }
 
 int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
@@ -406,17 +406,17 @@
 
 void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
-	for (int i = 0; i < itemCount; i++) {
-		items[i].setFontDescription (font);
-	}
-	layoutItems (0, true);
+		for (int i = 0; i < itemCount; i++) {
+			items[i].setFontDescription (font);
+		}
+		layoutItems (0, true);
 }
 
 void setForegroundColor (GdkColor color) {
 	super.setForegroundColor (color);
-	for (int i = 0; i < itemCount; i++) {
-		items[i].setForegroundColor (color);
-	}
+		for (int i = 0; i < itemCount; i++) {
+			items[i].setForegroundColor (color);
+		}
 }
 
 void setOrientation (boolean create) {
@@ -483,8 +483,8 @@
 	if (spacing < 0) return;
 	if (spacing == this.spacing) return;
 	this.spacing = spacing;
-	OS.gtk_box_set_spacing (handle, spacing);
-	OS.gtk_container_set_border_width (handle, spacing);
+		OS.gtk_box_set_spacing (handle, spacing);
+		OS.gtk_container_set_border_width (handle, spacing);
 }
 
 void showItem (ExpandItem item) {
Index: org/eclipse/swt/widgets/Display.java
===================================================================
--- org/eclipse/swt/widgets/Display.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Display.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,10 +7,10 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
-
 import org.eclipse.swt.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.cairo.*;
@@ -17,6 +17,21 @@
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
+// <QFS>
+import org.eclipse.swt.dnd.DragSource;
+import org.eclipse.swt.dnd.DropTarget;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class are responsible for managing the
  * connection between SWT and the underlying operating
@@ -48,12 +63,12 @@
  * <code>Widget</code> and its subclasses), may only be called
  * from the thread. (To support multi-threaded user-interface
  * applications, class <code>Display</code> provides inter-thread
- * communication methods which allow threads other than the 
+ * communication methods which allow threads other than the
  * user-interface thread to request that it perform operations
  * on their behalf.)
  * </li>
  * <li>
- * The thread is not allowed to construct other 
+ * The thread is not allowed to construct other
  * <code>Display</code>s until that display has been disposed.
  * (Note that, this is in addition to the restriction mentioned
  * above concerning platform support for multiple displays. Thus,
@@ -62,8 +77,8 @@
  * </li>
  * </ul>
  * Enforcing these attributes allows SWT to be implemented directly
- * on the underlying operating system's event model. This has 
- * numerous benefits including smaller footprint, better use of 
+ * on the underlying operating system's event model. This has
+ * numerous benefits including smaller footprint, better use of
  * resources, safer memory management, clearer program logic,
  * better performance, and fewer overall operating system threads
  * required. The down side however, is that care must be taken
@@ -96,12 +111,1268 @@
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class Display extends Device {
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Display");
 
+    /**
+     * Monitor for class level synchronization.
+     */
+    final static Object classLock = new Object ();
+
+    //------------------------------------------------------------------------------------------
+    // Hooks for display creation notification
+    //------------------------------------------------------------------------------------------
+    // {{{ interface IDisplayCreationHook
+
+    public interface IDisplayCreationHook {
+        /**
+         * Notify the hook that a new display was created.
+         *
+         * @param       display The newly created Display.
+         */
+        public void displayCreated(Display display);
+    }
+
+    // }}}
+
+    /**
+     * Registered hooks.
+     */
+    static IDisplayCreationHook[] creationHooks;
+
+    // {{{ addDisplayCreationHook
+
+    public static void addDisplayCreationHook(IDisplayCreationHook hook)
+    {
+        synchronized (classLock) {
+            if (creationHooks == null) {
+                creationHooks = new IDisplayCreationHook[] {hook};
+                return;
+            }
+            // Prevent double registration. If the hook is already registered, move it to the
+            // front.
+            for (int i = 0; i < creationHooks.length; i++) {
+                if (creationHooks[i] == hook) {
+                    if (i == 0) {
+                        return;
+                    }
+                    System.arraycopy(creationHooks, 0, creationHooks, 1, i);
+                    creationHooks[0] = hook;
+                }
+            }
+            // Insert new hook at front
+            IDisplayCreationHook[] tmp = new IDisplayCreationHook[creationHooks.length + 1];
+            tmp[0] = hook;
+            System.arraycopy(creationHooks, 0, tmp, 1, creationHooks.length);
+            creationHooks = tmp;
+        }
+    }
+
+    // }}}
+    // {{{ removeDisplayCreationHook
+
+    public static void removeDisplayCreationHook(IDisplayCreationHook hook)
+    {
+        synchronized (classLock) {
+            if (creationHooks == null) {
+                return;
+            }
+
+            for (int i = 0; i < creationHooks.length; i++) {
+                if (creationHooks[i] == hook) {
+                    if (creationHooks.length == 1) {
+                        creationHooks = null;
+                        return;
+                    }
+                    // Insert new hook at front
+                    IDisplayCreationHook[] tmp =
+                        new IDisplayCreationHook[creationHooks.length - 1];
+                    if (i > 0) {
+                        System.arraycopy(creationHooks, 0, tmp, 0, i - 1);
+                    }
+                    if (i < creationHooks.length - 1) {
+                        System.arraycopy(creationHooks, i + 1, tmp, i,
+                                         creationHooks.length - i - 1);
+                    }
+                    creationHooks = tmp;
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDisplayCreationHooks
+
+    static void runDisplayCreationHooks(Display display)
+    {
+        IDisplayCreationHook[] tmp;
+        synchronized (classLock) {
+            if (creationHooks == null) {
+                return;
+            }
+            tmp = (IDisplayCreationHook[]) creationHooks.clone();
+        }
+        if (tmp != null) {
+            for (int i = 0; i < tmp.length; i++) {
+                try {
+                    tmp[i].displayCreated(display);
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Hooks for Dialog creation and showing
+    //------------------------------------------------------------------------------------------
+    // {{{ interface IDialogHook
+
+    public interface IDialogHook {
+        // {{{ dialogCreated
+
+        /**
+         * Notify the hook that a new display was created.
+         *
+         * @param       dialog The dialog that was created.
+         */
+        public void dialogCreated(Dialog dialog);
+
+        // }}}
+        // {{{ dialogShown
+
+        /**
+         * Notify the hook that a dialog is about to be shown.
+         *
+         * @param       dialog The dialog that is about to be shown.
+         * @param       handle System specific handle for the dialog.
+         */
+        public void dialogShown(Dialog dialog, Object handle);
+
+        // }}}
+        // {{{ dialogClosed
+
+        /**
+         * Notify the hook that a dialog was closed.
+         *
+         * @param       dialog The dialog that was closed.
+         * @param       handle System specific handle for the dialog.
+         * @param       result The result representing the user's choice.
+         *
+         * @return  Optional replacement for the original result.
+         */
+        public Object dialogClosed(Dialog dialog, Object result);
+
+        // }}}
+    }
+
+    // }}}
+
+    /**
+     * Registered hooks.
+     */
+    private IDialogHook[] dialogHooks;
+
+    // {{{ addDialogHook
+
+    /**
+     * Add a dialog hook.
+     *
+     * @param   hook    The hook to add.
+     */
+    public void addDialogHook(IDialogHook hook)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("addDialogHook(IDialogHook)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("hook: ").add(hook)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dialogHooks == null) {
+            dialogHooks = new IDialogHook[] {hook};
+            return;
+        }
+        // Prevent double registration. If the hook is already registered, move it to the
+        // front.
+        for (int i = 0; i < dialogHooks.length; i++) {
+            if (dialogHooks[i] == hook) {
+                if (i == 0) {
+                    return;
+                }
+                System.arraycopy(dialogHooks, 0, dialogHooks, 1, i);
+                dialogHooks[0] = hook;
+            }
+        }
+        // Insert new hook at front
+        IDialogHook[] tmp = new IDialogHook[dialogHooks.length + 1];
+        tmp[0] = hook;
+        System.arraycopy(dialogHooks, 0, tmp, 1, dialogHooks.length);
+        dialogHooks = tmp;
+    }
+
+    // }}}
+    // {{{ removeDialogHook
+
+    /**
+     * Remove a dialog hook.
+     *
+     * @param   hook    The hook to remove.
+     */
+    public void removeDialogHook(IDialogHook hook)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("removeDialogHook(IDialogHook)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("hook: ").add(hook)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dialogHooks == null) {
+            return;
+        }
+
+        for (int i = 0; i < dialogHooks.length; i++) {
+            if (dialogHooks[i] == hook) {
+                if (dialogHooks.length == 1) {
+                    dialogHooks = null;
+                    return;
+                }
+                // Insert new hook at front
+                IDialogHook[] tmp = new IDialogHook[dialogHooks.length - 1];
+                if (i > 0) {
+                    System.arraycopy(dialogHooks, 0, tmp, 0, i - 1);
+                }
+                if (i < dialogHooks.length - 1) {
+                    System.arraycopy(dialogHooks, i + 1, tmp, i,
+                                     dialogHooks.length - i - 1);
+                }
+                dialogHooks = tmp;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDialogCreationHooks
+
+    /**
+     * Notify all hooks about a newly created dialog.
+     *
+     * @param   dialog  The new dialog.
+     */
+    public void runDialogCreationHooks(Dialog dialog)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDialogCreationHooks(Dialog)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("dialog: ").add(dialog)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dialogHooks == null) {
+            return;
+        }
+        IDialogHook[] tmp = (IDialogHook[]) dialogHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                tmp[i].dialogCreated(dialog);
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDialogShownHooks
+
+    /**
+     * Notify all hooks about a dialog being shown.
+     *
+     * @param   dialog  The shown dialog.
+     * @param   handle  The handle for the dialog.
+     */
+    public void runDialogShownHooks(Dialog dialog, int handle)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDialogShownHooks(Dialog,int)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("dialog: ").add(dialog)
+             .add(", handle: ").add(handle)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dialogHooks == null) {
+            return;
+        }
+        IDialogHook[] tmp = (IDialogHook[]) dialogHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                tmp[i].dialogShown(dialog, new Integer (handle));
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDialogClosedHooks
+
+    /**
+     * Notify all hooks about a dialog being closed.
+     *
+     * @param   dialog  The closed dialog.
+     * @param   result  The result of the operation (depends on the type of dialog).
+     */
+    public Object runDialogClosedHooks(Dialog dialog, Object result)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDialogClosedHooks(Dialog,Object)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("dialog: ").add(dialog)
+             .add(", result: ").add(result)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dialogHooks == null) {
+            return result;
+        }
+        IDialogHook[] tmp = (IDialogHook[]) dialogHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                result = tmp[i].dialogClosed(dialog, result);
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Hooks for DND creation
+    //------------------------------------------------------------------------------------------
+    // {{{ interface IDNDHook
+
+    public interface IDNDHook {
+        // {{{ dragSourceCreated
+
+        /**
+         * Notify the hook that a new DragSource was created.
+         *
+         * @param       dragSource The DragSource that was created.
+         */
+        public void dragSourceCreated(DragSource dragSource);
+
+        // }}}
+        // {{{ dropTargetCreated
+
+        /**
+         * Notify the hook that a new DropTarget was created.
+         *
+         * @param       dropTarget The DropTarget that was created.
+         */
+        public void dropTargetCreated(DropTarget dropTarget);
+
+        // }}}
+        // {{{ trackerDragStarted
+
+        /**
+         * Notify the listener that a Drag involving a Tracker was started.
+         */
+        public void trackerDragStarted();
+
+        // }}}
+        // {{{ trackerDragFinished
+
+        /**
+         * Notify the listener that a Drag involving a Tracker was finished.
+         *
+         * @param   cancelled       Whether the drag was cancelled.
+         */
+        public void trackerDragFinished(boolean cancelled);
+
+        // }}}
+    }
+
+    // }}}
+
+    /**
+     * Registered hooks.
+     */
+    private IDNDHook[] dndHooks;
+
+    // {{{ addDNDHook
+
+    /**
+     * Add a dnd hook.
+     *
+     * @param   hook    The hook to add.
+     */
+    public void addDNDHook(IDNDHook hook)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("addDNDHook(IDNDHook)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("hook: ").add(hook)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dndHooks == null) {
+            dndHooks = new IDNDHook[] {hook};
+            return;
+        }
+        // Prevent double registration. If the hook is already registered, move it to the
+        // front.
+        for (int i = 0; i < dndHooks.length; i++) {
+            if (dndHooks[i] == hook) {
+                if (i == 0) {
+                    return;
+                }
+                System.arraycopy(dndHooks, 0, dndHooks, 1, i);
+                dndHooks[0] = hook;
+            }
+        }
+        // Insert new hook at front
+        IDNDHook[] tmp = new IDNDHook[dndHooks.length + 1];
+        tmp[0] = hook;
+        System.arraycopy(dndHooks, 0, tmp, 1, dndHooks.length);
+        dndHooks = tmp;
+    }
+
+    // }}}
+    // {{{ removeDNDHook
+
+    /**
+     * Remove a dnd hook.
+     *
+     * @param   hook    The hook to remove.
+     */
+    public void removeDNDHook(IDNDHook hook)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("removeDNDHook(IDNDHook)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("hook: ").add(hook)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dndHooks == null) {
+            return;
+        }
+
+        for (int i = 0; i < dndHooks.length; i++) {
+            if (dndHooks[i] == hook) {
+                if (dndHooks.length == 1) {
+                    dndHooks = null;
+                    return;
+                }
+                // Insert new hook at front
+                IDNDHook[] tmp = new IDNDHook[dndHooks.length - 1];
+                if (i > 0) {
+                    System.arraycopy(dndHooks, 0, tmp, 0, i - 1);
+                }
+                if (i < dndHooks.length - 1) {
+                    System.arraycopy(dndHooks, i + 1, tmp, i,
+                                     dndHooks.length - i - 1);
+                }
+                dndHooks = tmp;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDNDCreationHooks
+
+    /**
+     * Notify all hooks about a newly created DragSource or DropTarget.
+     *
+     * @param   dragSource     The new DragSource.
+     */
+    public void runDNDCreationHooks(DragSource dragSource)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDNDCreationHooks(DragSource)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("dragSource: ").add(dragSource)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dndHooks == null) {
+            return;
+        }
+        IDNDHook[] tmp = (IDNDHook[]) dndHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                tmp[i].dragSourceCreated(dragSource);
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDNDCreationHooks
+
+    /**
+     * Notify all hooks about a newly created DropTarget or DropTarget.
+     *
+     * @param   dropTarget     The new DropTarget.
+     */
+    public void runDNDCreationHooks(DropTarget dropTarget)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDNDCreationHooks(DropTarget)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("dropTarget: ").add(dropTarget)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dndHooks == null) {
+            return;
+        }
+        IDNDHook[] tmp = (IDNDHook[]) dndHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                tmp[i].dropTargetCreated(dropTarget);
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runDNDTrackerHooks
+
+    /**
+     * Notify all hooks about DnD performed through a Tracker.
+     *
+     * @param   start   True if the DnD is started, false if finished.
+     * @param   cancelled True if the DnD was cancelled.
+     */
+    public void runDNDTrackerHooks(boolean start, boolean cancelled)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runDNDTrackerHooks(boolean,boolean)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("start: ").add(start)
+             .add(", cancelled: ").add(cancelled)).log(Log.MTD);
+        }
+
+        checkDevice();
+
+        if (dndHooks == null) {
+            return;
+        }
+        IDNDHook[] tmp = (IDNDHook[]) dndHooks.clone();
+        for (int i = 0; i < tmp.length; i++) {
+            try {
+                if (start) {
+                    tmp[i].trackerDragStarted();
+                } else {
+                    tmp[i].trackerDragFinished(cancelled);
+                }
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Event filter at Gdk level
+    //------------------------------------------------------------------------------------------
+    // {{{ interface IGdkEventFilter
+
+    public interface IGdkEventFilter {
+        /**
+         * Possibly filter a GdkEvent.
+         *
+         * @param       event The Gdk event.
+         * @param       type  The event type.
+         *
+         * @return      True to process the event normally, false to filter it.
+         */
+        public boolean filterGdkEvent(int GdkEvent, int type);
+    }
+
+    // }}}
+
+    /**
+     * Registered Gdk event filters.
+     */
+    IGdkEventFilter[] gdkEventFilters;
+
+    // {{{ addGdkEventFilter
+
+    public void addGdkEventFilter(IGdkEventFilter hook)
+    {
+        synchronized (classLock) {
+            if (gdkEventFilters == null) {
+                gdkEventFilters = new IGdkEventFilter[] {hook};
+                return;
+            }
+            // Prevent double registration. If the hook is already registered, move it to the
+            // front.
+            for (int i = 0; i < gdkEventFilters.length; i++) {
+                if (gdkEventFilters[i] == hook) {
+                    if (i == 0) {
+                        return;
+                    }
+                    System.arraycopy(gdkEventFilters, 0, gdkEventFilters, 1, i);
+                    gdkEventFilters[0] = hook;
+                }
+            }
+            // Insert new hook at front
+            IGdkEventFilter[] tmp = new IGdkEventFilter[gdkEventFilters.length + 1];
+            tmp[0] = hook;
+            System.arraycopy(gdkEventFilters, 0, tmp, 1, gdkEventFilters.length);
+            gdkEventFilters = tmp;
+        }
+    }
+
+    // }}}
+    // {{{ removeGdkEventFilter
+
+    public void removeGdkEventFilter(IGdkEventFilter hook)
+    {
+        synchronized (classLock) {
+            if (gdkEventFilters == null) {
+                return;
+            }
+
+            for (int i = 0; i < gdkEventFilters.length; i++) {
+                if (gdkEventFilters[i] == hook) {
+                    if (gdkEventFilters.length == 1) {
+                        gdkEventFilters = null;
+                        return;
+                    }
+                    // Insert new hook at front
+                    IGdkEventFilter[] tmp =
+                        new IGdkEventFilter[gdkEventFilters.length - 1];
+                    if (i > 0) {
+                        System.arraycopy(gdkEventFilters, 0, tmp, 0, i - 1);
+                    }
+                    if (i < gdkEventFilters.length - 1) {
+                        System.arraycopy(gdkEventFilters, i + 1, tmp, i,
+                                         gdkEventFilters.length - i - 1);
+                    }
+                    gdkEventFilters = tmp;
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runGdkEventFilters
+
+    protected boolean runGdkEventFilters(int gdkEvent, int type)
+    {
+        if (logger.level >= Log.MTD) {
+            Logger.Builder lb = logger.build("runGdkEventFilters(int,int)");
+            (logger.level < Log.MTDDETAIL ? lb : lb
+             .add("gdkEvent: ").add(gdkEvent)
+             .add(", type: ").add(type)).log(Log.MTD);
+        }
+        IGdkEventFilter[] tmp;
+        synchronized (classLock) {
+            if (gdkEventFilters == null) {
+                return true;
+            }
+            tmp = (IGdkEventFilter[]) gdkEventFilters.clone();
+        }
+        if (tmp != null) {
+            for (int i = 0; i < tmp.length; i++) {
+                try {
+                    if (! tmp[i].filterGdkEvent(gdkEvent, type)) {
+                        if (logger.level >= Log.DBG) {
+                            logger.log(Log.DBG, "runGdkEventFilters(int,int)",
+                                       "Event filtered out");
+                        }
+                        return false;
+                    }
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return true;
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Special idleProc for (a)syncEvents
+    //------------------------------------------------------------------------------------------
+    public interface IdleProc
+    {
+        int /*long*/ idleProc(int /*long*/ data);
+    }
+    /**
+     * Registered IdleProcs
+     */
+    IdleProc[] idleProcs;
+
+    // {{{ addIdleProc
+
+    public void addIdleProc(IdleProc hook)
+    {
+        synchronized (classLock) {
+            if (idleProcs == null) {
+                idleProcs = new IdleProc[] {hook};
+                return;
+            }
+            // Prevent double registration. If the hook is already registered, move it to the
+            // front.
+            for (int i = 0; i < idleProcs.length; i++) {
+                if (idleProcs[i] == hook) {
+                    if (i == 0) {
+                        return;
+                    }
+                    System.arraycopy(idleProcs, 0, idleProcs, 1, i);
+                    idleProcs[0] = hook;
+                }
+            }
+            // Insert new hook at front
+            IdleProc[] tmp = new IdleProc[idleProcs.length + 1];
+            tmp[0] = hook;
+            System.arraycopy(idleProcs, 0, tmp, 1, idleProcs.length);
+            idleProcs = tmp;
+        }
+    }
+
+    // }}}
+    // {{{ removeIdleProc
+
+    public void removeIdleProc(IdleProc hook)
+    {
+        synchronized (classLock) {
+            if (idleProcs == null) {
+                return;
+            }
+
+            for (int i = 0; i < idleProcs.length; i++) {
+                if (idleProcs[i] == hook) {
+                    if (idleProcs.length == 1) {
+                        idleProcs = null;
+                        return;
+                    }
+                    // Insert new hook at front
+                    IdleProc[] tmp =
+                        new IdleProc[idleProcs.length - 1];
+                    if (i > 0) {
+                        System.arraycopy(idleProcs, 0, tmp, 0, i - 1);
+                    }
+                    if (i < idleProcs.length - 1) {
+                        System.arraycopy(idleProcs, i + 1, tmp, i,
+                                         idleProcs.length - i - 1);
+                    }
+                    idleProcs = tmp;
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ runIdleProcs
+
+    public boolean runIdleProcs()
+    {
+        if (logger.level >= Log.MTD) {
+            logger.log(Log.MTD, "runIdleProcs()", "");
+        }
+        IdleProc[] tmp;
+        synchronized (classLock) {
+            if (idleProcs == null) {
+                return true;
+            }
+            tmp = (IdleProc[]) idleProcs.clone();
+        }
+        if (tmp != null) {
+            for (int i = 0; i < tmp.length; i++) {
+                try {
+                    tmp[i].idleProc(0);
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return true;
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Key override during replay
+    //------------------------------------------------------------------------------------------
+    long[] charOverride = new long[32000];
+    int charOverrideHead = 0;
+    int charOverrideTail = 0;
+    // {{{ clearCharOverride
+
+    public void clearCharOverride()
+    {
+        charOverrideHead = 0;
+        charOverrideTail = 0;
+    }
+
+    // }}}
+    // {{{ pushCharOverride
+
+    public void pushCharOverride(int key, char c)
+    {
+        if (charOverrideHead < 32000) {
+            charOverride[charOverrideHead++] = ((long) c) << 32 | key;
+        } else {
+            if (logger.level >= Log.WRN) {
+                logger.log(Log.WRN, "pushCharOverride(int,char)",
+                           "Overflow in charOverride buffer");
+            }
+        }
+    }
+
+    // }}}
+    boolean extraDeferred;
+    // {{{ needExtraDeferred
+
+    public void needExtraDeferred()
+    {
+        if (logger.level >= Log.MTD) {
+            logger.log(Log.MTD, "needExtraDeferred()", "");
+        }
+        extraDeferred = true;
+    }
+
+    // }}}
+
+    //------------------------------------------------------------------------------------------
+    // Helper class for accessing environment variables
+    //
+    // Doesn't belong here.
+    //------------------------------------------------------------------------------------------
+    // {{{ class Environment
+
+    private static class Environment
+    {
+        // {{{ variables
+
+        /**
+         * Names used by DOS/Windows 95 variants.
+         */
+        private final String[] dosNames = {
+            "Windows 95", "Windows 98", "Windows ME"
+        };
+
+        /**
+         * Whether the JDK is at least version 1.5 so we can use System.getenv.
+         */
+        private final boolean is15 = "1.5".compareTo(System.getProperty("java.version")) <= 0;
+
+        /**
+         * Unknown os.
+         */
+        private final int OS_OTHER = 0;
+
+        /**
+         * Posix variants.
+         */
+        private final int OS_POSIX = 1;
+
+        /**
+         * Windows NT variants.
+         */
+        private final int OS_NT = 2;
+
+        /**
+         * DOS/Windows 95 variants.
+         */
+        private final int OS_DOS = 3;
+
+        /**
+         * MacOS variants < Mac OS-X
+         */
+        private final int OS_MAC = 4;
+
+        /**
+         * The os type.
+         */
+        private int os = OS_OTHER;
+
+        /**
+         * The actual environment.
+         */
+        private Properties environment;
+
+        // }}}
+
+        //--------------------------------------------------------------------------------------
+        // Constructor
+        //--------------------------------------------------------------------------------------
+        // {{{ Environment
+
+        /**
+         * Create a new Environment.
+         */
+        public Environment ()
+        {
+            determineOS();
+            if (os != OS_OTHER) {
+                initEnvironment();
+            }
+        }
+
+        // }}}
+
+        //--------------------------------------------------------------------------------------
+        // Public methods
+        //--------------------------------------------------------------------------------------
+        // {{{ isAvaliable
+
+        /**
+         * Test whether the Environment is available.
+         *
+         * @return      Whether the Environment is available.
+         */
+        public boolean isAvaliable()
+        {
+            return os != OS_OTHER;
+        }
+
+        // }}}
+        // {{{ getEnvironment
+
+        /**
+         * Get the whole set of environment variables.
+         *
+         * @return  The environment variables.
+         */
+        public final Properties getEnvironment()
+        {
+            if (os == OS_OTHER) {
+                return null;
+            }
+            synchronized (this) {
+                if (environment == null) {
+                    initEnvironment();
+                }
+            }
+            return environment;
+        }
+
+        // }}}
+        // {{{ setEnvironment
+
+        /**
+         * Set the whole set of environment variables.
+         *
+         * @param   environment     The environment to set.
+         */
+        public final void setEnvironment(Properties environment)
+        {
+            if (os == OS_OTHER) {
+                return;
+            }
+            this.environment = environment;
+        }
+
+
+
+        // }}}
+        // {{{ getEnv
+
+        /**
+         * Get one environment variable.
+         *
+         * @param   name    The name of the environment variable.
+         *
+         * @return  The respective environment value or null if undefined.
+         */
+        public String getEnv(String name)
+        {
+            if (os == OS_OTHER) {
+                return null;
+            }
+            return getEnvironment().getProperty(transformName(name));
+        }
+
+        // }}}
+        // {{{ setEnv
+
+        /**
+         * Set an environment variable value.
+         *
+         * @param   name    The name of the environment variable.
+         * @param   value   The value of the environment variable.
+         */
+        public void setEnv(String name, String value)
+        {
+            if (os == OS_OTHER) {
+                return;
+            }
+            getEnvironment().put(transformName(name), value);
+        }
+
+        // }}}
+        // {{{ unsetEnv
+        /**
+         * Delete an environment variable.
+         *
+         * @param   name    The name of the environment variable.
+         */
+        public void unsetEnv(String name)
+        {
+            if (os == OS_OTHER) {
+                return;
+            }
+            getEnvironment().remove(transformName(name));
+        }
+
+        // }}}
+
+        //--------------------------------------------------------------------------------------
+        // Helper methods
+        //--------------------------------------------------------------------------------------
+        // {{{ determineOS
+
+        /**
+         * Determine the type of the underlying operating system.
+         */
+        private void determineOS()
+        {
+            String osname = System.getProperty("os.name");
+            // debug("osname: " + osname);
+            if (osname == null) {
+                if (is15) {
+                    os = OS_POSIX;
+                    return;
+                }
+                return;
+            }
+
+            if (osname.startsWith("Windows")) {
+                int i;
+                for (i = 0; i < dosNames.length; i++) {
+                    if (dosNames[i].equalsIgnoreCase(osname)) {
+                        os = OS_DOS;
+                    }
+                }
+                if (i == dosNames.length) {
+                    os = OS_NT;
+                }
+            } else if (osname.startsWith("MacOS")) {
+                os = OS_MAC;
+            } else {
+                os = OS_POSIX;
+            }
+            // debug("os: " + os);
+        }
+
+        // }}}
+        // {{{ initEnvironment
+
+        /**
+         * Initialize the environment by executing a subshell.
+         */
+        private void initEnvironment()
+        {
+            environment = new Properties();
+
+            if (is15) {
+                try {
+                    Map env = (Map) System.class.getMethod("getenv", new Class[0])
+                        .invoke(null, new Object[0]);
+                    for (Iterator i = env.entrySet().iterator(); i.hasNext(); ) {
+                        Map.Entry entry = (Map.Entry) i.next();
+                        environment.put(transformName((String) entry.getKey()), entry.getValue());
+                    }
+                    return;
+                } catch (Throwable ex) {
+                    // debug(ex);
+                }
+            }
+            String[] envCommand = null;
+            switch(os) {
+            case OS_POSIX:
+                envCommand = new String[] {"sh", "-c", "env"};
+                break;
+            case OS_NT:
+                envCommand = new String[] {"cmd", "/c", "set"};
+                break;
+            case OS_DOS:
+                envCommand = new String[] {"command.com", "/c", "set"};
+                break;
+            }
+
+            if (envCommand != null) {
+                try {
+                    Process process = Runtime.getRuntime().exec(envCommand);
+                    BufferedReader in = new BufferedReader
+                        (new InputStreamReader(process.getInputStream()));
+                    String line = in.readLine();
+                    if (line.indexOf('=') <= 0) {
+                        terminateProcess(process);
+                        return;
+                    }
+                    StringBuffer sb = new StringBuffer ();
+                    String key = "";
+                    int lines = 0;
+                    while (line != null) {
+                        lines++;
+                        int idx = line.indexOf('=');
+                        if (idx < 0) {
+                            // Belongs to previous line
+                            sb.append("\n");
+                            sb.append(line);
+                        } else {
+                            environment.put(key, sb.toString());
+                            sb.setLength(0);
+                            key = transformName(line.substring(0, idx));
+                            sb.append(line.substring(idx + 1));
+                        }
+                        line = in.readLine();
+                    }
+                    environment.put(key, sb.toString());
+                    terminateProcess(process);
+                    // debug("lines: " + lines);
+                    // debug("environment: " + environment);
+                } catch (Throwable ex) {
+                    // debug(ex);
+                    os = OS_OTHER;
+                }
+            }
+        }
+
+        // }}}
+        // {{{ terminateProcess
+
+        /**
+         * Terminate a process cleanly and make sure its output and error streams are read to
+         * prevent it from blocking.
+         *
+         * @param   process The process to terminate.
+         */
+        private void terminateProcess(final Process process)
+        {
+            final byte[] buf = new byte[32768];
+            // Make sure output stream gets cleared.
+            new Thread() {
+                public void run() {
+                    try {
+                        InputStream in = process.getInputStream();
+                        while (in.read(buf) >= 0) {
+                        }
+                    } catch (Throwable ex) {
+                        // debug(ex);
+                    }
+                }
+            }.start();
+            // Make sure error stream gets cleared.
+            new Thread() {
+                public void run() {
+                    try {
+                        InputStream in = process.getErrorStream();
+                        while (in.read(buf) >= 0) {
+                        }
+                    } catch (Throwable ex) {
+                        // debug(ex);
+                    }
+                }
+            }.start();
+            process.destroy();
+        }
+
+        // }}}
+        // {{{ transformName
+
+        /**
+         * Transform the name of an envrionment variable: On Windows Systems the name is converted
+         * to upper case.
+         *
+         * @param   name    The name of the envrionment variable.
+         *
+         * @return  The transformed name.
+         */
+        private String transformName(String name)
+        {
+            return (os == OS_DOS || os == OS_NT) ? name.toUpperCase() : name;
+        }
+
+        // }}}
+    }
+    // }}}
+
+    /**
+     * Static initialization: Check system properties and environment variables for display
+     * creation hooks.
+     */
+    static {
+        try {
+            String hookClasses = System.getProperty("eclipse.swt.DisplayCreationHooks");
+            String envHooks = new Environment ().getEnv("SWT_DISPLAY_CREATION_HOOKS");
+            if (envHooks != null) {
+                hookClasses = hookClasses == null ? envHooks : (hookClasses + ":" + envHooks);
+            }
+            if (hookClasses != null) {
+                for (StringTokenizer st = new StringTokenizer(hookClasses, ":;, \t\r\n");
+                     st.hasMoreTokens(); ) {
+                    String clName = st.nextToken();
+                    try {
+                        Class cl;
+                        try {
+                            // First try to fall back to the system ClassLoader
+                            cl = ClassLoader.getSystemClassLoader().loadClass(clName);
+                        } catch (Throwable th) {
+                            // Then try the ClassLoader for this code
+                            cl = Display.class.getClassLoader().loadClass(clName);
+                        }
+                        Object o = cl.getConstructor(new Class[] {Class.class})
+                            .newInstance(new Object[] {Display.class});
+                        String buildnumber = null;
+                        try {
+                            java.io.InputStream in = Display.class.getResourceAsStream
+                                ("/org/eclipse/swt/widgets/qfsbuild.properties");
+                            Properties build = new Properties ();
+                            build.load(in);
+                            buildnumber = build.getProperty("buildnumber");
+                        } catch (Throwable th) {
+                            if (logger.level >= Log.WRN) {
+                                logger.log(Log.WRN, "run()", th);
+                            }
+                        }
+                        System.out.println("SWT " + SWT.getVersion() + " build qftest." +
+                                           (buildnumber == null ? "?" : buildnumber));
+                    } catch (Throwable th) {
+                        th.printStackTrace();
+                    }
+                }
+            }
+        } catch (Throwable th) {
+            th.printStackTrace();
+        }
+    }
+// <QFS>
+
 	/* Events Dispatching and Callback */
 	int gdkEventCount;
 	int /*long*/ [] gdkEvents;
 	Widget [] gdkEventWidgets;
-	int [] dispatchEvents;
+        int [] dispatchEvents;
 	Event [] eventQueue;
 	int /*long*/ fds;
 	int allocated_nfds;
@@ -150,7 +1421,7 @@
 	Shell activeShell;
 	boolean activePending;
 	boolean ignoreActivate, ignoreFocus;
-	
+
 	/* Input method resources */
 	Control imControl;
 	int /*long*/ preeditWindow, preeditLabel;
@@ -161,7 +1432,7 @@
 
 	/* Display Shutdown */
 	Runnable [] disposeList;
-	
+
 	/* Deferred Layout list */
 	Composite[] layoutDeferred;
 	int layoutDeferredCount;
@@ -169,7 +1440,7 @@
 	/* System Tray */
 	Tray tray;
 	TrayItem currentTrayItem;
-	
+
 	/* Timers */
 	int [] timerIds;
 	Runnable [] timerList;
@@ -177,13 +1448,13 @@
 	int /*long*/ timerProc;
 	Callback windowTimerCallback;
 	int /*long*/ windowTimerProc;
-	
+
 	/* Caret */
 	Caret currentCaret;
 	Callback caretCallback;
 	int caretId;
 	int /*long*/ caretProc;
-	
+
 	/* Mnemonics */
 	Control mnemonicControl;
 
@@ -191,7 +1462,7 @@
 	int mouseHoverId;
 	int /*long*/ mouseHoverHandle, mouseHoverProc;
 	Callback mouseHoverCallback;
-	
+
 	/* Menu position callback */
 	int /*long*/ menuPositionProc;
 	Callback menuPositionCallback;
@@ -205,7 +1476,7 @@
 	/* Shell map callback */
 	int /*long*/ shellMapProc;
 	Callback shellMapCallback;
-	
+
 	/* Idle proc callback */
 	int /*long*/ idleProc;
 	int idleHandle;
@@ -214,21 +1485,21 @@
 	static final String REMOVE_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.removeIdleProc"; //$NON-NLS-1$
 	Object idleLock = new Object();
 	boolean idleNeeded;
-	
+
 	/* GtkTreeView callbacks */
 	int /*long*/ cellDataProc;
 	Callback cellDataCallback;
-	
+
 	/* Set direction callback */
 	int /*long*/ setDirectionProc;
 	Callback setDirectionCallback;
 	static final String GET_DIRECTION_PROC_KEY = "org.eclipse.swt.internal.gtk.getDirectionProc"; //$NON-NLS-1$
-	
+
 	/* Set emissionProc callback */
 	int /*long*/ emissionProc;
 	Callback emissionProcCallback;
 	static final String GET_EMISSION_PROC_KEY = "org.eclipse.swt.internal.gtk.getEmissionProc"; //$NON-NLS-1$
-	
+
 	/* Get all children callback */
 	int /*long*/ allChildrenProc, allChildren;
 	Callback allChildrenCallback;
@@ -240,13 +1511,13 @@
 	boolean settingsChanged, runSettings;
 	static final int STYLE_SET = 1;
 	static final int PROPERTY_NOTIFY = 2;
-	
+
 	/* Entry focus behaviour */
 	boolean entrySelectOnFocus;
-	
+
 	/* Enter/Exit events */
 	Control currentControl;
-	
+
 	/* Flush exposes */
 	int /*long*/ checkIfEventProc;
 	Callback checkIfEventCallback;
@@ -275,24 +1546,24 @@
 
 	/* Popup Menus */
 	Menu [] popups;
-	
+
 	/* Click count*/
 	int clickCount = 1;
-	
+
 	/* Entry inner border */
 	static final int INNER_BORDER = 2;
-	
+
 	/* Timestamp of the Last Received Events */
 	int lastEventTime, lastUserEventTime;
-	
+
 	/* Pango layout constructor */
 	int /*long*/ pangoLayoutNewProc;
-	
+
 	/* Custom Resize */
 	double resizeLocationX, resizeLocationY;
 	int resizeBoundsX, resizeBoundsY, resizeBoundsWidth, resizeBoundsHeight;
 	int resizeMode;
-	
+
 	/* Fixed Subclass */
 	static int /*long*/ fixed_type;
 	static int /*long*/ fixed_info_ptr;
@@ -307,7 +1578,7 @@
 
 	/* Key Mappings */
 	static final int [] [] KeyTable = {
-		
+
 		/* Keyboard and Mouse Masks */
 		{OS.GDK_Alt_L,		SWT.ALT},
 		{OS.GDK_Alt_R,		SWT.ALT},
@@ -319,7 +1590,7 @@
 		{OS.GDK_Control_R,	SWT.CONTROL},
 //		{OS.GDK_????,		SWT.COMMAND},
 //		{OS.GDK_????,		SWT.COMMAND},
-		
+
 		/* Non-Numeric Keypad Keys */
 		{OS.GDK_Up,						SWT.ARROW_UP},
 		{OS.GDK_KP_Up,					SWT.ARROW_UP},
@@ -339,7 +1610,7 @@
 		{OS.GDK_KP_End,				SWT.END},
 		{OS.GDK_Insert,					SWT.INSERT},
 		{OS.GDK_KP_Insert,			SWT.INSERT},
-		
+
 		/* Virtual and Ascii Keys */
 		{OS.GDK_BackSpace,		SWT.BS},
 		{OS.GDK_Return,				SWT.CR},
@@ -349,7 +1620,7 @@
 		{OS.GDK_Linefeed,			SWT.LF},
 		{OS.GDK_Tab,					SWT.TAB},
 		{OS.GDK_ISO_Left_Tab, 	SWT.TAB},
-	
+
 		/* Functions Keys */
 		{OS.GDK_F1,		SWT.F1},
 		{OS.GDK_F2,		SWT.F2},
@@ -371,7 +1642,7 @@
 		{OS.GDK_F18,		SWT.F18},
 		{OS.GDK_F19,		SWT.F19},
 		{OS.GDK_F20,		SWT.F20},
-		
+
 		/* Numeric Keypad Keys */
 		{OS.GDK_KP_Multiply,		SWT.KEYPAD_MULTIPLY},
 		{OS.GDK_KP_Add,			SWT.KEYPAD_ADD},
@@ -399,7 +1670,7 @@
 		{OS.GDK_Break,				SWT.BREAK},
 		{OS.GDK_Print,					SWT.PRINT_SCREEN},
 		{OS.GDK_Help,					SWT.HELP},
-		
+
 	};
 
 	/* Multiple Displays. */
@@ -409,7 +1680,7 @@
 	/* Skinning support */
 	Widget [] skinList = new Widget [GROW_SIZE];
 	int skinCount;
-	
+
 	/* Package name */
 	static final String PACKAGE_PREFIX = "org.eclipse.swt.widgets."; //$NON-NLS-1$
 	/* This code is intentionally commented.
@@ -430,7 +1701,7 @@
 	Object data;
 	String [] keys;
 	Object [] values;
-	
+
 	/* Initial Guesses for Shell Trimmings. */
 	int borderTrimWidth = 4, borderTrimHeight = 4;
 	int resizeTrimWidth = 6, resizeTrimHeight = 6;
@@ -470,7 +1741,7 @@
  * Constructs a new instance of this class.
  * <p>
  * Note: The resulting display is marked as the <em>current</em>
- * display. If this is the first display which has been 
+ * display. If this is the first display which has been
  * constructed since the application started, it is also
  * marked as the <em>default</em> display.
  * </p>
@@ -491,11 +1762,14 @@
 
 /**
  * Constructs a new instance of this class using the parameter.
- * 
+ *
  * @param data the device data
  */
 public Display (DeviceData data) {
 	super (data);
+        // <QFS> Execute display creation hooks
+        runDisplayCreationHooks(this);
+        // </QFS>
 }
 
 /**
@@ -515,7 +1789,7 @@
  * powerful and dangerous. They should generally be avoided for
  * performance, debugging and code maintenance reasons.
  * </p>
- * 
+ *
  * @param eventType the type of event to listen for
  * @param listener the listener which should be notified when the event occurs
  *
@@ -531,8 +1805,8 @@
  * @see SWT
  * @see #removeFilter
  * @see #removeListener
- * 
- * @since 3.0 
+ *
+ * @since 3.0
  */
 public void addFilter (int eventType, Listener listener) {
 	checkDevice ();
@@ -609,8 +1883,8 @@
  * @see Listener
  * @see SWT
  * @see #removeListener
- * 
- * @since 2.0 
+ *
+ * @since 2.0
  */
 public void addListener (int eventType, Listener listener) {
 	checkDevice ();
@@ -634,7 +1908,14 @@
 }
 
 void addPopup (Menu menu) {
-	if (popups == null) popups = new Menu [4];
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("addPopup(Menu)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("menu: ").add(menu)).log(Log.MTD);
+    }
+    // </QFS>
+        if (popups == null) popups = new Menu [4];
 	int length = popups.length;
 	for (int i=0; i<length; i++) {
 		if (popups [i] == menu) return;
@@ -686,13 +1967,13 @@
 
 /**
  * Causes the <code>run()</code> method of the runnable to
- * be invoked by the user-interface thread at the next 
- * reasonable opportunity. The caller of this method continues 
+ * be invoked by the user-interface thread at the next
+ * reasonable opportunity. The caller of this method continues
  * to run in parallel, and is not notified when the
  * runnable has completed.  Specifying <code>null</code> as the
  * runnable simply wakes the user-interface thread when run.
  * <p>
- * Note that at the time the runnable is invoked, widgets 
+ * Note that at the time the runnable is invoked, widgets
  * that have the receiver as their display may have been
  * disposed. Therefore, it is necessary to check for this
  * case inside the runnable before accessing the widget.
@@ -703,19 +1984,20 @@
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @see #syncExec
  */
 public void asyncExec (Runnable runnable) {
 	synchronized (Device.class) {
-		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-		synchronized (idleLock) {
-			if (idleNeeded && idleHandle == 0) {
-	 			//NOTE: calling unlocked function in OS
-				idleHandle = OS._g_idle_add (idleProc, 0);
-			}
-		}
-		synchronizer.asyncExec (runnable);
+                if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+                synchronized (idleLock) {
+                        if (idleNeeded && idleHandle == 0) {
+                                //NOTE: calling unlocked function in OS
+                                idleHandle = OS._g_idle_add (idleProc, 0);
+                        }
+                }
+                // <QFS/> Redirected to internalAsyncExec.
+                synchronizer.internalAsyncExec (runnable);
 	}
 }
 
@@ -722,7 +2004,7 @@
 /**
  * Causes the system hardware to emit a short sound
  * (if it supports this capability).
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
@@ -753,13 +2035,13 @@
 
 static void checkDisplay (Thread thread, boolean multiple) {
 	synchronized (Device.class) {
-		for (int i=0; i<Displays.length; i++) {
-			if (Displays [i] != null) {
+	for (int i=0; i<Displays.length; i++) {
+		if (Displays [i] != null) {
 				if (!multiple) SWT.error (SWT.ERROR_NOT_IMPLEMENTED, null, " [multiple displays]"); //$NON-NLS-1$
-				if (Displays [i].thread == thread) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
-			}
+			if (Displays [i].thread == thread) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
 		}
 	}
+	}
 }
 
 int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*long*/ userData) {
@@ -872,7 +2154,7 @@
  * </ul>
  *
  * @see Device#dispose
- * 
+ *
  * @since 2.0
  */
 public void close () {
@@ -908,7 +2190,7 @@
 		OS.g_thread_init (0);
 	}
 	if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) {
-	    OS.gtk_set_locale();
+	OS.gtk_set_locale();
 	}
 	if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$
@@ -977,7 +2259,7 @@
 		OS.memmove (pixbuf_renderer_info_ptr, renderer_info, GTypeInfo.sizeof);
 		byte [] type_name = Converter.wcsToMbcs (null, "SwtPixbufRenderer", true); //$NON-NLS-1$
 		pixbuf_renderer_type = OS.g_type_register_static (OS.GTK_TYPE_CELL_RENDERER_PIXBUF (), type_name, pixbuf_renderer_info_ptr, 0);
-	}	
+	}
 	if (toggle_renderer_type == 0) {
 		GTypeInfo renderer_info = new GTypeInfo ();
 		renderer_info.class_size = (short) OS.GtkCellRendererToggleClass_sizeof ();
@@ -988,7 +2270,7 @@
 		byte [] type_name = Converter.wcsToMbcs (null, "SwtToggleRenderer", true); //$NON-NLS-1$
 		toggle_renderer_type = OS.g_type_register_static (OS.GTK_TYPE_CELL_RENDERER_TOGGLE (), type_name, toggle_renderer_info_ptr, 0);
 	}
-	
+
 	OS.gtk_widget_set_default_direction (OS.GTK_TEXT_DIR_LTR);
 	byte [] buffer = Converter.wcsToMbcs (null, APP_NAME, true);
 	OS.g_set_prgname (buffer);
@@ -1064,7 +2346,7 @@
 
 static void deregister (Display display) {
 	synchronized (Device.class) {
-		for (int i=0; i<Displays.length; i++) {
+	for (int i=0; i<Displays.length; i++) {
 			if (display == Displays [i]) Displays [i] = null;
 		}
 	}
@@ -1101,7 +2383,7 @@
  * user-interface thread for, or null if the given thread
  * is not a user-interface thread for any display.  Specifying
  * <code>null</code> as the thread will return <code>null</code>
- * for the display. 
+ * for the display.
  *
  * @param thread the user-interface thread
  * @return the display for the given thread
@@ -1108,14 +2390,14 @@
  */
 public static Display findDisplay (Thread thread) {
 	synchronized (Device.class) {
-		for (int i=0; i<Displays.length; i++) {
-			Display display = Displays [i];
-			if (display != null && display.thread == thread) {
-				return display;
-			}
+	for (int i=0; i<Displays.length; i++) {
+		Display display = Displays [i];
+		if (display != null && display.thread == thread) {
+			return display;
 		}
-		return null;
 	}
+	return null;
+	}
 }
 
 /**
@@ -1125,7 +2407,7 @@
  * is ignored.
  *
  * @param runnable code to run at dispose time.
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
@@ -1159,7 +2441,16 @@
 }
 
 int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
-	/*
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("eventProc(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("event: ").add(event)
+         .add("time: ").add(OS.gdk_event_get_time (event))
+         .add(", data: ").add(data)).log(Log.MTD);
+    }
+    // </QFS>
+       /*
 	* Use gdk_event_get_time() rather than event.time or
 	* gtk_get_current_event_time().  If the event does not
 	* have a time stamp, then the field will contain garbage.
@@ -1171,6 +2462,11 @@
 	if (time != 0) lastEventTime = time;
 
 	int eventType = OS.GDK_EVENT_TYPE (event);
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.build("eventProc(int,int)").add("eventType: ").add(eventType).log(Log.DBG);
+        }
+        // </QFS>
 	switch (eventType) {
 		case OS.GDK_BUTTON_PRESS:
 		case OS.GDK_KEY_PRESS:
@@ -1177,6 +2473,12 @@
 			lastUserEventTime = time;
 	}
 	boolean dispatch = true;
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.build("eventProc(int,int)")
+                .add("dispatchEvents: ").addAll(dispatchEvents).log(Log.DBG);
+        }
+        // </QFS>
 	if (dispatchEvents != null) {
 		dispatch = false;
 		for (int i = 0; i < dispatchEvents.length; i++) {
@@ -1186,12 +2488,37 @@
 			}
 		}
 	}
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.build("eventProc(int,int)").add("dispatch: ").add(dispatch).log(Log.DBG);
+        }
+        // </QFS>
 	if (!dispatch) {
 		addGdkEvent (OS.gdk_event_copy (event));
+                // <QFS> Additional async message entry point
+                // [issue1549] Disabled.
+                // runAsyncMessages (false);
+                // </QFS>
 		return 0;
 	}
-	OS.gtk_main_do_event (event);
+        // <QFS> Optional event filter at Gdk level
+        if (runGdkEventFilters(event, eventType)) {
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "eventProc(int,int)",
+                           "Running gtk_main_do_event");
+            }
+            OS.gtk_main_do_event (event);
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "eventProc(int,int)",
+                           "Done running gtk_main_do_event");
+            }
+        }
+        // </QFS>
 	if (dispatchEvents == null) putGdkEvents ();
+        // <QFS> Additional async message entry point
+        // [issue1549] Disabled.
+        // runAsyncMessages (false);
+        // </QFS>
 	return 0;
 }
 
@@ -1212,7 +2539,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 public Widget findWidget (int /*long*/ handle) {
@@ -1239,9 +2566,9 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @noreference This method is not intended to be referenced by clients.
- * 
+ *
  * @since 3.1
  */
 public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
@@ -1263,7 +2590,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 3.3
  */
 public Widget findWidget (Widget widget, int /*long*/ id) {
@@ -1412,11 +2739,11 @@
 	int /*long*/ [] user_data = new int /*long*/ [1];
 	int /*long*/ window = OS.gdk_window_at_pointer (x,y);
 	if (window != 0) {
-		OS.gdk_window_get_user_data (window, user_data);
+	OS.gdk_window_get_user_data (window, user_data);
 		handle = user_data [0];
 	} else {
 		/*
-		* Feature in GTK. gdk_window_at_pointer() will not return a window 
+		* Feature in GTK. gdk_window_at_pointer() will not return a window
 		* if the pointer is over a foreign embedded window. The fix is to use
 		* XQueryPointer to find the containing GDK window.
 		*/
@@ -1440,7 +2767,7 @@
 				}
 				if (gdkWindow != 0)	{
 					OS.gdk_window_get_user_data (gdkWindow, user_data);
-					if (user_data[0] != 0) handle = user_data[0];	
+					if (user_data[0] != 0) handle = user_data[0];
 				}
 			}
 		} while (xWindow != 0);
@@ -1523,12 +2850,12 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 3.0
  */
 public Point [] getCursorSizes () {
 	checkDevice ();
-	return new Point [] {new Point (16, 16), new Point (32, 32)}; 
+	return new Point [] {new Point (16, 16), new Point (32, 32)};
 }
 
 /**
@@ -1582,7 +2909,7 @@
  * Returns the application defined, display specific data
  * associated with the receiver, or null if it has not been
  * set. The <em>display specific data</em> is a single,
- * unnamed field that is stored with every display. 
+ * unnamed field that is stored with every display.
  * <p>
  * Applications may put arbitrary objects in this field. If
  * the object stored in the display specific data needs to
@@ -1631,8 +2958,8 @@
  */
 public static Display getDefault () {
 	synchronized (Device.class) {
-		if (Default == null) Default = new Display ();
-		return Default;
+	if (Default == null) Default = new Display ();
+	return Default;
 	}
 }
 
@@ -1673,7 +3000,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public int getDismissalAlignment () {
@@ -1680,8 +3007,8 @@
 	checkDevice ();
 	int [] buffer = new int [1];
 	if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
-		int /*long*/ settings = OS.gtk_settings_get_default ();
-		OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
+	int /*long*/ settings = OS.gtk_settings_get_default ();
+	OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
 	}
 	return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
 }
@@ -1752,7 +3079,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 3.0
  */
 public boolean getHighContrast () {
@@ -1777,7 +3104,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @see Device#getDepth
  */
 public int getIconDepth () {
@@ -1794,17 +3121,18 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @see Decorations#setImages(Image[])
- * 
+ *
  * @since 3.0
  */
 public Point [] getIconSizes () {
 	checkDevice ();
-	return new Point [] {new Point (16, 16), new Point (32, 32)}; 
+	return new Point [] {new Point (16, 16), new Point (32, 32)};
 }
 
-int getLastEventTime () {
+// <QFS/> Made public
+public int getLastEventTime () {
 	return lastEventTime;
 }
 
@@ -1841,7 +3169,7 @@
 		} else if (actualLength [0] == 32) {
 			long values [] = new long [4];
 			OS.memmove (values, data[0], 32);
-			result = new Rectangle ((int)values [0],(int)values [1],(int)values [2],(int)values [3]);			
+			result = new Rectangle ((int)values [0],(int)values [1],(int)values [2],(int)values [3]);
 		}
 		OS.g_free (data [0]);
 	}
@@ -1850,9 +3178,9 @@
 
 /**
  * Returns an array of monitors attached to the device.
- * 
+ *
  * @return the array of monitors
- * 
+ *
  * @since 3.0
  */
 public Monitor [] getMonitors () {
@@ -1907,7 +3235,7 @@
 			monitor.clientWidth = monitor.width;
 			monitor.clientHeight = monitor.height;
 		}
-		monitors = new Monitor [] { monitor };			
+		monitors = new Monitor [] { monitor };
 	}
 	return monitors;
 }
@@ -1914,9 +3242,9 @@
 
 /**
  * Returns the primary monitor for that device.
- * 
+ *
  * @return the primary monitor
- * 
+ *
  * @since 3.0
  */
 public Monitor getPrimaryMonitor () {
@@ -1954,7 +3282,7 @@
 					System.arraycopy (result, 0, newResult, 0, index);
 					result = newResult;
 				}
-				result [index++] = (Shell) widget;	
+				result [index++] = (Shell) widget;
 			}
 		}
 	}
@@ -1968,12 +3296,12 @@
  * Gets the synchronizer used by the display.
  *
  * @return the receiver's synchronizer
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 3.4
  */
 public Synchronizer getSynchronizer () {
@@ -1991,7 +3319,7 @@
  * </p>
  *
  * @return the receiver's sync-interface thread
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1998,8 +3326,8 @@
  */
 public Thread getSyncThread () {
 	synchronized (Device.class) {
-		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-		return synchronizer.syncThread;
+	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+	return synchronizer.syncThread;
 	}
 }
 
@@ -2046,7 +3374,7 @@
 		case SWT.COLOR_LIST_SELECTION: 						gdkColor = COLOR_LIST_SELECTION; break;
 		case SWT.COLOR_LIST_SELECTION_TEXT: 				gdkColor = COLOR_LIST_SELECTION_TEXT; break;
 		default:
-			return super.getSystemColor (id);	
+			return super.getSystemColor (id);
 	}
 	if (gdkColor == null) return super.getSystemColor (SWT.COLOR_BLACK);
 	return Color.gtk_new (this, gdkColor);
@@ -2059,7 +3387,7 @@
  * not be free'd because it was allocated by the system,
  * not the application.  A value of <code>null</code> will
  * be returned if the supplied constant is not an SWT cursor
- * constant. 
+ * constant.
  *
  * @param id the SWT cursor constant
  * @return the corresponding cursor or <code>null</code>
@@ -2091,7 +3419,7 @@
  * @see SWT#CURSOR_IBEAM
  * @see SWT#CURSOR_NO
  * @see SWT#CURSOR_HAND
- * 
+ *
  * @since 3.0
  */
 public Cursor getSystemCursor (int id) {
@@ -2111,7 +3439,7 @@
  * not the application.  A value of <code>null</code> will
  * be returned either if the supplied constant is not an
  * SWT icon constant or if the platform does not define an
- * image that corresponds to the constant. 
+ * image that corresponds to the constant.
  *
  * @param id the SWT icon constant
  * @return the corresponding image or <code>null</code>
@@ -2126,7 +3454,7 @@
  * @see SWT#ICON_QUESTION
  * @see SWT#ICON_WARNING
  * @see SWT#ICON_WORKING
- * 
+ *
  * @since 3.0
  */
 public Image getSystemImage (int id) {
@@ -2177,7 +3505,7 @@
 
 void initializeSystemColors () {
 	GdkColor gdkColor;
-	
+
 	/* Get Tooltip resources */
 	int /*long*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
 	if (tooltipShellHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -2191,10 +3519,10 @@
 	gdkColor = new GdkColor();
 	OS.gtk_style_get_bg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
 	COLOR_INFO_BACKGROUND = gdkColor;
-	OS.gtk_widget_destroy (tooltipShellHandle);	
+	OS.gtk_widget_destroy (tooltipShellHandle);
 
 	/* Get Shell resources */
-	int /*long*/ style = OS.gtk_widget_get_style (shellHandle);	
+	int /*long*/ style = OS.gtk_widget_get_style (shellHandle);
 	gdkColor = new GdkColor();
 	OS.gtk_style_get_black (style, gdkColor);
 	COLOR_WIDGET_DARK_SHADOW = gdkColor;
@@ -2281,7 +3609,7 @@
 public Font getSystemFont () {
 	checkDevice ();
 	if (systemFont != null) return systemFont;
-	int /*long*/ style = OS.gtk_widget_get_style (shellHandle);	
+	int /*long*/ style = OS.gtk_widget_get_style (shellHandle);
 	int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
 	return systemFont = Font.gtk_new (this, defaultFont);
 }
@@ -2291,7 +3619,7 @@
  * when there is no system taskBar available for the platform.
  *
  * @return the system taskBar or <code>null</code>
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2308,7 +3636,7 @@
  * when there is no system tray available for the platform.
  *
  * @return the system tray or <code>null</code>
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2325,7 +3653,7 @@
  * Returns the user-interface thread for the receiver.
  *
  * @return the receiver's user-interface thread
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2332,8 +3660,8 @@
  */
 public Thread getThread () {
 	synchronized (Device.class) {
-		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-		return thread;
+	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+	return thread;
 	}
 }
 
@@ -2363,7 +3691,7 @@
 		lastHandle = handle;
 		return lastWidget = widgetTable [(int)/*64*/index];
 	}
-	return null;	
+	return null;
 }
 
 int /*long*/ idleProc (int /*long*/ data) {
@@ -2382,7 +3710,7 @@
  * <p>
  * This method is called after <code>create</code>.
  * </p>
- * 
+ *
  * @see #create
  */
 protected void init () {
@@ -2501,7 +3829,7 @@
 	closures [Widget.SHOW_HELP] = OS.g_cclosure_new (windowProc3, Widget.SHOW_HELP, 0);
 	closures [Widget.SIZE_ALLOCATE] = OS.g_cclosure_new (windowProc3, Widget.SIZE_ALLOCATE, 0);
 	closures [Widget.STYLE_SET] = OS.g_cclosure_new (windowProc3, Widget.STYLE_SET, 0);
-	closures [Widget.TOGGLED] = OS.g_cclosure_new (windowProc3, Widget.TOGGLED, 0);	
+	closures [Widget.TOGGLED] = OS.g_cclosure_new (windowProc3, Widget.TOGGLED, 0);
 	closures [Widget.UNMAP_EVENT] = OS.g_cclosure_new (windowProc3, Widget.UNMAP_EVENT, 0);
 	closures [Widget.VISIBILITY_NOTIFY_EVENT] = OS.g_cclosure_new (windowProc3, Widget.VISIBILITY_NOTIFY_EVENT, 0);
 	closures [Widget.WINDOW_STATE_EVENT] = OS.g_cclosure_new (windowProc3, Widget.WINDOW_STATE_EVENT, 0);
@@ -2547,7 +3875,7 @@
 	windowTimerCallback = new Callback (this, "windowTimerProc", 1); //$NON-NLS-1$
 	windowTimerProc = windowTimerCallback.getAddress ();
 	if (windowTimerProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	
+
 	mouseHoverCallback = new Callback (this, "mouseHoverProc", 1); //$NON-NLS-1$
 	mouseHoverProc = mouseHoverCallback.getAddress ();
 	if (mouseHoverProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
@@ -2559,15 +3887,15 @@
 	menuPositionCallback = new Callback(this, "menuPositionProc", 5); //$NON-NLS-1$
 	menuPositionProc = menuPositionCallback.getAddress();
 	if (menuPositionProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	
+
 	sizeAllocateCallback = new Callback(this, "sizeAllocateProc", 3); //$NON-NLS-1$
 	sizeAllocateProc = sizeAllocateCallback.getAddress();
 	if (sizeAllocateProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	
+
 	sizeRequestCallback = new Callback(this, "sizeRequestProc", 3); //$NON-NLS-1$
 	sizeRequestProc = sizeRequestCallback.getAddress();
 	if (sizeRequestProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	
+
 	shellMapCallback = new Callback(this, "shellMapProc", 3); //$NON-NLS-1$
 	shellMapProc = shellMapCallback.getAddress();
 	if (shellMapProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
@@ -2574,7 +3902,7 @@
 
 	shellMapProcClosure = OS.g_cclosure_new (shellMapProc, 0, 0);
 	OS.g_closure_ref (shellMapProcClosure);
-	
+
 	cellDataCallback = new Callback (this, "cellDataProc", 5); //$NON-NLS-1$
 	cellDataProc = cellDataCallback.getAddress ();
 	if (cellDataProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
@@ -2582,7 +3910,7 @@
 	setDirectionCallback = new Callback (this, "setDirectionProc", 2); //$NON-NLS-1$
 	setDirectionProc = setDirectionCallback.getAddress ();
 	if (setDirectionProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	
+
 	emissionProcCallback = new Callback (this, "emissionProc", 4); //$NON-NLS-1$
 	emissionProc = emissionProcCallback.getAddress ();
 	if (emissionProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
@@ -2601,16 +3929,16 @@
 }
 
 void initializeSubclasses () {
-	int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
-	int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
-	pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
-	OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
-	OS.g_type_class_unref (pangoLayoutClass);
+		int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+		int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+		pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
+		OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
+		OS.g_type_class_unref (pangoLayoutClass);
 }
 
 void initializeSystemSettings () {
 	OS.g_signal_connect (shellHandle, OS.style_set, signalProc, STYLE_SET);
-	
+
 	/*
 	* Feature in GTK.  Despite the fact that the
 	* gtk-entry-select-on-focus property is a global
@@ -2638,21 +3966,21 @@
 void initializeWindowManager () {
 	/* Get the window manager name */
 	windowManager = ""; //$NON-NLS-1$
-	int /*long*/ screen = OS.gdk_screen_get_default ();
-	if (screen != 0) {
-		int /*long*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);
-		if (ptr2 != 0) {
-			int length = OS.strlen (ptr2);
-			if (length > 0) {
-				byte [] buffer2 = new byte [length];
-				OS.memmove (buffer2, ptr2, length);
-				windowManager = new String (Converter.mbcsToWcs (null, buffer2));
+		int /*long*/ screen = OS.gdk_screen_get_default ();
+		if (screen != 0) {
+			int /*long*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);
+			if (ptr2 != 0) {
+				int length = OS.strlen (ptr2);
+				if (length > 0) {
+					byte [] buffer2 = new byte [length];
+					OS.memmove (buffer2, ptr2, length);
+					windowManager = new String (Converter.mbcsToWcs (null, buffer2));
+				}
 			}
 		}
-	}
 }
 
-/**	 
+/**
  * Invokes platform specific functionality to dispose a GC handle.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -2663,8 +3991,8 @@
  * </p>
  *
  * @param hDC the platform specific GC handle
- * @param data the platform specific GC data 
- * 
+ * @param data the platform specific GC data
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
@@ -2676,7 +4004,7 @@
 	}
 }
 
-/**	 
+/**
  * Invokes platform specific functionality to allocate a new GC handle.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -2686,9 +4014,9 @@
  * application code.
  * </p>
  *
- * @param data the platform specific GC data 
+ * @param data the platform specific GC data
  * @return the platform specific GC handle
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2695,7 +4023,7 @@
  * @exception SWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>
  * </ul>
- * 
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 public int /*long*/ internal_new_GC (GCData data) {
@@ -2738,7 +4066,7 @@
  * systems are mirrored, special care needs to be taken
  * when mapping coordinates from one control to another
  * to ensure the result is correctly mirrored.
- * 
+ *
  * Mapping a point that is the origin of a rectangle and
  * then adding the width and height is not equivalent to
  * mapping the rectangle.  When one control is mirrored
@@ -2748,26 +4076,26 @@
  * instead of just one point causes both the origin and
  * the corner of the rectangle to be mapped.
  * </p>
- * 
+ *
  * @param from the source <code>Control</code> or <code>null</code>
  * @param to the destination <code>Control</code> or <code>null</code>
- * @param point to be mapped 
- * @return point with mapped coordinates 
- * 
+ * @param point to be mapped
+ * @return point with mapped coordinates
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public Point map (Control from, Control to, Point point) {
 	checkDevice ();
-	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);	
+	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
 	return map (from, to, point.x, point.y);
 }
 
@@ -2780,7 +4108,7 @@
  * systems are mirrored, special care needs to be taken
  * when mapping coordinates from one control to another
  * to ensure the result is correctly mirrored.
- * 
+ *
  * Mapping a point that is the origin of a rectangle and
  * then adding the width and height is not equivalent to
  * mapping the rectangle.  When one control is mirrored
@@ -2790,21 +4118,21 @@
  * instead of just one point causes both the origin and
  * the corner of the rectangle to be mapped.
  * </p>
- * 
+ *
  * @param from the source <code>Control</code> or <code>null</code>
  * @param to the destination <code>Control</code> or <code>null</code>
  * @param x coordinates to be mapped
  * @param y coordinates to be mapped
  * @return point with mapped coordinates
- * 
+ *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public Point map (Control from, Control to, int x, int y) {
@@ -2841,7 +4169,7 @@
  * systems are mirrored, special care needs to be taken
  * when mapping coordinates from one control to another
  * to ensure the result is correctly mirrored.
- * 
+ *
  * Mapping a point that is the origin of a rectangle and
  * then adding the width and height is not equivalent to
  * mapping the rectangle.  When one control is mirrored
@@ -2851,21 +4179,21 @@
  * instead of just one point causes both the origin and
  * the corner of the rectangle to be mapped.
  * </p>
- * 
+ *
  * @param from the source <code>Control</code> or <code>null</code>
  * @param to the destination <code>Control</code> or <code>null</code>
  * @param rectangle to be mapped
  * @return rectangle with mapped coordinates
- * 
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public Rectangle map (Control from, Control to, Rectangle rectangle) {
@@ -2894,7 +4222,7 @@
 int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
 	Widget widget = getWidget (menu);
 	if (widget == null) return 0;
-	return widget.menuPositionProc (menu, x, y, push_in, user_data);	
+	return widget.menuPositionProc (menu, x, y, push_in, user_data);
 }
 
 /**
@@ -2906,7 +4234,7 @@
  * systems are mirrored, special care needs to be taken
  * when mapping coordinates from one control to another
  * to ensure the result is correctly mirrored.
- * 
+ *
  * Mapping a point that is the origin of a rectangle and
  * then adding the width and height is not equivalent to
  * mapping the rectangle.  When one control is mirrored
@@ -2916,7 +4244,7 @@
  * instead of just one point causes both the origin and
  * the corner of the rectangle to be mapped.
  * </p>
- * 
+ *
  * @param from the source <code>Control</code> or <code>null</code>
  * @param to the destination <code>Control</code> or <code>null</code>
  * @param x coordinates to be mapped
@@ -2924,15 +4252,15 @@
  * @param width coordinates to be mapped
  * @param height coordinates to be mapped
  * @return rectangle with mapped coordinates
- * 
+ *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li> 
+ *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1.2
  */
 public Rectangle map (Control from, Control to, int x, int y, int width, int height) {
@@ -2970,7 +4298,7 @@
 
 /**
  * Generate a low level system event.
- * 
+ *
  * <code>post</code> is used to generate low level keyboard
  * and mouse events. The intent is to enable automated UI
  * testing by simulating the input from the user.  Most
@@ -3013,11 +4341,11 @@
  * <li>(in) count the number of lines or pages to scroll
  * </ul>
  * </dl>
- * 
+ *
  * @param event the event to be generated
- * 
+ *
  * @return true if the event was generated or false otherwise
- * 
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the event is null</li>
  * </ul>
@@ -3026,7 +4354,7 @@
  * </ul>
  *
  * @since 3.0
- * 
+ *
  */
 public boolean post (Event event) {
 	/*
@@ -3038,68 +4366,68 @@
 	Lock lock = OS.lock;
 	lock.lock();
 	try {
-		synchronized (Device.class) {
-			if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-			if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
-			if (!OS.GDK_WINDOWING_X11()) return false;
+	synchronized (Device.class) {
+	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+	if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (!OS.GDK_WINDOWING_X11()) return false;
 			int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
-			int type = event.type;
-			switch (type) {
-				case SWT.KeyDown:
-				case SWT.KeyUp: {
-					int keyCode = 0;
-					int /*long*/ keysym = untranslateKey (event.keyCode);
-					if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
-					if (keyCode == 0) {
-						char key = event.character;
-						switch (key) {
-							case SWT.BS: keysym = OS.GDK_BackSpace; break;
-							case SWT.CR: keysym = OS.GDK_Return; break;
-							case SWT.DEL: keysym = OS.GDK_Delete; break;
-							case SWT.ESC: keysym = OS.GDK_Escape; break;
-							case SWT.TAB: keysym = OS.GDK_Tab; break;
-							case SWT.LF: keysym = OS.GDK_Linefeed; break;
-							default:
-								keysym = key;
-						}
-						keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
-						if (keyCode == 0) return false;
-					}
-					OS.XTestFakeKeyEvent (xDisplay, keyCode, type == SWT.KeyDown, 0);
-					return true;
+	int type = event.type;
+	switch (type) {
+		case SWT.KeyDown:
+		case SWT.KeyUp: {
+			int keyCode = 0;
+			int /*long*/ keysym = untranslateKey (event.keyCode);
+			if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
+			if (keyCode == 0) {
+				char key = event.character;
+				switch (key) {
+					case SWT.BS: keysym = OS.GDK_BackSpace; break;
+					case SWT.CR: keysym = OS.GDK_Return; break;
+					case SWT.DEL: keysym = OS.GDK_Delete; break;
+					case SWT.ESC: keysym = OS.GDK_Escape; break;
+					case SWT.TAB: keysym = OS.GDK_Tab; break;
+					case SWT.LF: keysym = OS.GDK_Linefeed; break;
+					default:
+							keysym = key;
 				}
-				case SWT.MouseDown:
-				case SWT.MouseMove: 
-				case SWT.MouseUp: {
-					if (type == SWT.MouseMove) {
-						OS.XTestFakeMotionEvent (xDisplay, -1, event.x, event.y, 0);
-					} else {
-						int button = event.button;
-						switch (button) {
-							case 1:
-							case 2:
-							case 3:	break;
-							case 4: button = 6;	break;
-							case 5: button = 7;	break;
-							default: return false;
-						}
-						OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseDown, 0);
-					}
-					return true;
+				keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
+				if (keyCode == 0) return false;
+			}
+			OS.XTestFakeKeyEvent (xDisplay, keyCode, type == SWT.KeyDown, 0);
+			return true;
+		}
+		case SWT.MouseDown:
+		case SWT.MouseMove:
+		case SWT.MouseUp: {
+			if (type == SWT.MouseMove) {
+				OS.XTestFakeMotionEvent (xDisplay, -1, event.x, event.y, 0);
+			} else {
+				int button = event.button;
+				switch (button) {
+					case 1:
+					case 2:
+					case 3:	break;
+					case 4: button = 6;	break;
+					case 5: button = 7;	break;
+					default: return false;
 				}
-				/*
-				* This code is intentionally commented. After posting a
-				* mouse wheel event the system may respond unpredictably
-				* to subsequent mouse actions.
-				*/
-//				case SWT.MouseWheel: {
-//					if (event.count == 0) return false;
-//					int button = event.count < 0 ? 5 : 4;
-//					OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseWheel, 0);			
-//				}
+				OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseDown, 0);
 			}
-			return false;
+			return true;
 		}
+		/*
+		* This code is intentionally commented. After posting a
+		* mouse wheel event the system may respond unpredictably
+		* to subsequent mouse actions.
+		*/
+//		case SWT.MouseWheel: {
+//			if (event.count == 0) return false;
+//			int button = event.count < 0 ? 5 : 4;
+//			OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseWheel, 0);
+//		}
+	}
+	return false;
+	}
 	} finally {
 		lock.unlock();
 	}
@@ -3128,7 +4456,12 @@
 }
 
 void putGdkEvents () {
-	if (gdkEventCount != 0) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "putGdkEvents()", "");
+    }
+    // </QFS>
+    if (gdkEventCount != 0) {
 		for (int i = 0; i < gdkEventCount; i++) {
 			int /*long*/ event = gdkEvents [i];
 			Widget widget = gdkEventWidgets [i];
@@ -3168,7 +4501,12 @@
  * @see #wake
  */
 public boolean readAndDispatch () {
-	checkDevice ();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "readAndDispatch()", "");
+    }
+    // </QFS>
+    checkDevice ();
 	runSkin ();
 	runDeferredLayouts ();
 	boolean events = false;
@@ -3182,25 +4520,40 @@
 	*/
 	OS.gdk_threads_leave();
 	events |= OS.g_main_context_iteration (0, false);
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.build("readAndDispatch()").add("events: ").add(events).log(Log.DBG);
+        }
+        // </QFS>
 	if (events) {
 		runDeferredEvents ();
 		return true;
 	}
-	return isDisposed () || runAsyncMessages (false);
+        // <QFS>
+        if (isDisposed ()) {
+            return true;
+        }
+        boolean ret = runAsyncMessages (false);
+        if (extraDeferred) {
+            extraDeferred = false;
+            runDeferredEvents();
+        }
+        return ret;
+        // </QFS>
 }
 
 static void register (Display display) {
 	synchronized (Device.class) {
-		for (int i=0; i<Displays.length; i++) {
-			if (Displays [i] == null) {
+	for (int i=0; i<Displays.length; i++) {
+		if (Displays [i] == null) {
 				Displays [i] = display;
-				return;
-			}
+			return;
 		}
-		Display [] newDisplays = new Display [Displays.length + 4];
-		System.arraycopy (Displays, 0, newDisplays, 0, Displays.length);
+	}
+	Display [] newDisplays = new Display [Displays.length + 4];
+	System.arraycopy (Displays, 0, newDisplays, 0, Displays.length);
 		newDisplays [Displays.length] = display;
-		Displays = newDisplays;
+	Displays = newDisplays;
 	}
 }
 
@@ -3208,7 +4561,7 @@
  * Releases any internal resources back to the operating
  * system and clears all fields except the device handle.
  * <p>
- * Disposes all shells which are currently open on the display. 
+ * Disposes all shells which are currently open on the display.
  * After this method has been invoked, all related related shells
  * will answer <code>true</code> when sent the message
  * <code>isDisposed()</code>.
@@ -3224,7 +4577,7 @@
  * The handle is needed by <code>destroy</code>.
  * </p>
  * This method is called before <code>destroy</code>.
- * 
+ *
  * @see Device#dispose
  * @see #destroy
  */
@@ -3256,7 +4609,7 @@
 	windowCallback4.dispose ();  windowCallback4 = null;
 	windowCallback5.dispose ();  windowCallback5 = null;
 	windowProc2 = windowProc3 = windowProc4 = windowProc5 = 0;
-	
+
 	/* Dispose xfilter callback */
 	if (filterProc != 0) {
 		OS.gdk_window_remove_filter(0, filterProc, 0);
@@ -3267,7 +4620,7 @@
 	/* Dispose checkIfEvent callback */
 	checkIfEventCallback.dispose(); checkIfEventCallback = null;
 	checkIfEventProc = 0;
-	
+
 	/* Dispose preedit window */
 	if (preeditWindow != 0) OS.gtk_widget_destroy (preeditWindow);
 	imControl = null;
@@ -3281,25 +4634,25 @@
 	sizeAllocateProc = 0;
 	sizeRequestCallback.dispose (); sizeRequestCallback = null;
 	sizeRequestProc = 0;
-	
+
 	/* Dispose the shell map callback */
 	shellMapCallback.dispose (); shellMapCallback = null;
 	shellMapProc = 0;
-	
+
 	/* Dispose the run async messages callback */
 	idleCallback.dispose (); idleCallback = null;
 	idleProc = 0;
 	if (idleHandle != 0) OS.g_source_remove (idleHandle);
 	idleHandle = 0;
-	
+
 	/* Dispose GtkTreeView callbacks */
 	cellDataCallback.dispose (); cellDataCallback = null;
 	cellDataProc = 0;
-	
+
 	/* Dispose the set direction callback */
 	setDirectionCallback.dispose (); setDirectionCallback = null;
 	setDirectionProc = 0;
-	
+
 	/* Dispose the emission proc callback */
 	emissionProcCallback.dispose (); emissionProcCallback = null;
 	emissionProc = 0;
@@ -3314,7 +4667,7 @@
 	caretProc = 0;
 	caretCallback.dispose ();
 	caretCallback = null;
-	
+
 	/* Release closures */
 	for (int i = 0; i < Widget.LAST_SIGNAL; i++) {
 		if (closures [i] != 0) OS.g_closure_unref (closures [i]);
@@ -3335,7 +4688,7 @@
 	windowTimerProc = 0;
 	windowTimerCallback.dispose ();
 	windowTimerCallback = null;
-	
+
 	/* Dispose mouse hover callback */
 	if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
 	mouseHoverId = 0;
@@ -3342,11 +4695,11 @@
 	mouseHoverHandle = mouseHoverProc = 0;
 	mouseHoverCallback.dispose ();
 	mouseHoverCallback = null;
-	
+
 	/* Dispose the default font */
 	if (systemFont != null) systemFont.dispose ();
 	systemFont = null;
-	
+
 	/* Dispose the System Images */
 	if (errorImage != null) errorImage.dispose();
 	if (infoImage != null) infoImage.dispose();
@@ -3353,7 +4706,7 @@
 	if (questionImage != null) questionImage.dispose();
 	if (warningImage != null) warningImage.dispose();
 	errorImage = infoImage = questionImage = warningImage = null;
-	
+
 	/* Release the System Cursors */
 	for (int i = 0; i < cursors.length; i++) {
 		if (cursors [i] != null) cursors [i].dispose ();
@@ -3380,22 +4733,22 @@
 	/* Dispose the event callback */
 	OS.gdk_event_handler_set (0, 0, 0);
 	eventCallback.dispose ();  eventCallback = null;
-	
+
 	/* Dispose the hidden shell */
 	if (shellHandle != 0) OS.gtk_widget_destroy (shellHandle);
 	shellHandle = 0;
-	
+
 	/* Dispose the settings callback */
 	signalCallback.dispose(); signalCallback = null;
 	signalProc = 0;
 
 	/* Dispose subclass */
-	int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
-	int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
-	OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
-	OS.g_type_class_unref (pangoLayoutClass);
-	pangoLayoutNewProc = 0;
-	
+		int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+		int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+		OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
+		OS.g_type_class_unref (pangoLayoutClass);
+		pangoLayoutNewProc = 0;
+
 	/* Release the sleep resources */
 	max_priority = timeout = null;
 	if (fds != 0) OS.g_free (fds);
@@ -3439,7 +4792,7 @@
  * @see SWT
  * @see #addFilter
  * @see #addListener
- * 
+ *
  * @since 3.0
  */
 public void removeFilter (int eventType, Listener listener) {
@@ -3491,8 +4844,8 @@
  * @see Listener
  * @see SWT
  * @see #addListener
- * 
- * @since 2.0 
+ *
+ * @since 2.0
  */
 public void removeListener (int eventType, Listener listener) {
 	checkDevice ();
@@ -3509,7 +4862,14 @@
 }
 
 void removePopup (Menu menu) {
-	if (popups == null) return;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("removePopup(Menu)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("menu: ").add(menu)).log(Log.MTD);
+    }
+    // </QFS>
+        if (popups == null) return;
 	for (int i=0; i<popups.length; i++) {
 		if (popups [i] == menu) {
 			popups [i] = null;
@@ -3530,7 +4890,7 @@
 		freeSlot = index;
 		OS.g_object_set_qdata (handle, SWT_OBJECT_INDEX, 0);
 	}
-	return widget;	
+	return widget;
 }
 
 boolean runAsyncMessages (boolean all) {
@@ -3538,14 +4898,19 @@
 }
 
 boolean runDeferredEvents () {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "runDeferredEvents()", "");
+    }
+    // </QFS>
 	boolean run = false;
-	/*
+       /*
 	* Run deferred events.  This code is always
 	* called in the Display's thread so it must
 	* be re-enterant but need not be synchronized.
 	*/
 	while (eventQueue != null) {
-		
+
 		/* Take an event off the queue */
 		Event event = eventQueue [0];
 		if (event == null) break;
@@ -3587,15 +4952,25 @@
 		}
 		update ();
 		return true;
-	}	
+	}
 	return false;
 }
 
 boolean runPopups () {
-	if (popups == null) return false;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "runPopups()", "");
+    }
+    // </QFS>
+        if (popups == null) return false;
 	boolean result = false;
 	while (popups != null) {
 		Menu menu = popups [0];
+                // <QFS>
+                if (logger.level >= Log.DBG) {
+                    logger.build("runPopups()").add("menu: ").add(menu).log(Log.DBG);
+                }
+                // </QFS>
 		if (menu == null) break;
 		int length = popups.length;
 		System.arraycopy (popups, 1, popups, 0, --length);
@@ -3628,8 +5003,8 @@
 
 boolean runSkin () {
 	if (skinCount > 0) {
-		Widget [] oldSkinWidgets = skinList;	
-		int count = skinCount;	
+		Widget [] oldSkinWidgets = skinList;
+		int count = skinCount;
 		skinList = new Widget[GROW_SIZE];
 		skinCount = 0;
 		if (eventTable != null && eventTable.hooks(SWT.Skin)) {
@@ -3645,7 +5020,7 @@
 			}
 		}
 		return true;
-	}	
+	}
 	return false;
 }
 
@@ -3653,22 +5028,22 @@
  * Returns the application name.
  *
  * @return the application name
- * 
+ *
  * @see #setAppName(String)
- * 
+ *
  * @since 3.6
  */
 public static String getAppName () {
 	return APP_NAME;
 }
-	
+
 /**
  * Returns the application version.
  *
  * @return the application version
- * 
+ *
  * @see #setAppVersion(String)
- * 
+ *
  * @since 3.6
  */
 public static String getAppVersion () {
@@ -3697,7 +5072,7 @@
  * Sets the application version to the argument.
  *
  * @param version the new app version
- * 
+ *
  * @since 3.6
  */
 public static void setAppVersion (String version) {
@@ -3711,12 +5086,12 @@
  *
  * @param x the new x coordinate for the cursor
  * @param y the new y coordinate for the cursor
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.1
  */
 public void setCursorLocation (int x, int y) {
@@ -3734,13 +5109,13 @@
  * program to move the on-screen pointer location.</b>
  *
  * @param point new position
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @since 2.0
  */
 public void setCursorLocation (Point point) {
@@ -3799,7 +5174,7 @@
 			removeWidget (handle);
 		}
 	}
-	if (key.equals (ADD_IDLE_PROC_KEY)) {	
+	if (key.equals (ADD_IDLE_PROC_KEY)) {
 		addIdleProc ();
 		return;
 	}
@@ -3829,7 +5204,7 @@
 		}
 		return;
 	}
-	
+
 	/* Add the key/value pair */
 	if (keys == null) {
 		keys = new String [] {key};
@@ -3856,7 +5231,7 @@
  * Sets the application defined, display specific data
  * associated with the receiver, to the argument.
  * The <em>display specific data</em> is a single,
- * unnamed field that is stored with every display. 
+ * unnamed field that is stored with every display.
  * <p>
  * Applications may put arbitrary objects in this field. If
  * the object stored in the display specific data needs to
@@ -3950,7 +5325,7 @@
 
 void showIMWindow (Control control) {
 	imControl = control;
-	if (preeditWindow == 0) { 
+	if (preeditWindow == 0) {
 		preeditWindow = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
 		if (preeditWindow == 0) error (SWT.ERROR_NO_HANDLES);
 		preeditLabel = OS.gtk_label_new (null);
@@ -3971,7 +5346,7 @@
 		if (pangoAttrs [0] != 0) OS.gtk_label_set_attributes (preeditLabel, pangoAttrs[0]);
 		OS.gtk_label_set_text (preeditLabel, preeditString [0]);
 		Point point = control.toDisplay (control.getIMCaretPos ());
-		OS.gtk_window_move (preeditWindow, point.x, point.y);		
+		OS.gtk_window_move (preeditWindow, point.x, point.y);
 		GtkRequisition requisition = new GtkRequisition ();
 		OS.gtk_widget_size_request (preeditLabel, requisition);
 		OS.gtk_window_resize (preeditWindow, requisition.width, requisition.height);
@@ -3978,9 +5353,9 @@
 		OS.gtk_widget_show (preeditWindow);
 	} else {
 		OS.gtk_widget_hide (preeditWindow);
-	}		
+	}
 	if (preeditString [0] != 0) OS.g_free (preeditString [0]);
-	if (pangoAttrs [0] != 0) OS.pango_attr_list_unref (pangoAttrs [0]);	
+	if (pangoAttrs [0] != 0) OS.pango_attr_list_unref (pangoAttrs [0]);
 }
 
 /**
@@ -3998,7 +5373,12 @@
  * @see #wake
  */
 public boolean sleep () {
-	checkDevice ();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "sleep()", "");
+    }
+    // </QFS>
+    checkDevice ();
 	if (gdkEventCount == 0) {
 		gdkEvents = null;
 		gdkEventWidgets = null;
@@ -4006,9 +5386,23 @@
 	if (settingsChanged) {
 		settingsChanged = false;
 		runSettings = true;
+                // <QFS>
+                if (logger.level >= Log.DBG) {
+                    logger.log(Log.DBG, "sleep()",
+                               "Settings changed, returning");
+                }
+                // </QFS>
 		return false;
 	}
-	if (getMessageCount () != 0) return true;
+	if (getMessageCount () != 0) {
+            // <QFS>
+            if (logger.level >= Log.DBG) {
+                logger.log(Log.DBG, "sleep()",
+                           "Message count != 0, returning");
+            }
+            // </QFS>
+            return true;
+        }
 	if (fds == 0) {
 		allocated_nfds = 2;
 		fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
@@ -4029,12 +5423,12 @@
 			if (poll != 0) {
 				if (nfds > 0 || timeout [0] != 0) {
 					/*
-					* Bug in GTK. For some reason, g_main_context_wakeup() may 
+					* Bug in GTK. For some reason, g_main_context_wakeup() may
 					* fail to wake up the UI thread from the polling function.
 					* The fix is to sleep for a maximum of 50 milliseconds.
 					*/
 					if (timeout [0] < 0) timeout [0] = 50;
-					
+
 					/* Exit the OS lock to allow other threads to enter GTK */
 					Lock lock = OS.lock;
 					int count = lock.lock ();
@@ -4053,6 +5447,12 @@
 		}
 	} while (!result && getMessageCount () == 0 && !wake);
 	wake = false;
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.log(Log.DBG, "sleep()",
+                       "Done");
+        }
+        // </QFS>
 	return true;
 }
 
@@ -4062,7 +5462,7 @@
  * number of milliseconds have elapsed. If milliseconds is less
  * than zero, the runnable is not executed.
  * <p>
- * Note that at the time the runnable is invoked, widgets 
+ * Note that at the time the runnable is invoked, widgets
  * that have the receiver as their display may have been
  * disposed. Therefore, it is necessary to check for this
  * case inside the runnable before accessing the widget.
@@ -4085,7 +5485,7 @@
 	checkDevice ();
 	if (runnable == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (timerList == null) timerList = new Runnable [4];
-	if (timerIds == null) timerIds = new int [4];	
+	if (timerIds == null) timerIds = new int [4];
 	int index = 0;
 	while (index < timerList.length) {
 		if (timerList [index] == runnable) break;
@@ -4219,7 +5619,7 @@
 int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) {
 	switch((int)/*64*/user_data) {
 		case STYLE_SET:
-			settingsChanged = true;
+	settingsChanged = true;
 			break;
 		case PROPERTY_NOTIFY:
 			GdkEventProperty gdkEvent = new GdkEventProperty ();
@@ -4236,7 +5636,7 @@
 					int /*long*/ [] data = new int /*long*/ [1];
 					OS.XGetWindowProperty (OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), xWindow, atom, 0, -1, true, OS.AnyPropertyType,
 							type, format, nitems, bytes_after, data);
-					
+
 					if (nitems [0] > 0) {
 						byte [] buffer = new byte [nitems [0]];
 						OS.memmove(buffer, data [0], buffer.length);
@@ -4243,7 +5643,7 @@
 						OS.XFree (data [0]);
 						char[] chars = Converter.mbcsToWcs(null, buffer);
 						String string = new String (chars);
-						
+
 						int lastIndex = 0;
 						int index = string.indexOf (':');
 						while (index != -1) {
@@ -4264,17 +5664,17 @@
 
 /**
  * Causes the <code>run()</code> method of the runnable to
- * be invoked by the user-interface thread at the next 
+ * be invoked by the user-interface thread at the next
  * reasonable opportunity. The thread which calls this method
  * is suspended until the runnable completes.  Specifying <code>null</code>
  * as the runnable simply wakes the user-interface thread.
  * <p>
- * Note that at the time the runnable is invoked, widgets 
+ * Note that at the time the runnable is invoked, widgets
  * that have the receiver as their display may have been
  * disposed. Therefore, it is necessary to check for this
  * case inside the runnable before accessing the widget.
  * </p>
- * 
+ *
  * @param runnable code to run on the user-interface thread or <code>null</code>
  *
  * @exception SWTException <ul>
@@ -4287,19 +5687,21 @@
 public void syncExec (Runnable runnable) {
 	Synchronizer synchronizer;
 	synchronized (Device.class) {
-		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-		synchronizer = this.synchronizer;
-		synchronized (idleLock) {
-			if (idleNeeded && idleHandle == 0) {
-				//NOTE: calling unlocked function in OS
-				idleHandle = OS._g_idle_add (idleProc, 0);
-			}
-		}
+                if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+                        synchronizer = this.synchronizer;
+                synchronized (idleLock) {
+                        if (idleNeeded && idleHandle == 0) {
+                                //NOTE: calling unlocked function in OS
+                                idleHandle = OS._g_idle_add (idleProc, 0);
+                        }
+                }
 	}
-	synchronizer.syncExec (runnable);
+        // <QFS/> Redirected to internalSyncExec.
+	synchronizer.internalSyncExec (runnable);
 }
 
-static int translateKey (int key) {
+// <QFS/> Made public.
+public static int translateKey (int key) {
 	for (int i=0; i<KeyTable.length; i++) {
 		if (KeyTable [i] [0] == key) return KeyTable [i] [1];
 	}
@@ -4306,7 +5708,8 @@
 	return 0;
 }
 
-static int untranslateKey (int key) {
+// <QFS/> Made public.
+public static int untranslateKey (int key) {
 	for (int i=0; i<KeyTable.length; i++) {
 		if (KeyTable [i] [1] == key) return KeyTable [i] [0];
 	}
@@ -4321,7 +5724,7 @@
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @see Control#update()
  */
 public void update () {
@@ -4331,27 +5734,32 @@
 }
 
 /**
- * If the receiver's user-interface thread was <code>sleep</code>ing, 
+ * If the receiver's user-interface thread was <code>sleep</code>ing,
  * causes it to be awakened and start running again. Note that this
  * method may be called from any thread.
- * 
+ *
  * @exception SWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * 
+ *
  * @see #sleep
  */
 public void wake () {
 	synchronized (Device.class) {
-		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-		if (thread == Thread.currentThread ()) return;
-		wakeThread ();
+    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+	if (thread == Thread.currentThread ()) return;
+	wakeThread ();
 	}
 }
 
 void wakeThread () {
-	OS.g_main_context_wakeup (0);
-	wake = true;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        logger.log(Log.MTD, "wakeThread()", "");
+    }
+    // </QFS>
+    OS.g_main_context_wakeup (0);
+    wake = true;
 }
 
 static char wcsToMbcs (char ch) {
@@ -4372,7 +5780,16 @@
 }
 
 int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
-	Widget widget = getWidget (handle);
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("windowProc(int,int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("handle: ").add(handle)
+         .add(", arg0: ").add(arg0)
+         .add(", user_data: ").add(user_data)).log(Log.MTD);
+    }
+    // </QFS>
+    Widget widget = getWidget (handle);
 	if (widget == null) return 0;
 	return widget.windowProc (handle, arg0, user_data);
 }
Index: org/eclipse/swt/widgets/Canvas.java
===================================================================
--- org/eclipse/swt/widgets/Canvas.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Canvas.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -375,7 +375,7 @@
 	if (caret != null) caret.setFont (font);
 	super.setFont (font);
 }
-
+	
 /**
  * Sets the receiver's IME.
  * 
Index: org/eclipse/swt/widgets/CoolItem.java
===================================================================
--- org/eclipse/swt/widgets/CoolItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/CoolItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -441,7 +441,7 @@
 			y += (height - preferredHeight) / 2;
 			height = preferredHeight;
 		}
-		control.setBounds (parent.fixRectangle(x + MINIMUM_WIDTH, y, controlWidth, height));
+		control.setBounds (parent.fixRectangle(x + MINIMUM_WIDTH,	y, controlWidth, height));
 	}
 	updateChevron();
 }
Index: org/eclipse/swt/widgets/TreeColumn.java
===================================================================
--- org/eclipse/swt/widgets/TreeColumn.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TreeColumn.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -645,7 +645,7 @@
  * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
Index: org/eclipse/swt/widgets/Spinner.java
===================================================================
--- org/eclipse/swt/widgets/Spinner.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Spinner.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -688,7 +688,7 @@
 	String oldText = new String (Converter.mbcsToWcs (null, buffer));
 	int [] pos = new int [1];
 	OS.memmove (pos, position, 4);
-	int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+		int /*long*/ ptr = OS.gtk_entry_get_text (handle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]);
 	String newText = verifyText (oldText, start, start);
Index: org/eclipse/swt/widgets/TreeItem.java
===================================================================
--- org/eclipse/swt/widgets/TreeItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TreeItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -469,10 +469,10 @@
 	OS.gtk_tree_path_free (path);
 	
 	if (index == 0 && (parent.style & SWT.CHECK) != 0) {
-		int [] x = new int [1], w = new int [1];
-		OS.gtk_tree_view_column_cell_get_position (column, parent.checkRenderer, x, w);
-		rect.x += x [0] + w [0];
-		rect.width -= x [0] + w [0];
+			int [] x = new int [1], w = new int [1];
+			OS.gtk_tree_view_column_cell_get_position (column, parent.checkRenderer, x, w);
+			rect.x += x [0] + w [0];
+			rect.width -= x [0] + w [0];
 	}
 	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
@@ -540,8 +540,8 @@
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 	
-	OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
-	rect.x += x [0];
+		OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
+		rect.x += x [0];
 	if (parent.columnCount > 0) {
 		if (rect.x + rect.width > right) {
 			rect.width = Math.max (0, right - rect.x);
@@ -774,10 +774,10 @@
 	}
 	OS.gtk_tree_path_free (path);
 	
-	int [] x = new int [1], w = new int[1];
-	OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
-	rect.x += x [0];
-	rect.width = w [0];
+		int [] x = new int [1], w = new int[1];
+		OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
+		rect.x += x [0];
+		rect.width = w [0];
 	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
@@ -995,8 +995,8 @@
 	OS.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
-	OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
-	rect.x += x [0];
+		OS.gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
+		rect.x += x [0];
 	if (parent.columnCount > 0) {
 		if (rect.x + rect.width > right) {
 			rect.width = Math.max (0, right - rect.x);
@@ -1115,14 +1115,14 @@
 	while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
 		OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
 		TreeItem item = value [0] != -1 ? parent.items [value [0]] : null;
-		if (item != null && !item.isDisposed ()) {
-			item.dispose ();
+			if (item != null && !item.isDisposed ()) {
+				item.dispose ();
 		} else {
 			OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.gtk_tree_store_remove (modelHandle, iter);
 			OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+			}
 		}
-	}
 	if (parent.fixAccessibility ()) {
 		parent.ignoreAccessibility = false;
 		OS.g_object_notify (parent.handle, OS.model);
@@ -1277,17 +1277,17 @@
 	checkWidget();
 	int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
 	if (expanded != OS.gtk_tree_view_row_expanded (parent.handle, path)) {
-		if (expanded) {
-			OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-			OS.gtk_tree_view_expand_row (parent.handle, path, false);
-			OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-		} else {
-			OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
-			OS.gtk_widget_realize (parent.handle);
-			OS.gtk_tree_view_collapse_row (parent.handle, path);
-			OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
-		}
+	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);
+		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
+	} else {
+		OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
+		OS.gtk_widget_realize (parent.handle);
+		OS.gtk_tree_view_collapse_row (parent.handle, path);
+		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
 	}
+	}
 	OS.gtk_tree_path_free (path);
 }
 
@@ -1596,23 +1596,23 @@
 	* more space is required.
 	*/
 	if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
-		if (image != null) {
-			int /*long*/parentHandle = parent.handle;
-			int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
-			int [] w = new int [1];
-			int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
-			OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
-			if (w[0] < image.getBounds().width) {
-				/*
-				 * There is no direct way to clear the cell renderer width so we
-				 * are relying on the fact that it is done as part of modifying
-				 * the style.
-				 */
-				int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
-				parent.modifyStyle (parentHandle, style);
-			}
-		} 
-	}
+			if (image != null) {
+				int /*long*/parentHandle = parent.handle;
+				int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+				int [] w = new int [1];
+				int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
+				OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
+				if (w[0] < image.getBounds().width) {
+					/*
+					 * There is no direct way to clear the cell renderer width so we
+					 * are relying on the fact that it is done as part of modifying
+					 * the style.
+					 */
+					int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+					parent.modifyStyle (parentHandle, style);
+				}
+			} 
+		}
 	cached = true;
 }
 
Index: org/eclipse/swt/widgets/Label.java
===================================================================
--- org/eclipse/swt/widgets/Label.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Label.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -143,8 +143,8 @@
 		OS.pango_layout_get_size (labelLayout, w, h);
 		OS.pango_layout_set_width (labelLayout, pangoWidth);
 		if (frameHandle != 0) {
-			int [] labelWidth = new int [1], labelHeight = new int [1];
-			OS.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
+	int [] labelWidth = new int [1], labelHeight = new int [1];
+		OS.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
 			OS.gtk_widget_set_size_request (labelHandle, 1, 1);
 			size = computeNativeSize (frameHandle, -1, -1, changed);
 			OS.gtk_widget_set_size_request (labelHandle, labelWidth [0], labelHeight [0]);
@@ -152,20 +152,20 @@
 			size.y = size.y - 1;
 		} else { 
 			size = new Point (0,0);
-		}
+	}	
 		size.x += wHint == SWT.DEFAULT ? OS.PANGO_PIXELS(w [0]) : wHint;
 		size.y += hHint == SWT.DEFAULT ? OS.PANGO_PIXELS(h [0]) : hHint;
 	} else {
-		if (frameHandle != 0) {
-			int [] reqWidth = new int [1], reqHeight = new int [1];
-			OS.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
-			OS.gtk_widget_set_size_request (handle, wHint, hHint);
-			size = computeNativeSize (frameHandle, -1, -1, changed);
-			OS.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
-		} else {
-			size = computeNativeSize (handle, wHint, hHint, changed);
-		}
+	if (frameHandle != 0) {
+		int [] reqWidth = new int [1], reqHeight = new int [1];
+		OS.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
+		OS.gtk_widget_set_size_request (handle, wHint, hHint);
+		size = computeNativeSize (frameHandle, -1, -1, changed);
+		OS.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
+	} else {
+		size = computeNativeSize (handle, wHint, hHint, changed);
 	}
+	}
 	/*
 	* Feature in GTK.  Instead of using the font height to determine
 	* the preferred height of the widget, GTK uses the text metrics.
Index: org/eclipse/swt/widgets/CoolBar.java
===================================================================
--- org/eclipse/swt/widgets/CoolBar.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/CoolBar.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -630,7 +630,7 @@
 	if (grabbed != null) {
 		_setCursor(hoverCursor);
 	} else {
-		_setCursor(null);	
+	_setCursor(null);
 	}
 }
 void onMouseDoubleClick(Event event) {
Index: org/eclipse/swt/widgets/Slider.java
===================================================================
--- org/eclipse/swt/widgets/Slider.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Slider.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -170,7 +170,7 @@
 	* (http://bugzilla.gnome.org/show_bug.cgi?id=475909) 
 	*/
 	if (OS.GTK_VERSION < OS.VERSION (2, 10, 0) || (style & SWT.VERTICAL) != 0) {
-		OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+	OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
 	}
 	OS.gtk_container_add (fixedHandle, handle);
 }
Index: org/eclipse/swt/widgets/Touch.java
===================================================================
--- org/eclipse/swt/widgets/Touch.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Touch.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -21,7 +21,7 @@
  * @since 3.7
  */
 public final class Touch {
-
+	
 	/**
 	 * The unique identity of the touch. Use this value to track changes to a touch
 	 * during the touch's life. Two touches may have the same identity even if they
@@ -28,12 +28,12 @@
 	 * come from different sources.
 	 */
 	public long id;
-
+	
 	/**
 	 * The object representing the input source that generated the touch.
 	 */
 	public TouchSource source;
-
+	
 	/**
 	 * The state of this touch at the time it was generated. If this field is 0
 	 * then the finger is still touching the device but has not moved
@@ -44,7 +44,7 @@
 	 * @see org.eclipse.swt.SWT#TOUCHSTATE_UP
 	 */
 	public int state;
-
+	
 	/**
 	 * A flag indicating that the touch is the first touch from a previous
 	 * state of no touch points. Once designated as such, the touch remains
Index: org/eclipse/swt/widgets/Widget.java
===================================================================
--- org/eclipse/swt/widgets/Widget.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/Widget.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -16,8 +17,13 @@
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.events.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
- * This class is the abstract superclass of all user interface objects.  
+ * This class is the abstract superclass of all user interface objects.
  * Widgets are created, disposed and issue notification to listeners
  * when events occur which affect them.
  * <dl>
@@ -45,7 +51,7 @@
  */
 public abstract class Widget {
 	/**
-	 * the handle to the OS resource 
+	 * the handle to the OS resource
 	 * (Warning: This field is platform dependent)
 	 * <p>
 	 * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
@@ -53,7 +59,7 @@
 	 * within the packages provided by SWT. It is not available on all
 	 * platforms and should never be accessed from application code.
 	 * </p>
-	 * 
+	 *
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	public int /*long*/ handle;
@@ -61,7 +67,7 @@
 	Display display;
 	EventTable eventTable;
 	Object data;
-	
+
 	/* Global state flags */
 	static final int DISPOSED = 1<<0;
 	static final int CANVAS = 1<<1;
@@ -80,13 +86,13 @@
 	static final int FONT = 1<<14;
 	static final int PARENT_BACKGROUND = 1<<15;
 	static final int THEME_BACKGROUND = 1<<16;
-	
+
 	/* A layout was requested on this widget */
 	static final int LAYOUT_NEEDED	= 1<<17;
-	
+
 	/* The preferred size of a child has changed */
 	static final int LAYOUT_CHANGED = 1<<18;
-	
+
 	/* A layout was requested in this widget hierachy */
 	static final int LAYOUT_CHILD = 1<<19;
 
@@ -95,7 +101,7 @@
 	static final int DISPOSE_SENT = 1<<21;
 	static final int FOREIGN_HANDLE = 1<<22;
 	static final int DRAG_DETECT = 1<<23;
-	
+
 	/* Notify of the opportunity to skin this widget */
 	static final int SKIN_NEEDED = 1<<24;
 
@@ -105,7 +111,7 @@
 	/* Default size for widgets */
 	static final int DEFAULT_WIDTH	= 64;
 	static final int DEFAULT_HEIGHT	= 64;
-	
+
 	/* GTK signals data */
 	static final int ACTIVATE = 1;
 	static final int BUTTON_PRESS_EVENT = 2;
@@ -191,10 +197,16 @@
 	static final int DIRECTION_CHANGED = 82;
 	static final int CREATE_MENU_PROXY = 83;
 	static final int LAST_SIGNAL = 84;
-	
+
 	static final String IS_ACTIVE = "org.eclipse.swt.internal.control.isactive"; //$NON-NLS-1$
 	static final String KEY_CHECK_SUBWINDOW = "org.eclipse.swt.internal.control.checksubwindow"; //$NON-NLS-1$
 
+    /**
+     * <QFS/> The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.Widget");
+
 /**
  * Prevents uninitialized instances from being created outside the package.
  */
@@ -206,7 +218,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -334,7 +346,7 @@
 	/* Versions of GTK prior to 2.8 do not render RTL text properly */
 	if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
 		style &= ~SWT.RIGHT_TO_LEFT;
-		style |= SWT.LEFT_TO_RIGHT;			
+		style |= SWT.LEFT_TO_RIGHT;
 	}
 }
 
@@ -360,14 +372,14 @@
 /**
  * Checks that this class can be subclassed.
  * <p>
- * The SWT class library is intended to be subclassed 
- * only at specific, controlled points (most notably, 
+ * The SWT class library is intended to be subclassed
+ * only at specific, controlled points (most notably,
  * <code>Composite</code> and <code>Canvas</code> when
  * implementing new widgets). This method enforces this
  * rule unless it is overridden.
  * </p><p>
  * <em>IMPORTANT:</em> By providing an implementation of this
- * method that allows a subclass of a class which does not 
+ * method that allows a subclass of a class which does not
  * normally allow subclassing to be created, the implementer
  * agrees to be fully responsible for the fact that any such
  * subclass will likely fail between SWT releases and will be
@@ -398,7 +410,7 @@
  * widget implementors to enforce the standard SWT invariants.
  * <p>
  * Currently, it is an error to invoke any method (other than
- * <code>isDisposed()</code>) on a widget that has had its 
+ * <code>isDisposed()</code>) on a widget that has had its
  * <code>dispose()</code> method called. It is also an error
  * to call widget methods from any thread that is different
  * from the thread that created the widget.
@@ -484,7 +496,7 @@
  * Returns the application defined widget data associated
  * with the receiver, or null if it has not been set. The
  * <em>widget data</em> is a single, unnamed field that is
- * stored with every widget. 
+ * stored with every widget.
  * <p>
  * Applications may put arbitrary objects in this field. If
  * the object stored in the widget data needs to be notified
@@ -568,8 +580,8 @@
 }
 
 /**
- * Returns an array of listeners who will be notified when an event 
- * of the given type occurs. The event type is one of the event constants 
+ * Returns an array of listeners who will be notified when an event
+ * of the given type occurs. The event type is one of the event constants
  * defined in class <code>SWT</code>.
  *
  * @param eventType the type of event to listen for
@@ -585,7 +597,7 @@
  * @see #addListener(int, Listener)
  * @see #removeListener(int, Listener)
  * @see #notifyListeners
- * 
+ *
  * @since 3.4
  */
 public Listener[] getListeners (int eventType) {
@@ -597,7 +609,7 @@
 String getName () {
 //	String string = getClass ().getName ();
 //	int index = string.lastIndexOf ('.');
-//	if (index == -1) return string;	
+//	if (index == -1) return string;
 	String string = getClass ().getName ();
 	int index = string.length ();
 	while ((--index > 0) && (string.charAt (index) != '.')) {}
@@ -743,12 +755,29 @@
 }
 
 int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
-	GdkEventKey gdkEvent = new GdkEventKey ();
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_key_press_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("this: ").add(this)
+         .add(", widget: ").add(widget)
+         .add(", event: ").add(event)).log(Log.MTD);
+    }
+    // </QFS>
+    GdkEventKey gdkEvent = new GdkEventKey ();
 	OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
 	return sendKeyEvent (SWT.KeyDown, gdkEvent) ? 0 : 1;
 }
 
 int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("gtk_key_release_event(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("widget: ").add(widget)
+         .add(", event: ").add(event)).log(Log.MTD);
+    }
+    // </QFS>
 	GdkEventKey gdkEvent = new GdkEventKey ();
 	OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
 	return sendKeyEvent (SWT.KeyUp, gdkEvent) ? 0 : 1;
@@ -828,7 +857,7 @@
 
 int /*long*/ gtk_selection_done (int /*long*/ menushell) {
 	return 0;
-} 
+}
 
 int /*long*/ gtk_show (int /*long*/ widget) {
 	return 0;
@@ -943,10 +972,10 @@
 			case '&':
 				if (i + 1 < length && text [i + 1] == '&') {
 					result [j++] = text [i++];
-				} else {
+					} else {
 					if (replace) result [j++] = '_';
 				}
-				i++;
+						i++;
 				break;
 			case '_':
 				if (replace) result [j++] = '_';
@@ -1045,7 +1074,7 @@
 
 boolean mnemonicMatch (int /*long*/ mnemonicHandle, char key) {
 	int keyval1 = OS.gdk_keyval_to_lower (OS.gdk_unicode_to_keyval (key));
-	int keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle)); 
+	int keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle));
 	return keyval1 == keyval2;
 }
 
@@ -1067,7 +1096,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
- * 
+ *
  * @see SWT
  * @see #addListener
  * @see #getListeners(int)
@@ -1184,7 +1213,7 @@
  *
  * @see Listener
  * @see #addListener
- * 
+ *
  * @noreference This method is not intended to be referenced by clients.
  */
 protected void removeListener (int eventType, SWTEventListener handler) {
@@ -1203,14 +1232,14 @@
 }
 
 /**
- * Marks the widget to be skinned. 
+ * Marks the widget to be skinned.
  * <p>
  * The skin event is sent to the receiver's display when appropriate (usually before the next event
  * is handled). Widgets are automatically marked for skinning upon creation as well as when its skin
- * id or class changes. The skin id and/or class can be changed by calling <code>Display.setData(String, Object)</code> 
- * with the keys SWT.SKIN_ID and/or SWT.SKIN_CLASS. Once the skin event is sent to a widget, it 
- * will not be sent again unless <code>reskin(int)</code> is called on the widget or on an ancestor 
- * while specifying the <code>SWT.ALL</code> flag.  
+ * id or class changes. The skin id and/or class can be changed by calling <code>Display.setData(String, Object)</code>
+ * with the keys SWT.SKIN_ID and/or SWT.SKIN_CLASS. Once the skin event is sent to a widget, it
+ * will not be sent again unless <code>reskin(int)</code> is called on the widget or on an ancestor
+ * while specifying the <code>SWT.ALL</code> flag.
  * </p>
  * <p>
  * The parameter <code>flags</code> may be either:
@@ -1222,8 +1251,8 @@
  * </dl>
  * </p>
  * @param flags the flags specifying how to reskin
- * 
- * @exception SWTException 
+ *
+ * @exception SWTException
  * <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1236,7 +1265,7 @@
 	if ((flags & SWT.ALL) != 0) reskinChildren (flags);
 }
 
-void reskinChildren (int flags) {	
+void reskinChildren (int flags) {
 }
 
 void reskinWidget() {
@@ -1281,7 +1310,8 @@
 	sendEvent (eventType, null, true);
 }
 
-void sendEvent (int eventType, Event event) {
+// <QFS/>: made public
+public void sendEvent (int eventType, Event event) {
 	sendEvent (eventType, event, true);
 }
 
@@ -1304,14 +1334,33 @@
 }
 
 boolean sendKeyEvent (int type, GdkEventKey keyEvent) {
-	int length = keyEvent.length;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("sendKeyEvent(int,GdkEventKey)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("type: ").add(type)
+         .add(", keyEvent: ").add(keyEvent)
+         .add(", keyval: ").add(keyEvent.keyval)
+         .add(", state: ").add(keyEvent.state)
+         .add(", scan: ").add(keyEvent.hardware_keycode)
+         ).log(Log.MTD);
+    }
+    // </QFS>
+    int length = keyEvent.length;
 	if (keyEvent.string == 0 || OS.g_utf16_strlen (keyEvent.string, length) <= 1) {
 		Event event = new Event ();
 		event.time = keyEvent.time;
-		if (!setKeyState (event, keyEvent)) return true;
+                // <QFS>
+                boolean ret = !setKeyState (event, keyEvent);
+                if (logger.level >= Log.DBG) {
+                    logger.build("sendKeyEvent(int,GdkEventKey)")
+                        .add("ret: ").add(ret).log(Log.DBG);
+                }
+		if (ret) return true;
+                // </QFS>
 		sendEvent (type, event);
 		// widget could be disposed at this point
-	
+
 		/*
 		* It is possible (but unlikely), that application
 		* code could have disposed the widget in the key
@@ -1327,7 +1376,7 @@
 	return sendIMKeyEvent (type, keyEvent, chars) != null;
 }
 
-char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
+char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char  [] chars) {
 	int index = 0, count = 0, state = 0;
 	int /*long*/ ptr = 0;
 	if (keyEvent == null) {
@@ -1360,7 +1409,7 @@
 		}
 		event.character = chars [index];
 		sendEvent (type, event);
-	
+
 		/*
 		* It is possible (but unlikely), that application
 		* code could have disposed the widget in the key
@@ -1399,9 +1448,9 @@
 		OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
 		switch (gdkEvent.type) {
 			case OS.GDK_KEY_PRESS:
-			case OS.GDK_KEY_RELEASE: 
+			case OS.GDK_KEY_RELEASE:
 			case OS.GDK_BUTTON_PRESS:
-			case OS.GDK_2BUTTON_PRESS: 
+			case OS.GDK_2BUTTON_PRESS:
 			case OS.GDK_BUTTON_RELEASE: {
 				int [] state = new int [1];
 				OS.gdk_event_get_state (ptr, state);
@@ -1418,7 +1467,7 @@
  * Sets the application defined widget data associated
  * with the receiver to be the argument. The <em>widget
  * data</em> is a single, unnamed field that is stored
- * with every widget. 
+ * with every widget.
  * <p>
  * Applications may put arbitrary objects in this field. If
  * the object stored in the widget data needs to be notified
@@ -1433,7 +1482,7 @@
  *    <li>ERROR_WIDGET_DISPOSED - when the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>
  * </ul>
- * 
+ *
  * @see #getData()
  */
 public void setData (Object data) {
@@ -1547,9 +1596,9 @@
 	flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
 	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_NORMAL, flags);
 	if (setStateActive) {
-		flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
-		flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
-		OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
+	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
+	flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
+	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
 	}
 	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT);
 	flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
@@ -1561,15 +1610,15 @@
 	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL);
 	flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
 	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_NORMAL, flags);
-	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT);	
+	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT);
 	flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
-	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags);	
+	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags);
 	if (setStateActive) {
-		flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
-		flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
-		OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
+	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
+	flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
+	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
 	}
-	modifyStyle (handle, style);	
+	modifyStyle (handle, style);
 }
 
 boolean setInputState (Event event, int state) {
@@ -1583,9 +1632,27 @@
 }
 
 boolean setKeyState (Event event, GdkEventKey keyEvent) {
-	if (keyEvent.string != 0 && OS.g_utf16_strlen (keyEvent.string, keyEvent.length) > 1) return false;
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("setKeyState(Event,GdkEventKey)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("event: ").add(event)
+         .add(", keyEvent: ").add(keyEvent)
+         .add(", keyval: ").add(keyEvent.keyval)
+         .add(", state: ").add(keyEvent.state)
+         .add(", scan: ").add(keyEvent.hardware_keycode)
+         ).log(Log.MTD);
+    }
+    // </QFS>
+    if (keyEvent.string != 0 && OS.g_utf16_strlen (keyEvent.string, keyEvent.length) > 1) return false;
 	boolean isNull = false;
 	event.keyCode = Display.translateKey (keyEvent.keyval);
+        // <QFS>
+        if (logger.level >= Log.DBG) {
+            logger.build("setKeyState(Event,GdkEventKey)")
+                .add("keyCode: ").add(event.keyCode).log(Log.DBG);
+        }
+        // </QFS>
 	switch (keyEvent.keyval) {
 		case OS.GDK_BackSpace:		event.character = SWT.BS; break;
 		case OS.GDK_Linefeed:		event.character = SWT.LF; break;
@@ -1600,8 +1667,26 @@
 			if (event.keyCode == 0) {
 				int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int [1];
 				if (OS.gdk_keymap_translate_keyboard_state (OS.gdk_keymap_get_default (), keyEvent.hardware_keycode, 0, keyEvent.group, keyval, effective_group, level, consumed_modifiers)) {
+                                        // <QFS>
+                                        if (logger.level >= Log.DBG) {
+                                            logger.build("setKeyState(Event,GdkEventKey)")
+                                                .add("keyval: ").addAll(keyval).log(Log.DBG);
+                                        }
+                                        // </QFS>
 					event.keyCode = OS.gdk_keyval_to_unicode (keyval [0]);
+                                        // <QFS>
+                                        if (logger.level >= Log.DBG) {
+                                            logger.build("setKeyState(Event,GdkEventKey)")
+                                                .add("keyCode: ").add(event.keyCode).log(Log.DBG);
+                                        }
+                                        // </QFS>
 				}
+                                // <QFS/> Special hack: keyval has already been set, but not the
+                                // hardware_keyval or the state flags
+                                else {
+					event.keyCode = OS.gdk_keyval_to_unicode(keyEvent.keyval);
+                                }
+                                // </QFS>
 			}
 			int key = keyEvent.keyval;
 			if ((keyEvent.state & OS.GDK_CONTROL_MASK) != 0 && (0 <= key && key <= 0x7F)) {
@@ -1717,7 +1802,15 @@
 }
 
 int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
-	switch ((int)/*64*/user_data) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("windowProc(int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("handle: ").add(handle)
+         .add(", user_data: ").add(user_data)).log(Log.MTD);
+    }
+    // </QFS>
+    switch ((int)/*64*/user_data) {
 		case ACTIVATE: return gtk_activate (handle);
 		case CHANGED: return gtk_changed (handle);
 		case CLICKED: return gtk_clicked (handle);
@@ -1744,7 +1837,17 @@
 }
 
 int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
-	switch ((int)/*64*/user_data) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("windowProc(int,int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("handle: ").add(handle)
+         .add(", arg0: ").add(arg0)
+         .add(", user_data: ").add(user_data)
+         .add(", class:" ).add(getClass().getName())).log(Log.MTD);
+    }
+    // </QFS>
+    switch ((int)/*64*/user_data) {
 		case EXPOSE_EVENT_INVERSE: {
 			GdkEventExpose gdkEvent = new GdkEventExpose ();
 			OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -1793,7 +1896,17 @@
 }
 
 int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
-	switch ((int)/*64*/user_data) {
+    // <QFS>
+    if (logger.level >= Log.MTD) {
+        Logger.Builder lb = logger.build("windowProc(int,int,int,int)");
+        (logger.level < Log.MTDDETAIL ? lb : lb
+         .add("handle: ").add(handle)
+         .add(", arg0: ").add(arg0)
+         .add(", arg1: ").add(arg1)
+         .add(", user_data: ").add(user_data)).log(Log.MTD);
+    }
+    // </QFS>
+    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);
 		case ICON_RELEASE: return gtk_icon_release (handle, arg0, arg1);
Index: org/eclipse/swt/widgets/DirectoryDialog.java
===================================================================
--- org/eclipse/swt/widgets/DirectoryDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/DirectoryDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -15,6 +16,11 @@
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 
+// <QFS>
+import de.qfs.lib.log.Log;
+import de.qfs.lib.log.Logger;
+// </QFS>
+
 /**
  * Instances of this class allow the user to navigate
  * the file system and select a directory.
@@ -27,7 +33,7 @@
  * <p>
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
- * 
+ *
  * @see <a href="http://www.eclipse.org/swt/snippets/#directorydialog">DirectoryDialog snippets</a>
  * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
@@ -36,6 +42,13 @@
 public class DirectoryDialog extends Dialog {
 	String message = "", filterPath = "";
 	static final String SEPARATOR = System.getProperty ("file.separator");
+    // <QFS>
+    /**
+     * The Logger used for logging.
+     */
+    private final static Logger logger =
+        new Logger ("org.eclipse.swt.widgets.DirectoryDialog");
+    // </QFS>
 
 /**
  * Constructs a new instance of this class given only its parent.
@@ -59,7 +72,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -86,7 +99,7 @@
  * the directories it shows.
  *
  * @return the filter path
- * 
+ *
  * @see #setFilterPath
  */
 public String getFilterPath () {
@@ -148,7 +161,7 @@
 		byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true);
 		/*
 		* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
-		* when setting a file name that is not a true canonical path. 
+		* when setting a file name that is not a true canonical path.
 		* The fix is to use the canonical path.
 		*/
 		int /*long*/ ptr = OS.realpath (buffer, null);
@@ -170,6 +183,9 @@
 		OS.gtk_file_chooser_set_extra_widget (handle, box);
 	}
 	String answer = null;
+        // <QFS>
+        _qfGetDisplay().runDialogShownHooks(this, handle);
+        // </QFS>
 	display.addIdleProc ();
 	Dialog oldModal = null;
 	if (OS.gtk_window_get_modal (handle)) {
@@ -181,13 +197,13 @@
 	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);
-	}	
+	}
 	int response = OS.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
 	* code outside of SWT (i.e AWT, etc). It ensures that the current
-	* thread leaves the GTK lock acquired by the function above. 
+	* thread leaves the GTK lock acquired by the function above.
 	*/
 	OS.gdk_threads_leave();
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -217,6 +233,16 @@
 			}
 		}
 	}
+        // <QFS>
+        Object ret = _qfGetDisplay().runDialogClosedHooks(this, answer);
+        if (logger.level >= Log.DBG) {
+            logger.build("openChooserDialog()").add("ret: ").add(ret).log(Log.DBG);
+        }
+        if ((ret instanceof String)
+            || ret == null) {
+            answer = (String) ret;
+        }
+        // </QFS>
 	display.removeIdleProc ();
 	OS.gtk_widget_destroy (handle);
 	return answer;
@@ -243,7 +269,7 @@
  * visible on the dialog while it is open.
  *
  * @param string the message
- * 
+ *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
Index: org/eclipse/swt/widgets/ProgressBar.java
===================================================================
--- org/eclipse/swt/widgets/ProgressBar.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ProgressBar.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -260,7 +260,7 @@
  * Note: This operation is a hint and is not supported on
  * platforms that do not have this concept.
  * </p>
- * 
+ *
  * @param state the new state
  *
  * @exception SWTException <ul>
Index: org/eclipse/swt/widgets/ToolTip.java
===================================================================
--- org/eclipse/swt/widgets/ToolTip.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ToolTip.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -338,14 +338,14 @@
 			x = area.x + area.width / 2;
 			y = area.y + area.height / 2;
 		} else {
-			OS.gtk_widget_realize (itemHandle);
-			int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
-			int [] px = new int [1], py = new int [1];
-			OS.gdk_window_get_origin (window, px, py);
-			x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
-			y = py [0] + OS.GTK_WIDGET_HEIGHT (itemHandle) / 2;
-		}
+		OS.gtk_widget_realize (itemHandle);
+		int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
+		int [] px = new int [1], py = new int [1];
+		OS.gdk_window_get_origin (window, px, py);
+		x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
+		y = py [0] + OS.GTK_WIDGET_HEIGHT (itemHandle) / 2;
 	}
+	}
 	if (x == -1 || y == -1) {
 		int [] px = new int [1], py = new int [1];
 		OS.gdk_window_get_pointer (0, px, py, null);
@@ -800,12 +800,12 @@
 			if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
 				OS.gtk_widget_set_tooltip_text(vboxHandle, buffer);
 			} else {
-				OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
-				int /*long*/ data = OS.gtk_tooltips_data_get (vboxHandle);
-				OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
-				OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
-			}
+			OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
+			int /*long*/ data = OS.gtk_tooltips_data_get (vboxHandle);
+			OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
+			OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
 		}		
+		}		
 		if (autohide) timerId = OS.g_timeout_add (DELAY, display.windowTimerProc, handle);
 	} else {
 		if ((style & SWT.BALLOON) != 0) {
Index: org/eclipse/swt/widgets/ToolItem.java
===================================================================
--- org/eclipse/swt/widgets/ToolItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ToolItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -214,14 +214,14 @@
 				 * So, we try to emulate it on the un-supported version.
 				 */
 				handle = OS.gtk_tool_button_new (0, null);
-				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-				arrowBoxHandle = OS.gtk_hbox_new (false, 0);
-				if (arrowBoxHandle == 0) error(SWT.ERROR_NO_HANDLES);
-				arrowHandle = OS.gtk_arrow_new (OS.GTK_ARROW_DOWN, OS.GTK_SHADOW_NONE);
-				if (arrowHandle == 0) error (SWT.ERROR_NO_HANDLES);
-				OS.gtk_widget_set_size_request (arrowHandle, 8, 6);
+			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+			arrowBoxHandle = OS.gtk_hbox_new (false, 0);
+			if (arrowBoxHandle == 0) error(SWT.ERROR_NO_HANDLES);
+			arrowHandle = OS.gtk_arrow_new (OS.GTK_ARROW_DOWN, OS.GTK_SHADOW_NONE);
+			if (arrowHandle == 0) error (SWT.ERROR_NO_HANDLES);
+			OS.gtk_widget_set_size_request (arrowHandle, 8, 6);
 				OS.gtk_container_add (arrowBoxHandle, labelHandle);	
-				OS.gtk_container_add (arrowBoxHandle, arrowHandle);
+			OS.gtk_container_add (arrowBoxHandle, arrowHandle);	
 				/*
 				 * As we are try to emulate GtkMenuToolButton and in order
 				 * to display both the label and image, it is required
@@ -249,7 +249,7 @@
 			break;
 	}
 	if (labelHandle != 0) {
-		OS.gtk_tool_button_set_label_widget(handle, labelHandle);
+			OS.gtk_tool_button_set_label_widget(handle, labelHandle);
 	}
 	if (imageHandle != 0) {
 		OS.gtk_tool_button_set_icon_widget(handle, imageHandle);
@@ -317,10 +317,10 @@
 	parent.forceResize ();
 	int /*long*/ topHandle = topHandle ();
 	int x, y, width, height;
-	x = OS.GTK_WIDGET_X (topHandle);
-	y = OS.GTK_WIDGET_Y (topHandle);
-	width = OS.GTK_WIDGET_WIDTH (topHandle);
-	height = OS.GTK_WIDGET_HEIGHT (topHandle);
+		x = OS.GTK_WIDGET_X (topHandle);
+		y = OS.GTK_WIDGET_Y (topHandle);
+		width = OS.GTK_WIDGET_WIDTH (topHandle);
+		height = OS.GTK_WIDGET_HEIGHT (topHandle);		
 	if ((parent.style & SWT.MIRRORED) != 0) x = parent.getClientWidth () - width - x;
 	if ((style & SWT.SEPARATOR) != 0 && control != null) height = Math.max (height, 23);
 	return new Rectangle (x, y, width, height);
@@ -517,13 +517,13 @@
 				case OS.GDK_BUTTON_RELEASE: {
 					boolean isArrow = false;
 					if (OS.GTK_VERSION < OS.VERSION (2, 6, 0)) {
-						double [] x_win = new double [1];
-						double [] y_win = new double [1];
-						OS.gdk_event_get_coords (eventPtr, x_win, y_win);
-						int x = OS.GTK_WIDGET_X (arrowHandle) - OS.GTK_WIDGET_X (handle);
-						int width = OS.GTK_WIDGET_WIDTH (arrowHandle);
-						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)) {
+					double [] x_win = new double [1];
+					double [] y_win = new double [1];
+					OS.gdk_event_get_coords (eventPtr, x_win, y_win);
+					int x = OS.GTK_WIDGET_X (arrowHandle) - OS.GTK_WIDGET_X (handle);
+					int width = OS.GTK_WIDGET_WIDTH (arrowHandle);
+					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)) {
 							isArrow = true;
 						}
 					} else if (widget == arrowHandle) {
@@ -1121,12 +1121,12 @@
 	byte [] buffer = Converter.wcsToMbcs (null, chars, true);
 	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	if ((style & SWT.DROP_DOWN) != 0 && OS.GTK_VERSION < OS.VERSION (2, 6, 0)) {
-		if (string.length () != 0) {
-			OS.gtk_widget_show (labelHandle);
-		} else {
-			OS.gtk_widget_hide (labelHandle);
-		}
+	if (string.length () != 0) {
+		OS.gtk_widget_show (labelHandle);
+	} else {
+		OS.gtk_widget_hide (labelHandle);
 	}
+	}
 	/*
 	* If Text/Image of a tool-item changes, then it is 
 	* required to reset the proxy menu. Otherwise, the 
@@ -1152,7 +1152,7 @@
  * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
@@ -1224,8 +1224,8 @@
 	if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
 	if (imageHandle != 0) OS.gtk_widget_show (imageHandle);
 	if ((style & SWT.DROP_DOWN) != 0 && OS.GTK_VERSION < OS.VERSION (2, 6, 0)) {
-		if (arrowBoxHandle != 0) OS.gtk_widget_show (arrowBoxHandle);
-		if (arrowHandle != 0) OS.gtk_widget_show (arrowHandle);
+	if (arrowBoxHandle != 0) OS.gtk_widget_show (arrowBoxHandle);
+	if (arrowHandle != 0) OS.gtk_widget_show (arrowHandle);
 	}
 	OS.gtk_toolbar_insert(parent.handle, handle, index);
 }
Index: org/eclipse/swt/widgets/ExpandItem.java
===================================================================
--- org/eclipse/swt/widgets/ExpandItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ExpandItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -121,22 +121,22 @@
 }
 
 void createHandle (int index) {
-	state |= HANDLE;
-	handle = OS.gtk_expander_new (null);
-	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	clientHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
-	if (clientHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (handle, clientHandle);	
-	boxHandle = OS.gtk_hbox_new (false, 4);
-	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	labelHandle = OS.gtk_label_new (null);
-	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	imageHandle = OS.gtk_image_new ();
-	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (boxHandle, imageHandle);
-	OS.gtk_container_add (boxHandle, labelHandle);
-	OS.gtk_expander_set_label_widget (handle, boxHandle);
-	OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+		state |= HANDLE;
+		handle = OS.gtk_expander_new (null);
+		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+		clientHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
+		if (clientHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		OS.gtk_container_add (handle, clientHandle);	
+		boxHandle = OS.gtk_hbox_new (false, 4);
+		if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		labelHandle = OS.gtk_label_new (null);
+		if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		imageHandle = OS.gtk_image_new ();
+		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
+		OS.gtk_container_add (boxHandle, imageHandle);
+		OS.gtk_container_add (boxHandle, labelHandle);
+		OS.gtk_expander_set_label_widget (handle, boxHandle);
+		OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
 }
 
 void createWidget (int index) {
@@ -147,10 +147,10 @@
 
 void deregister() {
 	super.deregister();
-	display.removeWidget (clientHandle);
-	display.removeWidget (boxHandle);
-	display.removeWidget (labelHandle);
-	display.removeWidget (imageHandle);
+		display.removeWidget (clientHandle);
+		display.removeWidget (boxHandle);
+		display.removeWidget (labelHandle);
+		display.removeWidget (imageHandle);
 }
 
 void destroyWidget () {
@@ -265,7 +265,7 @@
  */
 public int getHeaderHeight () {
 	checkWidget ();
-	return OS.GTK_WIDGET_HEIGHT (handle) - (expanded ? height : 0);
+		return OS.GTK_WIDGET_HEIGHT (handle) - (expanded ? height : 0);
 }
 
 /**
@@ -344,12 +344,12 @@
 
 void hookEvents () {
 	super.hookEvents ();
-	OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
-	OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE_INVERSE], true);
-	OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
-	OS.g_signal_connect_closure_by_id (handle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
-	OS.g_signal_connect_closure (clientHandle, OS.size_allocate, display.closures [SIZE_ALLOCATE], true);
-	OS.g_signal_connect_closure_by_id (handle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
+		OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
+		OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE_INVERSE], true);
+		OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
+		OS.g_signal_connect_closure_by_id (handle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
+		OS.g_signal_connect_closure (clientHandle, OS.size_allocate, display.closures [SIZE_ALLOCATE], true);
+		OS.g_signal_connect_closure_by_id (handle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
 }
 
 void redraw () {
@@ -357,10 +357,10 @@
 
 void register () {
 	super.register ();
-	display.addWidget (clientHandle, this);
-	display.addWidget (boxHandle, this);
-	display.addWidget (labelHandle, this);
-	display.addWidget (imageHandle, this);
+		display.addWidget (clientHandle, this);
+		display.addWidget (boxHandle, this);
+		display.addWidget (labelHandle, this);
+		display.addWidget (imageHandle, this);
 }
 
 void releaseHandle () {
@@ -372,7 +372,7 @@
 void releaseWidget () {
 	super.releaseWidget ();
 	if (imageList != null) imageList.dispose ();
-	if (parent.lastFocus == this) parent.lastFocus = null;
+		if (parent.lastFocus == this) parent.lastFocus = null;
 	imageList = null;
 	control = null;
 }
@@ -459,7 +459,7 @@
 	if (control != null) {
 		control.setVisible (expanded);
 	}
-	parent.layoutItems (0, true);
+		parent.layoutItems (0, true);
 }
 
 /**
@@ -475,8 +475,8 @@
 public void setExpanded (boolean expanded) {
 	checkWidget ();
 	this.expanded = expanded;
-	OS.gtk_expander_set_expanded (handle, expanded);
-	parent.layoutItems (0, true);
+		OS.gtk_expander_set_expanded (handle, expanded);
+		parent.layoutItems (0, true);
 }
 
 boolean setFocus () {
@@ -516,28 +516,28 @@
 public void setHeight (int height) {
 	checkWidget ();
 	if (height < 0) return;
-	this.height = height;
-	OS.gtk_widget_set_size_request (clientHandle, -1, height);
-	parent.layoutItems (0, false);
+		this.height = height;
+		OS.gtk_widget_set_size_request (clientHandle, -1, height);
+		parent.layoutItems (0, false);
 }
 
 public void setImage (Image image) {
 	super.setImage (image);
-	if (imageList != null) imageList.dispose ();
-	imageList = null;
-	if (image != null) {
-		if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
-		imageList = new ImageList ();
-		int imageIndex = imageList.add (image);
-		int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
-		OS.gtk_widget_show (imageHandle);
-	} else {
-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_show (labelHandle);
-		OS.gtk_widget_hide (imageHandle);
-	}
+		if (imageList != null) imageList.dispose ();
+		imageList = null;
+		if (image != null) {
+			if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+			imageList = new ImageList ();
+			int imageIndex = imageList.add (image);
+			int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+			OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+			if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
+			OS.gtk_widget_show (imageHandle);
+		} else {
+			OS.gtk_image_set_from_pixbuf (imageHandle, 0);
+			OS.gtk_widget_show (labelHandle);
+			OS.gtk_widget_hide (imageHandle);
+		}
 }
 
 void setOrientation (boolean create) {
@@ -551,17 +551,17 @@
 	
 public void setText (String string) {
 	super.setText (string);
-	byte [] buffer = Converter.wcsToMbcs (null, string, true);
-	OS.gtk_label_set_text (labelHandle, buffer);
+		byte [] buffer = Converter.wcsToMbcs (null, string, true);
+		OS.gtk_label_set_text (labelHandle, buffer);
 }
 
 void showWidget (int index) {
-	OS.gtk_widget_show (handle);
-	OS.gtk_widget_show (clientHandle);
-	OS.gtk_container_add (parent.handle, handle);
-	OS.gtk_box_set_child_packing (parent.handle, handle, false, false, 0, OS.GTK_PACK_START);
-	if (boxHandle != 0) OS.gtk_widget_show (boxHandle);
-	if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
+		OS.gtk_widget_show (handle);
+		OS.gtk_widget_show (clientHandle);
+		OS.gtk_container_add (parent.handle, handle);
+		OS.gtk_box_set_child_packing (parent.handle, handle, false, false, 0, OS.GTK_PACK_START);
+		if (boxHandle != 0) OS.gtk_widget_show (boxHandle);
+		if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
 }
 
 int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
Index: org/eclipse/swt/widgets/ColorDialog.java
===================================================================
--- org/eclipse/swt/widgets/ColorDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/ColorDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
@@ -28,7 +29,7 @@
  * <p>
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
- * 
+ *
  * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  * @noextend This class is not intended to be subclassed by clients.
@@ -62,7 +63,7 @@
  * <p>
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
@@ -105,7 +106,7 @@
  * if no custom colors were selected.
  *
  * @return the array of RGBs, which may be null
- * 
+ *
  * @since 3.8
  */
 public RGB[] getRGBs() {
@@ -152,6 +153,9 @@
 		OS.gtk_color_selection_set_current_color (dialog.colorsel, color);
 	}
 	OS.gtk_color_selection_set_has_palette (dialog.colorsel, true);
+        // <QFS>
+        display.runDialogShownHooks(this, handle);
+        // </QFS>
 	if (rgbs != null) {
 		int /*long*/ colors = OS.g_malloc(GdkColor.sizeof * rgbs.length);
 		for (int i=0; i<rgbs.length; i++) {
@@ -186,13 +190,13 @@
 	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);
-	}	
+	}
 	int response = OS.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
 	* code outside of SWT (i.e AWT, etc). It ensures that the current
-	* thread leaves the GTK lock acquired by the function above. 
+	* thread leaves the GTK lock acquired by the function above.
 	*/
 	OS.gdk_threads_leave();
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
@@ -201,7 +205,7 @@
 	if (OS.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	boolean success = response == OS.GTK_RESPONSE_OK; 
+	boolean success = response == OS.GTK_RESPONSE_OK;
 	if (success) {
 		OS.gtk_color_selection_get_current_color (dialog.colorsel, color);
 		int red = (color.red >> 8) & 0xFF;
@@ -209,6 +213,12 @@
 		int blue = (color.blue >> 8) & 0xFF;
 		rgb = new RGB (red, green, blue);
 	}
+        // <QFS>
+        rgb = (RGB) display.runDialogClosedHooks(this, success ? rgb : null);
+        if (rgb != null) {
+            success = true;
+        }
+        // </QFS>
 	int /*long*/ settings = OS.gtk_settings_get_default ();
 	if (settings != 0) {
 		int /*long*/ [] ptr = new int /*long*/ [1];
@@ -262,7 +272,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if an RGB in the rgbs array is null</li>
  * </ul>
- * 
+ *
  * @since 3.8
  */
 public void setRGBs(RGB[] rgbs) {
Index: org/eclipse/swt/widgets/TrayItem.java
===================================================================
--- org/eclipse/swt/widgets/TrayItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/widgets/TrayItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -158,39 +158,39 @@
 		imageHandle = OS.gtk_image_new ();
 		OS.gtk_status_icon_set_visible (handle,true);
 	} else {
-		handle = OS.gtk_plug_new (0);
-		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		imageHandle = OS.gtk_image_new ();
-		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (handle, imageHandle);
-		OS.gtk_widget_show (handle);
-		OS.gtk_widget_show (imageHandle);
-		int /*long*/ id = OS.gtk_plug_get_id (handle);
-		int monitor = 0;
-		int /*long*/ screen = OS.gdk_screen_get_default ();
-		if (screen != 0) {
-			monitor = OS.gdk_screen_get_number (screen);
-		}
-		byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
-		int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
-		int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
+	handle = OS.gtk_plug_new (0);
+	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+	imageHandle = OS.gtk_image_new ();
+	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	OS.gtk_container_add (handle, imageHandle);
+	OS.gtk_widget_show (handle);
+	OS.gtk_widget_show (imageHandle);
+	int /*long*/ id = OS.gtk_plug_get_id (handle);
+	int monitor = 0;
+	int /*long*/ screen = OS.gdk_screen_get_default ();
+	if (screen != 0) {
+		monitor = OS.gdk_screen_get_number (screen);
+	}
+	byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
+	int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
+	int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
 		int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
-		int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
-		byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
-		int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
-		int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
-		XClientMessageEvent event = new XClientMessageEvent ();
-		event.type = OS.ClientMessage;
-		event.window = trayWindow;
-		event.message_type = xMessageAtom;
-		event.format = 32;
-		event.data [0] = OS.GDK_CURRENT_TIME;
-		event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
-		event.data [2] = id;
-		int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
-		OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
-		OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
-		OS.g_free (clientEvent);
+	int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
+	byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
+	int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
+	int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
+	XClientMessageEvent event = new XClientMessageEvent ();
+	event.type = OS.ClientMessage;
+	event.window = trayWindow;
+	event.message_type = xMessageAtom;
+	event.format = 32;
+	event.data [0] = OS.GDK_CURRENT_TIME;
+	event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
+	event.data [2] = id;
+	int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
+	OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
+	OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
+	OS.g_free (clientEvent);
 	}
 }
 
@@ -365,11 +365,11 @@
 		OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
 		OS.g_signal_connect_closure (handle, OS.popup_menu, display.closures [STATUS_ICON_POPUP_MENU], false);
 	} else {
-		int eventMask = OS.GDK_BUTTON_PRESS_MASK;
-		OS.gtk_widget_add_events (handle, eventMask);
-		OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
-		OS.g_signal_connect_closure_by_id (imageHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
-	}
+	int eventMask = OS.GDK_BUTTON_PRESS_MASK;
+	OS.gtk_widget_add_events (handle, eventMask);
+	OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
+	OS.g_signal_connect_closure_by_id (imageHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ }
 }
 
 /**
@@ -524,8 +524,8 @@
 		} else {
 			Rectangle rect = image.getBounds ();
 			OS.gtk_widget_set_size_request (handle, rect.width, rect.height);
-			OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-			OS.gtk_widget_show (imageHandle);
+		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+		OS.gtk_widget_show (imageHandle);
 		}
 	} else {
 		OS.gtk_widget_set_size_request (handle, 1, 1);
@@ -533,10 +533,10 @@
 			OS.gtk_status_icon_set_from_pixbuf (handle, 0);
 			OS.gtk_status_icon_set_visible (handle, false);
 		} else {
-			OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-			OS.gtk_widget_hide (imageHandle);
-		}
+		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
+		OS.gtk_widget_hide (imageHandle);
 	}
+	}
 }
 
 /**
@@ -572,7 +572,7 @@
  * To display a single '&amp;' in the tool tip, the character '&amp;' can be 
  * escaped by doubling it in the string.
  * </p>
- * 
+ *
  * @param string the new tool tip text (or null)
  *
  * @exception SWTException <ul>
@@ -596,7 +596,7 @@
 	if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
 		OS.gtk_status_icon_set_tooltip (handle, buffer);
 	} else
-		OS.gtk_tooltips_set_tip (tooltipsHandle, handle, buffer, null);
+	OS.gtk_tooltips_set_tip (tooltipsHandle, handle, buffer, null);
 }
 
 /**
@@ -615,7 +615,7 @@
 	if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
 		if(OS.gtk_status_icon_get_visible (handle) == visible) return;	
 	} else {
-		if (OS.GTK_WIDGET_VISIBLE (handle) == visible) return;
+	if (OS.GTK_WIDGET_VISIBLE (handle) == visible) return;
 	}
 	if (visible) {
 		/*
@@ -628,13 +628,13 @@
 		if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
 			OS.gtk_status_icon_set_visible (handle, visible);
 		} else
-			OS.gtk_widget_show (handle);
+		OS.gtk_widget_show (handle);
 	} else {
 		if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
 			OS.gtk_status_icon_set_visible (handle, visible);
 		} else
-			OS.gtk_widget_hide (handle);
+		OS.gtk_widget_hide (handle);
 		sendEvent (SWT.Hide);
 	}
 }
-}
\ No newline at end of file
+}
Index: org/eclipse/swt/program/Program.java
===================================================================
--- org/eclipse/swt/program/Program.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/program/Program.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -105,10 +105,10 @@
 			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;
+				 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);
+				 buffer = Converter.wcsToMbcs(null, "libgio-2.0.so", true);
 			} else {
 				buffer =  Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
 			}
@@ -138,20 +138,20 @@
 						if (gnomeIconTheme.value != 0) OS.g_object_unref(gnomeIconTheme.value);
 					}
 				});
-				/* Check for libgnomevfs-2 version 2.4 */
+			/* Check for libgnomevfs-2 version 2.4 */
 				buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
-				int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
-				if (libgnomevfs != 0) {
-					buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true);
-					int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
-					if (gnome_vfs_url_show != 0) {
-						desktop = DESKTOP_GNOME_24;
-					}
-					OS.dlclose(libgnomevfs);
+			int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
+			if (libgnomevfs != 0) {
+				buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true);
+				int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
+				if (gnome_vfs_url_show != 0) {
+					desktop = DESKTOP_GNOME_24;
 				}
+				OS.dlclose(libgnomevfs);
 			}
 		}
 	}
+	}
 
 	/*
 	* On CDE, the atom below may exist without DTWM running. If the atom 
@@ -536,11 +536,11 @@
 		GnomeVFSMimeApplication application = new GnomeVFSMimeApplication();
 		GNOME.memmove(application, ptr, GnomeVFSMimeApplication.sizeof);
 		if (application.command != 0) {
-			int length = OS.strlen(application.command);
+		int length = OS.strlen(application.command);
 			if (length > 0) {
-				byte[] buffer = new byte[length];
-				OS.memmove(buffer, application.command, length);		
-				program.command = new String(Converter.mbcsToWcs(null, buffer));
+		byte[] buffer = new byte[length];
+		OS.memmove(buffer, application.command, length);		
+		program.command = new String(Converter.mbcsToWcs(null, buffer));
 			}
 		}
 		program.gnomeExpectUri = application.expects_uris == GNOME.GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS;
@@ -633,7 +633,7 @@
 	Program program = null;
 	switch (desktop) {
 		case DESKTOP_GIO: program = gio_getProgram(display, mimeType); break;
-		case DESKTOP_GNOME_24: 
+		case DESKTOP_GNOME_24:
 		case DESKTOP_GNOME: program = gnome_getProgram(display, mimeType); break;
 		case DESKTOP_CDE: program = cde_getProgram(display, mimeType); break;
 	}
@@ -733,42 +733,42 @@
 ImageData gio_getImageData() {
 	if (iconPath == null) return null;
 	ImageData data = null;
-	int /*long*/ icon_theme =OS.gtk_icon_theme_get_default();
-	byte[] icon = Converter.wcsToMbcs (null, iconPath, true);
-	int /*long*/ gicon = OS.g_icon_new_for_string(icon, null);
+		int /*long*/ icon_theme =OS.gtk_icon_theme_get_default();
+		byte[] icon = Converter.wcsToMbcs (null, iconPath, true);
+		int /*long*/ gicon = OS.g_icon_new_for_string(icon, null);
 	if (gicon != 0) {
 		int /*long*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0);
 		if (gicon_info != 0) {
-			int /*long*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null);		
-			if (pixbuf != 0) {
-				int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
-				int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
-				int height = OS.gdk_pixbuf_get_height(pixbuf);
-				int width = OS.gdk_pixbuf_get_width(pixbuf);
-				boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
-				byte[] srcData = new byte[stride * height];
-				OS.memmove(srcData, pixels, srcData.length);
-				OS.g_object_unref(pixbuf);
-				if (hasAlpha) {
-					PaletteData palette = new PaletteData(0xFF000000, 0xFF0000, 0xFF00);
-					data = new ImageData(width, height, 32, palette, 4, srcData);
-					data.bytesPerLine = stride;
-					int s = 3, a = 0;
-					byte[] alphaData = new byte[width*height];
-					for (int y=0; y<height; y++) {
-						for (int x=0; x<width; x++) {
-							alphaData[a++] = srcData[s];
-							srcData[s] = 0;
-							s+=4;
-						}
+		int /*long*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null);		
+		if (pixbuf != 0) {
+			int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
+			int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+			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);
+			byte[] srcData = new byte[stride * height];
+			OS.memmove(srcData, pixels, srcData.length);
+			OS.g_object_unref(pixbuf);
+			if (hasAlpha) {
+				PaletteData palette = new PaletteData(0xFF000000, 0xFF0000, 0xFF00);
+				data = new ImageData(width, height, 32, palette, 4, srcData);
+				data.bytesPerLine = stride;
+				int s = 3, a = 0;
+				byte[] alphaData = new byte[width*height];
+				for (int y=0; y<height; y++) {
+					for (int x=0; x<width; x++) {
+						alphaData[a++] = srcData[s];
+						srcData[s] = 0;
+						s+=4;
 					}
-					data.alphaData = alphaData;
-				} else {
-					PaletteData palette = new PaletteData(0xFF0000, 0xFF00, 0xFF);
-					data = new ImageData(width, height, 24, palette, 4, srcData);
-					data.bytesPerLine = stride;
 				}
+				data.alphaData = alphaData;
+			} else {
+				PaletteData palette = new PaletteData(0xFF0000, 0xFF00, 0xFF);
+				data = new ImageData(width, height, 24, palette, 4, srcData);
+				data.bytesPerLine = stride;
 			}
+		}
 			OS.gtk_icon_info_free(gicon_info);
 		}
 		OS.g_object_unref(gicon);
@@ -790,52 +790,52 @@
 	int /*long*/ fileInputStream = OS.g_file_read (mimeDatabase, 0, 0);
 	try {
 		if (fileInputStream != 0) {
-			int /*long*/ [] modTimestamp = new int /*long*/ [2];
-			buffer = Converter.wcsToMbcs (null, "*", true);
+	int /*long*/ [] modTimestamp = new int /*long*/ [2];
+	buffer = Converter.wcsToMbcs (null, "*", true);
 			fileInfo = OS.g_file_query_info(mimeDatabase, buffer, 0, 0, 0);
-			OS.g_file_info_get_modification_time(fileInfo, modTimestamp);
-			if (modTime != 0 && modTimestamp[0] == modTime) {
-				return mimeTable;
-			} else {
-				mimeTable = new Hashtable();
-				modTime = modTimestamp[0];
-				int /*long*/ reader = OS.g_data_input_stream_new (fileInputStream);
-				int[] length = new int[1];
-				
-				if (reader != 0) {
-					int /*long*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
-					while (linePtr != 0) {
-						byte[] lineBytes = new byte[length[0]];
-						OS.memmove(lineBytes, linePtr, length[0]);
-						String line = new String (Converter.mbcsToWcs (null, lineBytes));
-			
-						int separatorIndex = line.indexOf (':');
-						if (separatorIndex > 0) {
-							Vector mimeTypes = new Vector ();
-						    String mimeType = line.substring (0, separatorIndex);
-							String extensionFormat = line.substring (separatorIndex+1);
-							int extensionIndex = extensionFormat.indexOf (".");
-							if (extensionIndex > 0) {
-								String extension = extensionFormat.substring (extensionIndex);
-								mimeTypes.add (mimeType);
-								if (mimeTable.containsKey (extension)) {
-									/*
-									 * If mimeType already exists, it is required to update
-									 * the existing key (mime-type) with the new extension. 
-									 */
-									Vector value = (Vector) mimeTable.get (extension);
-									mimeTypes.addAll (value);
-								}
-								mimeTable.put (extension, mimeTypes);
-							}
+	OS.g_file_info_get_modification_time(fileInfo, modTimestamp);
+	if (modTime != 0 && modTimestamp[0] == modTime) {
+		return mimeTable;
+	} else {
+		mimeTable = new Hashtable();
+		modTime = modTimestamp[0];
+		int /*long*/ reader = OS.g_data_input_stream_new (fileInputStream);
+		int[] length = new int[1];
+		
+		if (reader != 0) {
+			int /*long*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
+			while (linePtr != 0) {
+				byte[] lineBytes = new byte[length[0]];
+				OS.memmove(lineBytes, linePtr, length[0]);
+				String line = new String (Converter.mbcsToWcs (null, lineBytes));
+	
+				int separatorIndex = line.indexOf (':');
+				if (separatorIndex > 0) {
+					Vector mimeTypes = new Vector ();
+				    String mimeType = line.substring (0, separatorIndex);
+					String extensionFormat = line.substring (separatorIndex+1);
+					int extensionIndex = extensionFormat.indexOf (".");
+					if (extensionIndex > 0) {
+						String extension = extensionFormat.substring (extensionIndex);
+						mimeTypes.add (mimeType);
+						if (mimeTable.containsKey (extension)) {
+							/*
+							 * If mimeType already exists, it is required to update
+							 * the existing key (mime-type) with the new extension. 
+							 */
+							Vector value = (Vector) mimeTable.get (extension);
+							mimeTypes.addAll (value);
 						}
-						OS.g_free(linePtr);
-						linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
+						mimeTable.put (extension, mimeTypes);
 					}
 				}
+						OS.g_free(linePtr);
+				linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
+			}
+		}
 				if (reader != 0) OS.g_object_unref (reader);
-				return mimeTable;
-			}
+		return mimeTable;
+	}
 		} 
 		return null;
 	} finally {
@@ -860,8 +860,8 @@
 	byte[] mimeTypeBuffer = Converter.wcsToMbcs (null, mimeType, true);
 	int /*long*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false);
 	if (application != 0) {
-		program = gio_getProgram(display, application);
-	}
+			program = gio_getProgram(display, application);
+		}
 	return program;
 }
 
@@ -875,17 +875,17 @@
 		length = OS.strlen (applicationName);
 		if (length > 0) {
 			buffer = new byte [length];
-			OS.memmove (buffer, applicationName, length);
-			program.name = new String (Converter.mbcsToWcs (null, buffer));
+	OS.memmove (buffer, applicationName, length);		
+	program.name = new String (Converter.mbcsToWcs (null, buffer));
 		}
 	}
 	int /*long*/ applicationCommand = OS.g_app_info_get_executable (application);
 	if (applicationCommand != 0) {
-		length = OS.strlen (applicationCommand);
+	length = OS.strlen (applicationCommand);
 		if (length > 0) {
-			buffer = new byte [length];
-			OS.memmove (buffer, applicationCommand, length);
-			program.command = new String (Converter.mbcsToWcs (null, buffer));
+	buffer = new byte [length];
+	OS.memmove (buffer, applicationCommand, length);		
+	program.command = new String (Converter.mbcsToWcs (null, buffer));
 		}
 	}
 	program.gnomeExpectUri = OS.g_app_info_supports_uris(application);
@@ -919,9 +919,9 @@
 				program = gio_getProgram(display, application);
 				if (program != null) programs.addElement(program);
 //			}
+			}
+		list = OS.g_list_next(list);
 		}
-		list = OS.g_list_next(list);
-	}
 	if (applicationList != 0) OS.g_list_free(applicationList);
 	Program[] programList = new Program[programs.size()];
 	for (int index = 0; index < programList.length; index++) {
@@ -964,12 +964,12 @@
 	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
 	int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
 	if (file != 0) {
-		int /*long*/ uri = OS.g_file_get_uri (file);
+	int /*long*/ uri = OS.g_file_get_uri (file);
 		if (uri != 0) {
 			result = OS.g_app_info_launch_default_for_uri (uri, 0, 0);
 			OS.g_free(uri);
 		}
-		OS.g_object_unref (file);
+	OS.g_object_unref (file);
 	}
 	return result;
 }
@@ -984,24 +984,24 @@
 	int /*long*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gnomeExpectUri
 				? OS.G_APP_INFO_CREATE_SUPPORTS_URIS : OS.G_APP_INFO_CREATE_NONE, 0);
 	if (application != 0) {
-		byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
+	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
 		int /*long*/ file = 0;
 		if (fileName.length() > 0) {
-			if (OS.g_app_info_supports_uris (application)) {
-				file = OS.g_file_new_for_uri (fileNameBuffer);
-			} else {
-				file = OS.g_file_new_for_path (fileNameBuffer);
-			}
+		if (OS.g_app_info_supports_uris (application)) {
+			file = OS.g_file_new_for_uri (fileNameBuffer);
+		} else {
+			file = OS.g_file_new_for_path (fileNameBuffer);
 		}
+		}
 		int /*long*/ list = 0;
 		if (file != 0) list = OS.g_list_append (0, file);
-		result = OS.g_app_info_launch (application, list, 0, 0);
+			result = OS.g_app_info_launch (application, list, 0, 0);
 		if (list != 0) {
 			OS.g_list_free (list);
-			OS.g_object_unref (file);
+	OS.g_object_unref (file);
 		}
-		OS.g_object_unref (application);
-	}
+	OS.g_object_unref (application);
+	}	
 	return result;
 }
 
Index: org/eclipse/swt/custom/StyledText.java
===================================================================
--- org/eclipse/swt/custom/StyledText.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/StyledText.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -155,7 +155,7 @@
 	int alignmentMargin;
 	int newOrientation = SWT.NONE;
 	int accCaretOffset;
-	
+
 	//block selection
 	boolean blockSelection;
 	int blockXAnchor = -1, blockYAnchor = -1;
@@ -262,7 +262,7 @@
 						printerRenderer.setLineSegments(i, 1, event.segments);
 						printerRenderer.setLineSegmentChars(i, 1, event.segmentsChars);
 					}
-				}
+				}			
 				event = styledText.getLineStyleData(lineOffset, line);
 				if (event != null) {
 					printerRenderer.setLineIndent(i, 1, event.indent);
@@ -469,9 +469,9 @@
 					}
 				}
 			} else {
-				StringBuffer buffer = new StringBuffer("0");
-				while ((count /= 10) > 0) buffer.append("0");
-				printLayout.setText(buffer.toString());
+			StringBuffer buffer = new StringBuffer("0");
+			while ((count /= 10) > 0) buffer.append("0");
+			printLayout.setText(buffer.toString());
 				numberingWidth = printLayout.getBounds().width;
 			}
 			numberingWidth += printMargin;
@@ -629,7 +629,7 @@
 					printLayout.setText("");
 				}
 			} else {
-				printLayout.setText(String.valueOf(index));
+			printLayout.setText(String.valueOf(index));
 			}
 			int paintX = x - printMargin - printLayout.getBounds().width;
 			printLayout.draw(gc, paintX, y);
@@ -999,11 +999,11 @@
 				fontStyle = fontData.getStyle();
 			}
 			if ((fontStyle & SWT.BOLD) != 0) {
-				write("\\b");
-			}
+					write("\\b"); 
+				}
 			if ((fontStyle & SWT.ITALIC) != 0) {
-				write("\\i");
-			}
+					write("\\i"); 
+				}
 			if (style.underline) {
 				write("\\ul");
 			}
@@ -1017,11 +1017,11 @@
 			copyEnd = Math.max(copyEnd, lineIndex);
 			write(line, lineIndex, copyEnd);
 			if ((fontStyle & SWT.BOLD) != 0) {
-				write("\\b0");
-			}
-			if ((style.fontStyle & SWT.ITALIC) != 0) {
-				write("\\i0");
-			}
+					write("\\b0"); 
+				}
+				if ((style.fontStyle & SWT.ITALIC) != 0) {
+					write("\\i0"); 
+				}
 			if (style.underline) {
 				write("\\ul0");
 			}
@@ -1618,9 +1618,9 @@
 		int width = renderer.getWidth();
 		renderer.calculateClientArea();
 		if (width != renderer.getWidth()) {
-			setScrollBars(false);
-		}
+		setScrollBars(false);
 	}
+	}
 }
 /**
  * Hides the scroll bars if widget is created in single line mode.
@@ -1662,7 +1662,7 @@
  */
 void claimRightFreeSpace() {
 	int newHorizontalOffset = Math.max(0, renderer.getWidth() - clientAreaWidth);
-	if (newHorizontalOffset < horizontalScrollOffset) {
+	if (newHorizontalOffset < horizontalScrollOffset) {			
 		// item is no longer drawn past the right border of the client area
 		// align the right end of the item with the right border of the 
 		// client area (window is scrolled right).
@@ -1792,20 +1792,20 @@
 				return true;
 			}
 		} else {
-			int length = selection.y - selection.x;
-			if (length > 0) {
+	int length = selection.y - selection.x;
+	if (length > 0) {
 				setClipboardContent(selection.x, length, type);
 				return true;
 			}
 		}
-	} catch (SWTError error) {
-		// Copy to clipboard failed. This happens when another application 
-		// is accessing the clipboard while we copy. Ignore the error.
-		// Rethrow all other errors. Fixes bug 17578.
-		if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
-			throw error;
+		} catch (SWTError error) {
+			// Copy to clipboard failed. This happens when another application 
+			// is accessing the clipboard while we copy. Ignore the error.
+			// Rethrow all other errors. Fixes bug 17578.
+			if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
+				throw error;
+			}
 		}
-	}
 	return false;
 }
 /**
@@ -1876,7 +1876,7 @@
 	}
 	return Math.min(height, availableHeight);
 }
-/** 
+/**
  * Returns the color of the margins.
  * 
  * @return the color of the margins.
@@ -1960,12 +1960,12 @@
 			return dragDetect(event);
 		}
 	} else {
-		if (selection.x == selection.y) return false;
-		int offset = getOffsetAtPoint(event.x, event.y, null, true);
-		if (selection.x <= offset && offset < selection.y) {
-			return dragDetect(event);
-		}
+	if (selection.x == selection.y) return false;
+	int offset = getOffsetAtPoint(event.x, event.y, null, true);
+	if (selection.x <= offset && offset < selection.y) {
+		return dragDetect(event);
 	}
+	}
 	return false;
 }
 /**
@@ -2105,8 +2105,8 @@
  */
 public void cut() {
 	checkWidget();
-	// Abort cut operation if copy to clipboard fails.
-	// Fixes bug 21030.
+			// Abort cut operation if copy to clipboard fails.
+			// Fixes bug 21030.
 	if (copySelection(DND.CLIPBOARD)) {
 		if (blockSelection && blockXLocation != -1) {
 			insertBlockSelectionText((char)0, SWT.NULL);
@@ -2163,7 +2163,7 @@
 							scrollVertical(pixels, true);
 						}
 					} else {
-						doSelectionPageUp(autoScrollDistance);
+					doSelectionPageUp(autoScrollDistance);
 					}
 					display.timerExec(V_SCROLL_RATE, this);
 				}
@@ -2185,7 +2185,7 @@
 							scrollVertical(pixels, true);
 						}
 					} else {
-						doSelectionPageDown(autoScrollDistance);
+					doSelectionPageDown(autoScrollDistance);
 					}
 					display.timerExec(V_SCROLL_RATE, this);
 				}
@@ -2206,9 +2206,9 @@
 							scrollHorizontal(pixels, true);
 						}
 					} else {
-						doVisualNext();
-						setMouseWordSelectionAnchor();
-						doMouseSelection();
+					doVisualNext();
+					setMouseWordSelectionAnchor();
+					doMouseSelection();
 					}
 					display.timerExec(H_SCROLL_RATE, this);
 				}
@@ -2228,9 +2228,9 @@
 							scrollHorizontal(pixels, true);
 						}
 					} else {
-						doVisualPrevious();
-						setMouseWordSelectionAnchor();
-						doMouseSelection();
+					doVisualPrevious();
+					setMouseWordSelectionAnchor();
+					doMouseSelection();
 					}
 					display.timerExec(H_SCROLL_RATE, this);
 				}
@@ -2270,7 +2270,7 @@
 			}
 			TextLayout layout = renderer.getTextLayout(lineIndex);
 			int start = layout.getPreviousOffset(caretOffset - lineOffset, isSurrogate ? SWT.MOVEMENT_CLUSTER : SWT.MOVEMENT_CHAR);
-			renderer.disposeTextLayout(layout);
+			renderer.disposeTextLayout(layout); 
 			event.start = start + lineOffset;
 			event.end = caretOffset;
 		}
@@ -2477,16 +2477,16 @@
 		doLineEnd();
 	} else {
 		int length = content.getCharCount();		
-		setCaretOffset(length, SWT.DEFAULT);
-		showCaret();
-	}
+			setCaretOffset(length, SWT.DEFAULT);
+			showCaret();
+		}
 }
 /**
  * Moves the caret in front of the first character of the widget content.
  */
 void doContentStart() {
-	setCaretOffset(0, SWT.DEFAULT);
-	showCaret();
+		setCaretOffset(0, SWT.DEFAULT);
+		showCaret();
 }
 /**
  * Moves the caret to the start of the selection if a selection exists.
@@ -2640,8 +2640,8 @@
 		int lineLength = content.getLine(caretLine).length();
 		lineEndOffset = lineOffset + lineLength;
 	}
-	setCaretOffset(lineEndOffset, PREVIOUS_OFFSET_TRAILING);
-	showCaret();
+		setCaretOffset(lineEndOffset, PREVIOUS_OFFSET_TRAILING);
+		showCaret();
 }
 /**
  * Moves the caret to the beginning of the line.
@@ -2657,8 +2657,8 @@
 		lineOffset += offsets[lineIndex];
 		renderer.disposeTextLayout(layout);
 	}
-	setCaretOffset(lineOffset, OFFSET_LEADING);
-	showCaret();
+		setCaretOffset(lineOffset, OFFSET_LEADING);
+		showCaret();
 }
 /**
  * Moves the caret one line up and to the same character offset relative 
@@ -2813,10 +2813,10 @@
 	boolean vchange = 0 <= y && y < clientAreaHeight || newCaretLine == 0 || newCaretLine == content.getLineCount() - 1;
 	boolean hchange = 0 <= x && x < clientAreaWidth || wordWrap || newCaretLine != content.getLineAtOffset(caretOffset); 
 	if (vchange && hchange && (newCaretOffset != caretOffset || newCaretAlignemnt != caretAlignment)) {
-		setCaretOffset(newCaretOffset, newCaretAlignemnt);
-		if (select) doMouseSelection();
-		showCaret();
-	}
+			setCaretOffset(newCaretOffset, newCaretAlignemnt);
+			if (select) doMouseSelection();
+			showCaret();
+		}
 	if (!select) {
 		setCaretOffset(newCaretOffset, newCaretAlignemnt);
 		clearSelection(true);
@@ -3486,7 +3486,7 @@
 	checkWidget();
 	return bidiColoring;
 }
-/**
+/** 
  * Returns whether the widget is in block selection mode.
  *
  * @return true if widget is in block selection mode, false otherwise
@@ -3692,7 +3692,7 @@
 }
 /**
  * Returns the content implementation that is used for text storage.
- * 
+ *
  * @return content the user defined content implementation that is used for
  * text storage or the default content implementation if no user defined 
  * content implementation has been set.
@@ -4411,23 +4411,23 @@
 			offsetInLine += trailing[0];
 			if (alignment != null) alignment[0] = PREVIOUS_OFFSET_TRAILING;
 		} else {
-			String line = content.getLine(lineIndex);
+			String line = content.getLine(lineIndex);			
 			int level = 0;
 			if (alignment != null) {
-				int offset = offsetInLine;
-				while (offset > 0 && Character.isDigit(line.charAt(offset))) offset--;
-				if (offset == 0 && Character.isDigit(line.charAt(offset))) {
-					level = isMirrored() ? 1 : 0;
-				} else {
-					level = layout.getLevel(offset) & 0x1;
-				}
+			int offset = offsetInLine;
+			while (offset > 0 && Character.isDigit(line.charAt(offset))) offset--;
+			if (offset == 0 && Character.isDigit(line.charAt(offset))) {
+				level = isMirrored() ? 1 : 0;
+			} else {
+				level = layout.getLevel(offset) & 0x1;
 			}
+			}
 			offsetInLine += trailing[0];
 			if (alignment != null) {
-				int trailingLevel = layout.getLevel(offsetInLine) & 0x1;
-				if ((level ^ trailingLevel) != 0) {
+			int trailingLevel = layout.getLevel(offsetInLine) & 0x1;
+			if ((level ^ trailingLevel) != 0) {
 					alignment[0] = PREVIOUS_OFFSET_TRAILING;
-				} else {
+			} else {
 					alignment[0] = OFFSET_LEADING;
 				}
 			}
@@ -4598,7 +4598,7 @@
 	}
 	return new int[0];
 }
-/** 
+/**
  * Returns the right margin.
  *
  * @return the right margin.
@@ -4777,13 +4777,13 @@
 	int lineLength = line.length();
 	int[] segments = event.segments;
 	if (segments[0] > lineLength) {
-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	}
+			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+		} 	
 	for (int i = 1; i < segments.length; i++) {
-		if (segments[i] <= segments[i - 1] || segments[i] > lineLength) {
-			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+			if (segments[i] <= segments[i - 1] || segments[i] > lineLength) {
+				SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+			} 	
 		}
-	}
 	return event;
 }
 /**
@@ -5127,7 +5127,7 @@
 		if (length > 0) {
 			if (i == lineStart) {
 				if (i == lineEnd) {
-					rect = layout.getBounds(start - lineOffset, end - lineOffset);
+				rect = layout.getBounds(start - lineOffset, end - lineOffset);
 				} else {
 					rect = layout.getBounds(start - lineOffset, length);
 				}
@@ -5204,7 +5204,7 @@
 	checkWidget();
 	return topIndex;
 }
-/** 
+/**
  * Returns the top margin.
  *
  * @return the top margin.
@@ -5371,7 +5371,7 @@
 	checkWidget();
 	return wordWrap;
 }
-/**
+/** 
  * Returns the wrap indentation of the widget.
  * 
  * @return the wrap indentation
@@ -5460,8 +5460,8 @@
 	if (blockSelection) {
 		insertBlockSelectionText(string, false); 
 	} else {
-		Point sel = getSelectionRange();
-		replaceTextRange(sel.x, sel.y, string);
+	Point sel = getSelectionRange();
+	replaceTextRange(sel.x, sel.y, string);
 	}
 }
 int insertBlockSelectionText(String text, boolean fillWithSpaces) {
@@ -5962,7 +5962,7 @@
 		newOrientation = SWT.NONE;
 	}
 }
-/**
+/** 
  * Update the event location for focus-based context menu triggers.
  *
  * @param event menu detect event
@@ -6025,10 +6025,10 @@
 				if (blockSelection) {
 					setBlockSelectionLocation(leftMargin, event.y, clientAreaWidth - rightMargin, event.y, true);
 				} else {
-					int lineEnd = content.getCharCount();
-					if (lineIndex + 1 < content.getLineCount()) {
-						lineEnd = content.getOffsetAtLine(lineIndex + 1);
-					}
+			int lineEnd = content.getCharCount();
+			if (lineIndex + 1 < content.getLineCount()) {
+				lineEnd = content.getOffsetAtLine(lineIndex + 1);
+			}
 					setSelection(lineOffset, lineEnd - lineOffset, false, false);
 					sendSelectionEvent();
 				}
@@ -6044,8 +6044,8 @@
  */
 void handleMouseMove(Event event) {
 	if (clickCount > 0) {
-		update();
-		doAutoScroll(event);
+	update();
+	doAutoScroll(event);
 		doMouseLocationChange(event.x, event.y, true);
 	} 
 	if (renderer.hasLinks) {
@@ -6201,7 +6201,7 @@
 	// in some cases new text would be drawn in scroll source area even 
 	// though the intent is to scroll it.
 	if (!(blockSelection && blockXLocation != -1)) {
-		updateSelection(lastTextChangeStart, lastTextChangeReplaceCharCount, lastTextChangeNewCharCount);
+	updateSelection(lastTextChangeStart, lastTextChangeReplaceCharCount, lastTextChangeNewCharCount);
 	}
 	if (lastTextChangeReplaceLineCount > 0 || wordWrap) {
 		claimBottomFreeSpace();
@@ -6328,12 +6328,12 @@
 		public void getKeyboardShortcut(AccessibleEvent e) {
 			String shortcut = null;
 			String text = getAssociatedLabel ();
-			if (text != null) {
-				char mnemonic = _findMnemonic (text);
-				if (mnemonic != '\0') {
-					shortcut = "Alt+"+mnemonic; //$NON-NLS-1$
+				if (text != null) {
+					char mnemonic = _findMnemonic (text);
+					if (mnemonic != '\0') {
+						shortcut = "Alt+"+mnemonic; //$NON-NLS-1$
+					}
 				}
-			}
 			e.result = shortcut;
 		}
 	});
@@ -7071,7 +7071,7 @@
 			if (blockXLocation != -1) {
 				insertBlockSelectionText((char)0, action);
 				return true;
-			}
+	}
 			return false;
 		case ST.DELETE_WORD_PREVIOUS:
 		case ST.DELETE_WORD_NEXT:
@@ -7378,7 +7378,7 @@
 	}
 }
 void redrawLines(int startLine, int lineCount, boolean bottomChanged) {
-	// do nothing if redraw range is completely invisible
+	// do nothing if redraw range is completely invisible	
 	int endLine = startLine + lineCount - 1;
 	int partialBottomIndex = getPartialBottomIndex();
 	int partialTopIndex = getPartialTopIndex();
@@ -7785,7 +7785,7 @@
 	topIndex = 0;
 	topIndexY = 0;
 	verticalScrollOffset = 0;
-	horizontalScrollOffset = 0;
+	horizontalScrollOffset = 0;	
 	resetSelection();
 	renderer.setContent(content);
 	if (verticalBar != null) {
@@ -8139,7 +8139,7 @@
 }
 /**
  * Sets the alignment of the widget. The argument should be one of <code>SWT.LEFT</code>, 
- * <code>SWT.CENTER</code> or <code>SWT.RIGHT</code>. The alignment applies for all lines.
+ * <code>SWT.CENTER</code> or <code>SWT.RIGHT</code>. The alignment applies for all lines.  
  * </p><p>
  * Note that if <code>SWT.MULTI</code> is set, then <code>SWT.WRAP</code> must also be set
  * in order to stabilize the right edge before setting alignment.
@@ -8370,7 +8370,7 @@
 	checkWidget();
 	bidiColoring = mode;
 }
-/** 
+/**
  * Sets the bottom margin.
  * 
  * @param bottomMargin the bottom margin.
@@ -8475,11 +8475,11 @@
 		if (blockSelection) {
 			clearBlockSelection(true, false);
 		} else {
-			clearSelection(false);
-		}
+		clearSelection(false);
 	}
+	}
 	setCaretLocation();
-}
+}	
 void setCaretOffset(int offset, int alignment) {
 	if (caretOffset != offset) {
 		caretOffset = offset;
@@ -8816,7 +8816,7 @@
 		}
 	}		
 }
-/** 
+/**
  * Sets the left margin.
  * 
  * @param leftMargin the left margin.
@@ -9100,7 +9100,7 @@
 	setCaretLocation();
 	super.redraw();
 }
-/**
+/** 
  * Sets the tab stops of the specified lines.
  * <p>
  * Should not be called if a <code>LineStyleListener</code> has been set since the listener 
@@ -9283,15 +9283,15 @@
 	super.setOrientation(orientation);
 	int newOrientation = getOrientation();
 	if (oldOrientation != newOrientation) {
-		caretDirection = SWT.NULL;
-		resetCache(0, content.getLineCount());
-		setCaretLocation();
-		keyActionMap.clear();
-		createKeyBindings();
-		super.redraw();
+	caretDirection = SWT.NULL;
+	resetCache(0, content.getLineCount());
+	setCaretLocation();
+	keyActionMap.clear();
+	createKeyBindings();
+	super.redraw();
 	}
 }
-/** 
+/**
  * Sets the right margin.
  * 
  * @param rightMargin the right margin.
@@ -9334,9 +9334,9 @@
 		if (verticalBar != null) verticalBar.setVisible(false);
 		if (horizontalBar != null) horizontalBar.setVisible(false);
 	}
-	if (verticalBar != null) {
+		if (verticalBar != null) {
 		setScrollBar(verticalBar, clientAreaHeight, renderer.getHeight(), topMargin + bottomMargin);
-	}
+			}
 	if (horizontalBar != null) {
 		setScrollBar(horizontalBar, clientAreaWidth, renderer.getWidth(), leftMargin + rightMargin);
 		if (!alwaysShowScroll && horizontalBar.getVisible() && verticalBar != null) {
@@ -9343,9 +9343,9 @@
 			setScrollBar(verticalBar, clientAreaHeight, renderer.getHeight(), topMargin + bottomMargin);
 			if (verticalBar.getVisible()) {
 				setScrollBar(horizontalBar, clientAreaWidth, renderer.getWidth(), leftMargin + rightMargin);
-			}
 		}
 	}
+		}
 	if (!alwaysShowScroll) {
 		redrawMargins(oldHeight, oldWidth);
 	}
@@ -9504,20 +9504,20 @@
 		if (blockSelection && doBlock) {
 			setBlockSelectionOffset(start, end, sendEvent);
 		} else {
-			clearSelection(sendEvent);
-			if (length < 0) {
-				selectionAnchor = selection.y = end;
+		clearSelection(sendEvent);
+		if (length < 0) {
+			selectionAnchor = selection.y = end;
 				selection.x = start;
 				setCaretOffset(start, PREVIOUS_OFFSET_TRAILING);
-			} else {
-				selectionAnchor = selection.x = start;
+		} else {
+			selectionAnchor = selection.x = start;
 				selection.y = end;
 				setCaretOffset(end, PREVIOUS_OFFSET_TRAILING);
-			}
-			internalRedrawRange(selection.x, selection.y - selection.x);
+		}
+		internalRedrawRange(selection.x, selection.y - selection.x);
 			sendAccessibleTextCaretMoved();
-		}
 	}
+	}
 }
 /** 
  * Sets the selection.
@@ -9756,7 +9756,7 @@
 			}
 			if (partialTopIndex <= lineEnd && lineEnd <= partialBottomIndex) {
 				bottom = getLinePixel(lineEnd + 1);
-			}
+				}
 			if (!isFixedLineHeight() && bottom != expectedBottom) {
 				bottom = clientAreaHeight;
 			}
@@ -9973,7 +9973,7 @@
 	} 
 	scrollVertical(pixel, true);
 }
-/** 
+/**
  * Sets the top margin.
  * 
  * @param topMargin the top margin.
@@ -10086,7 +10086,7 @@
 		scrolled = scrollVertical(rect.y - topMargin, true);
 	} else if (rect.y + rect.height > clientAreaHeight - bottomMargin) {
 		if (clientAreaHeight - topMargin - bottomMargin <= 0) {
-			scrolled = scrollVertical(rect.y - topMargin, true);
+		scrolled = scrollVertical(rect.y - topMargin, true);
 		} else {
 			scrolled = scrollVertical(rect.y + rect.height - (clientAreaHeight - bottomMargin), true);
 		}
Index: org/eclipse/swt/custom/TableCursor.java
===================================================================
--- org/eclipse/swt/custom/TableCursor.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/TableCursor.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -41,7 +41,7 @@
 	TableItem row = null;
 	TableColumn column = null;
 	Listener listener, tableListener, resizeListener, disposeItemListener, disposeColumnListener;
-
+	
 	Color background = null;
 	Color foreground = null;
 
Index: org/eclipse/swt/custom/CTabItem.java
===================================================================
--- org/eclipse/swt/custom/CTabItem.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/CTabItem.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -131,7 +131,7 @@
 	shortenedText = null;
 	font = null;
 }
-
+	
 /**
  * Returns a rectangle describing the receiver's size and location
  * relative to its parent.
@@ -299,10 +299,10 @@
 		    	selectedControl = parent.getItem(selectedIndex).getControl();
 		    }
 		    if (this.control != selectedControl) {
-		    	this.control.setVisible(false);
-		    }
+			this.control.setVisible(false);
 		}
 	}
+	}
 }
 /**
  * Sets the image that is displayed if the tab item is disabled.
Index: org/eclipse/swt/custom/BidiSegmentEvent.java
===================================================================
--- org/eclipse/swt/custom/BidiSegmentEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/BidiSegmentEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -57,7 +57,7 @@
  * 		"R4R5R6". 
  *		visual line = "R3R2R1" + "R6R5R4"
  * </pre>
- * 
+ *
  * <p>
  * The segments and segmentsChars fields can be used together to obtain different
  * types of bidi reordering and text display. The application can use these two fields
Index: org/eclipse/swt/custom/StyledTextRenderer.java
===================================================================
--- org/eclipse/swt/custom/StyledTextRenderer.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/StyledTextRenderer.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -377,11 +377,11 @@
 	if (event != null && event.lineBackground != null) lineBackground = event.lineBackground;
 	int height = layout.getBounds().height;
 	if (lineBackground != null) {
-		gc.setBackground(lineBackground);
+	gc.setBackground(lineBackground);
 		gc.fillRectangle(client.x, paintY, client.width, height);
 	} else {
 		gc.setBackground(widgetBackground);
-		styledText.drawBackground(gc, client.x, paintY, client.width, height);
+	styledText.drawBackground(gc, client.x, paintY, client.width, height);
 	}
 	gc.setForeground(widgetForeground);
 	if (selectionStart == selectionEnd || (selectionEnd <= 0 && selectionStart > lineLength - 1)) {
@@ -651,7 +651,7 @@
 			StyleRange style = styles[i];
 			newRanges[j] = style.start;
 			newRanges[j + 1] = style.length;
-		}
+		}		
 	}
 	if (start > newRanges[0]) {
 		newRanges[1] = newRanges[0] + newRanges[1] - start;
@@ -693,18 +693,18 @@
 		System.arraycopy(styles, rangeStart, newStyles, 0, newStyles.length);
 	}
 	if (includeRanges || ranges == null) {
-		StyleRange style = newStyles[0];
-		if (start > style.start) {
+	StyleRange style = newStyles[0];
+	if (start > style.start) {
 			newStyles[0] = style = (StyleRange)style.clone();
-			style.length = style.start + style.length - start;
-			style.start = start;
-		}
-		style = newStyles[newStyles.length - 1];
-		if (end < style.start + style.length - 1) {
+		style.length = style.start + style.length - start;
+		style.start = start;
+	}
+	style = newStyles[newStyles.length - 1];
+	if (end < style.start + style.length - 1) {
 			newStyles[newStyles.length - 1] = style = (StyleRange)style.clone();
-			style.length = end - style.start + 1;
-		}
+		style.length = end - style.start + 1;
 	}
+	}
 	return newStyles;
 }
 StyleRange getStyleRange(StyleRange style) {
Index: org/eclipse/swt/custom/CCombo.java
===================================================================
--- org/eclipse/swt/custom/CCombo.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/CCombo.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -59,7 +59,7 @@
 	Shell _shell;
 	
 	static final String PACKAGE_PREFIX = "org.eclipse.swt.custom."; //$NON-NLS-1$
-
+	
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -127,8 +127,8 @@
 				getDisplay().asyncExec(new Runnable() {
 					public void run() {
 						if (isDisposed ()) return;
-						handleFocus (SWT.FocusOut);
-					}
+				handleFocus (SWT.FocusOut);
+			}
 				});
 			}
 		}
@@ -522,7 +522,7 @@
 			index == list.getSelectionIndex() && 
 			text.getText().equals(list.getItem(index))) {
 		text.setText("");  //$NON-NLS-1$
-		list.deselect (index);
+	list.deselect (index);
 	}
 }
 /**
@@ -968,12 +968,12 @@
 		public void getKeyboardShortcut(AccessibleEvent e) {
 			String shortcut = null;
 			String text = getAssociatedLabel ();
-			if (text != null) {
-				char mnemonic = _findMnemonic (text);
-				if (mnemonic != '\0') {
-					shortcut = "Alt+"+mnemonic; //$NON-NLS-1$
+				if (text != null) {
+					char mnemonic = _findMnemonic (text);
+					if (mnemonic != '\0') {
+						shortcut = "Alt+"+mnemonic; //$NON-NLS-1$
+					}
 				}
-			}
 			e.result = shortcut;
 		}
 		public void getHelp (AccessibleEvent e) {
@@ -1855,7 +1855,7 @@
 					event.doit = traverse(SWT.TRAVERSE_TAB_PREVIOUS);
 					event.detail = SWT.TRAVERSE_NONE;
 					return;
-			}		
+			}
 			Event e = new Event ();
 			e.time = event.time;
 			e.detail = event.detail;
Index: org/eclipse/swt/custom/CTabFolder.java
===================================================================
--- org/eclipse/swt/custom/CTabFolder.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/CTabFolder.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -128,7 +128,7 @@
 	/* External Listener management */
 	CTabFolder2Listener[] folderListeners = new CTabFolder2Listener[0];
 	// support for deprecated listener mechanism
-	CTabFolderListener[] tabListeners = new CTabFolderListener[0];
+	CTabFolderListener[] tabListeners = new CTabFolderListener[0]; 
 	
 	/* Selected item appearance */
 	Image selectionBgImage;
@@ -139,7 +139,7 @@
 	Color selectionBackground;
 	
 	/* Unselected item appearance */
-	Color[] gradientColors; 
+	Color[] gradientColors;
 	int[] gradientPercents;
 	boolean gradientVertical;
 	boolean showUnselectedImage = true;
@@ -179,7 +179,7 @@
 	// internal constants
 	static final int DEFAULT_WIDTH = 64;
 	static final int DEFAULT_HEIGHT = 64;
-	
+
 	static final int SELECTION_FOREGROUND = SWT.COLOR_LIST_FOREGROUND;
 	static final int SELECTION_BACKGROUND = SWT.COLOR_LIST_BACKGROUND;
 	
@@ -508,7 +508,7 @@
 	updateItems();
 	redrawTabs();
 }
-
+	
 /**
  * Returns <code>true</code> if the receiver's border is visible.
  *
@@ -756,7 +756,7 @@
 }
 /**
  * Returns the receiver's renderer.
- * 
+ *
  * @return the receiver's renderer
  *
  * @exception SWTException <ul>
@@ -1083,15 +1083,15 @@
 				pt = getParent().toDisplay(location.x, location.y);
 			} else {
 				if (childID >= 0 && childID < items.length && items[childID].isShowing()) {
-					location = items[childID].getBounds();
-				} else if (showChevron && childID == items.length + CHEVRON_CHILD_ID) {
-					location = chevronRect;
-				} else if (showMin && childID == items.length + MINIMIZE_CHILD_ID) {
-					location = minRect;
-				} else if (showMax && childID == items.length + MAXIMIZE_CHILD_ID) {
-					location = maxRect;
-				}
-				if (location != null) {
+				location = items[childID].getBounds();
+			} else if (showChevron && childID == items.length + CHEVRON_CHILD_ID) {
+				location = chevronRect;
+			} else if (showMin && childID == items.length + MINIMIZE_CHILD_ID) {
+				location = minRect;
+			} else if (showMax && childID == items.length + MAXIMIZE_CHILD_ID) {
+				location = maxRect;
+			}
+			if (location != null) {
 					pt = toDisplay(location.x, location.y);
 				}
 			}
@@ -1430,7 +1430,7 @@
 				int index = indexOf(item);
 				if (item.showing){
 				    	int oldSelectedIndex = selectedIndex;
-				    	setSelection(index, true);
+					setSelection(index, true);
 				    	if (oldSelectedIndex == selectedIndex) {
 				    	    /* If the click is on the selected tabitem, then set focus to the tabfolder */
 				    	    forceFocus();
@@ -1496,7 +1496,7 @@
 						item.state |= SWT.HOT;
 						redraw(item.x, item.y, item.width, item.height, false);
 					}
-				}
+				} 
 				if (i != selectedIndex && item.closeImageState != SWT.BACKGROUND && !close) {
 					item.closeImageState = SWT.BACKGROUND;
 					redraw(item.closeRect.x, item.closeRect.y, item.closeRect.width, item.closeRect.height, false);
@@ -1730,12 +1730,12 @@
 	
 	gc.setFont(gcFont);
 	gc.setForeground(gcForeground);
-	gc.setBackground(gcBackground);	
+	gc.setBackground(gcBackground);
 	
 	renderer.draw(CTabFolderRenderer.PART_MAX_BUTTON, maxImageState, maxRect, gc);
 	renderer.draw(CTabFolderRenderer.PART_MIN_BUTTON, minImageState, minRect, gc);
 	renderer.draw(CTabFolderRenderer.PART_CHEVRON_BUTTON, chevronImageState, chevronRect, gc);
-
+	
 	gc.setFont(gcFont);
 	gc.setForeground(gcForeground);
 	gc.setBackground(gcBackground);	
@@ -2005,25 +2005,25 @@
 	}
 	
 	// Are these settings the same as before?
-	if ((gradientColors != null) && (colors != null) && 
-		(gradientColors.length == colors.length)) {
-		boolean same = false;
-		for (int i = 0; i < gradientColors.length; i++) {
-		    if (gradientColors[i] == null) {
-			same = colors[i] == null;
-		    } else {
-			same = gradientColors[i].equals(colors[i]);
-		    }
-		    if (!same) break;
+		if ((gradientColors != null) && (colors != null) && 
+			(gradientColors.length == colors.length)) {
+			boolean same = false;
+			for (int i = 0; i < gradientColors.length; i++) {
+				if (gradientColors[i] == null) {
+					same = colors[i] == null;
+				} else {
+					same = gradientColors[i].equals(colors[i]);
+				}
+				if (!same) break;
+			}
+			if (same) {
+				for (int i = 0; i < gradientPercents.length; i++) {
+					same = gradientPercents[i] == percents[i];
+					if (!same) break;
+				}
+			}
+			if (same && this.gradientVertical == vertical) return;
 		}
-		if (same) {
-		    for (int i = 0; i < gradientPercents.length; i++) {
-			same = gradientPercents[i] == percents[i];
-			if (!same) break;
-		    }
-		}
-		if (same && this.gradientVertical == vertical) return;
-	}
 	// Store the new settings
 	if (colors == null) {
 		gradientColors = null;
@@ -2103,7 +2103,7 @@
 		int top = onBottom ? size.y - borderBottom - tabHeight: borderTop + 1;
 		redraw(left, top, right - left, tabHeight, false); 
 	}
-
+	
 	// min button
 	oldX = minRect.x;
 	oldY = minRect.y;
@@ -2394,7 +2394,7 @@
 		tabAreaWidth -= rightSize.x + 3;
 	}
 	tabAreaWidth = Math.max(0, tabAreaWidth);
-
+	
 	// First, try the minimum tab size at full compression.
 	int minWidth = 0;
 	int[] minWidths = new int[items.length];	
@@ -3358,9 +3358,9 @@
 }
 boolean updateTabHeight(boolean force){
 	int oldHeight = tabHeight;
-	GC gc = new GC(this);
+		GC gc = new GC(this);
 	tabHeight = renderer.computeSize(CTabFolderRenderer.PART_HEADER, SWT.NONE, gc, SWT.DEFAULT, SWT.DEFAULT).y;
-	gc.dispose();
+		gc.dispose();
 	if (!force && tabHeight == oldHeight) return false;
 	oldSize = null;
 	notifyListeners(SWT.Resize, new Event());
Index: org/eclipse/swt/custom/LineStyleEvent.java
===================================================================
--- org/eclipse/swt/custom/LineStyleEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/LineStyleEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -61,7 +61,7 @@
 	 */
 	public int indent;
 
-	/**
+	/** 
 	 * line wrap indent (input, output)
 	 * 
 	 * @since 3.6
@@ -86,7 +86,7 @@
 	 * @since 3.2
 	 */
 	public int bulletIndex;
-
+	
 	/**
 	 * line tab stops (output)
 	 * @since 3.6
Index: org/eclipse/swt/custom/ST.java
===================================================================
--- org/eclipse/swt/custom/ST.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/ST.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -136,7 +136,7 @@
 	 *  @since 3.2
 	 */
 	public static final int BULLET_CUSTOM = 1 << 5;
-	
+
 	/**
 	 *  The ExtendedModify event type (value is 3000).
 	 *  
Index: org/eclipse/swt/custom/TreeCursor.java
===================================================================
--- org/eclipse/swt/custom/TreeCursor.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/TreeCursor.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,963 +1,963 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2011, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.custom;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.accessibility.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * A TreeCursor provides a way for the user to navigate around a Tree with columns using the
- * keyboard. It also provides a mechanism for selecting an individual cell in a tree.
- * <p>
- * For a detailed example of using a TreeCursor to navigate to a cell and then edit it see
- * http://git.eclipse.org/c/platform/eclipse.platform.swt.git/tree/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet360.java .
- * 
- * <dl>
- * <dt><b>Styles:</b></dt>
- * <dd>BORDER</dd>
- * <dt><b>Events:</b></dt>
- * <dd>Selection, DefaultSelection</dd>
- * </dl>
- * 
- * @since 3.8
- */
-public class TreeCursor extends Canvas {
-	Tree tree;
-	TreeItem row;
-	TreeColumn column;
-	Listener listener, treeListener, resizeListener, disposeItemListener, disposeColumnListener;
-
-	Color background = null;
-	Color foreground = null;
-	
-	/* By default, invert the list selection colors */
-	static final int BACKGROUND = SWT.COLOR_LIST_SELECTION_TEXT;
-	static final int FOREGROUND = SWT.COLOR_LIST_SELECTION;
-
-/**
- * Constructs a new instance of this class given its parent tree and a style value describing
- * its behavior and appearance.
- * <p>
- * The style value is either one of the style constants defined in class <code>SWT</code> which
- * is applicable to instances of this class, or must be built by <em>bitwise OR</em>'ing
- * together (that is, using the <code>int</code> "|" operator) two or more of those
- * <code>SWT</code> style constants. The class description lists the style constants that are
- * applicable to the class. Style bits are also inherited from superclasses.
- * </p>
- * 
- * @param parent a Tree control which will be the parent of the new instance (cannot be null)
- * @param style the style of control to construct
- * 
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
- * </ul>
- * 
- * @see SWT#BORDER
- * @see Widget#checkSubclass()
- * @see Widget#getStyle()
- */
-public TreeCursor(Tree parent, int style) {
-	super(parent, style);
-	tree = parent;
-	setBackground(null);
-	setForeground(null);
-
-	listener = new Listener() {
-		public void handleEvent(Event event) {
-			if (row != null) {
-				/*
-				 * Detect cases where the cursor position has become invalid and fix it.
-				 * The typical cause of this is programmatic tree changes, such as
-				 * expanding/collapsing and item and creating/disposing items.
-				 */
-				if (row.isDisposed()) {
-					unhookRowColumnListeners();
-					_resize();
-					tree.setFocus();
-					return;
-				}
-				TreeItem current = row;
-				TreeItem parentItem = row.getParentItem();
-				while (parentItem != null && !parentItem.getExpanded()) {
-					current = parentItem;
-					parentItem = current.getParentItem();
-				}
-				if (current != row) {
-					setRowColumn(current, column, false);
-				}
-			}
-			switch (event.type) {
-				case SWT.Dispose:
-					onDispose(event);
-					break;
-				case SWT.FocusIn:
-				case SWT.FocusOut:
-					redraw();
-					break;
-				case SWT.KeyDown:
-					keyDown(event);
-					break;
-				case SWT.Paint:
-					paint(event);
-					break;
-				case SWT.Traverse:
-					event.doit = true;
-					switch (event.detail) {
-						case SWT.TRAVERSE_ARROW_NEXT:
-						case SWT.TRAVERSE_ARROW_PREVIOUS:
-						case SWT.TRAVERSE_RETURN:
-							event.doit = false;
-							break;
-					}
-					break;
-			}
-		}
-	};
-	int[] events = new int[] { SWT.Dispose, SWT.FocusIn, SWT.FocusOut, SWT.KeyDown, SWT.Paint, SWT.Traverse };
-	for (int i = 0; i < events.length; i++) {
-		addListener(events[i], listener);
-	}
-
-	treeListener = new Listener() {
-		public void handleEvent(Event event) {
-			switch (event.type) {
-				case SWT.Collapse:
-					treeCollapse(event);
-					break;
-				case SWT.Expand:
-					treeExpand(event);
-					break;
-				case SWT.FocusIn:
-					treeFocusIn(event);
-					break;
-				case SWT.MouseDown:
-					treeMouseDown(event);
-					break;
-			}
-		}
-	};
-	tree.addListener(SWT.Collapse, treeListener);
-	tree.addListener(SWT.Expand, treeListener);
-	tree.addListener(SWT.FocusIn, treeListener);
-	tree.addListener(SWT.MouseDown, treeListener);
-	
-	disposeItemListener = new Listener() {
-		public void handleEvent(Event event) {
-			TreeItem currentItem = row;
-			while (currentItem != null) {
-				currentItem.removeListener(SWT.Dispose, disposeItemListener);
-				currentItem = currentItem.getParentItem();
-			}
-			TreeItem disposedItem = (TreeItem)event.widget;
-			TreeItem parentItem = disposedItem.getParentItem();
-			if (parentItem != null) {
-				setRowColumn(parentItem, column, true);
-			} else {
-				if (tree.getItemCount() == 1) {
-					unhookRowColumnListeners();
-				} else {
-					TreeItem newFocus = null;
-					int rowIndex = tree.indexOf(disposedItem);
-					if (rowIndex != 0) {
-						TreeItem previousItem = tree.getItem(rowIndex - 1);
-						if (!previousItem.isDisposed()) {
-							newFocus = previousItem;
-						}
-					}
-					if (newFocus == null && rowIndex + 1 < tree.getItemCount()) {
-						TreeItem nextItem = tree.getItem(rowIndex + 1);
-						if (!nextItem.isDisposed()) {
-							newFocus = nextItem;
-						}
-					}
-					if (newFocus != null) {
-						setRowColumn(newFocus, column, true);
-					} else {
-						unhookRowColumnListeners();
-					}
-				}
-			}
-			_resize();
-		}
-	};
-	disposeColumnListener = new Listener() {
-		public void handleEvent(Event event) {
-			if (column != null) {
-				if (tree.getColumnCount() == 1) {
-					column = null;
-				} else {
-					int columnIndex = tree.indexOf(column);
-					int positionIndex = columnIndex;
-					int[] columnOrder = tree.getColumnOrder();
-					for (int i = 0; i < columnOrder.length; i++) {
-						if (columnOrder[i] == columnIndex) {
-							positionIndex = i;
-							break;
-						}
-					}
-					if (positionIndex == columnOrder.length - 1) {
-						setRowColumn(row, tree.getColumn(columnOrder[positionIndex - 1]), true);
-					} else {
-						setRowColumn(row, tree.getColumn(columnOrder[positionIndex + 1]), true);
-					}
-				}
-			}
-			_resize();
-		}
-	};
-	resizeListener = new Listener() {
-		public void handleEvent(Event event) {
-			_resize();
-		}
-	};
-	ScrollBar hBar = tree.getHorizontalBar();
-	if (hBar != null) {
-		hBar.addListener(SWT.Selection, resizeListener);
-	}
-	ScrollBar vBar = tree.getVerticalBar();
-	if (vBar != null) {
-		vBar.addListener(SWT.Selection, resizeListener);
-	}
-	
-	getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
-		public void getRole(AccessibleControlEvent e) {
-			e.detail = ACC.ROLE_TABLECELL;
-		}
-	});
-	getAccessible().addAccessibleListener(new AccessibleAdapter() {
-		public void getName(AccessibleEvent e) {
-			if (row == null) return;
-			int columnIndex = column == null ? 0 : tree.indexOf(column);
-			e.result = row.getText(columnIndex);
-		}
-	});
-}
-
-/**
- * Adds the listener to the collection of listeners who will be notified when the receiver's
- * selection changes, by sending it one of the messages defined in the
- * <code>SelectionListener</code> interface.
- * <p>
- * When <code>widgetSelected</code> is called, the item field of the event object is valid. If
- * the receiver has <code>SWT.CHECK</code> style set and the check selection changes, the event
- * object detail field contains the value <code>SWT.CHECK</code>.
- * <code>widgetDefaultSelected</code> is typically called when an item is double-clicked.
- * </p>
- * 
- * @param listener the listener which should be notified
- * 
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @see SelectionListener
- * @see SelectionEvent
- * @see #removeSelectionListener(SelectionListener)
- */
-public void addSelectionListener(SelectionListener listener) {
-	checkWidget();
-	if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	TypedListener typedListener = new TypedListener(listener);
-	addListener(SWT.Selection, typedListener);
-	addListener(SWT.DefaultSelection, typedListener);
-}
-
-int countSubTreePages(TreeItem root) {
-	int pages = 1;
-	if (root == null) return 0;
-	if (root.getItemCount() == 0) return 1;
-	if (!root.getExpanded()) return 1;
-	TreeItem[] items = root.getItems();
-	for (int i = 0; i < items.length; i++) {
-		pages += countSubTreePages(items[i]);
-	}
-	return pages;
-}
-
-int findIndex(TreeItem[] items, TreeItem treeItem) {
-	if (items == null || treeItem == null) return -1;
-	Rectangle rect = treeItem.getBounds();
-	int index = 0;
-	for (int i = 0; i < items.length; i++) {
-		TreeItem previousItem = null;
-		TreeItem currentItem = items[i];
-		if (i > 0) previousItem = items[i - 1];
-		Rectangle rect1 = currentItem.getBounds();
-		if (rect.y == rect1.y) return index;
-		if (rect.y < rect1.y) {
-			return index - 1 + findIndex(previousItem.getItems(), treeItem);
-		}
-		if (rect.y > rect1.y && i == items.length - 1) {
-			return index + findIndex(currentItem.getItems(), treeItem);
-		}
-		if (rect.y >= rect1.y + (1 + currentItem.getItemCount()) * tree.getItemHeight() && currentItem.getExpanded()) {
-			index += countSubTreePages(currentItem);
-			continue;
-		}
-		index++;
-	}
-	return -1;
-}
-
-TreeItem findItem(TreeItem[] items, Point pt) {
-	int start = 0, end = items.length - 1;
-	int index = end / 2;
-	while (end - start > 1) {
-		TreeItem currentItem = items[index];
-		Rectangle bounds = currentItem.getBounds();
-		if (pt.y < bounds.y) {
-			end = index;
-			index = (end - start) / 2;
-		} else {
-			start = index;
-			index = start + ((end - start) / 2);
-		}
-	}
-
-	Rectangle endBounds = items[end].getBounds();
-	if (endBounds.y < pt.y) {
-		if (endBounds.y + endBounds.height < pt.y) {
-			if (!items[end].getExpanded()) return null;
-			return findItem(items[end].getItems(), pt);
-		}
-		int[] columnOrder = tree.getColumnOrder();
-		Rectangle bounds = null;
-		if (columnOrder.length > 0) {
-			Rectangle rect1 = items[end].getBounds(columnOrder[0]);
-			Rectangle rect2 = items[end].getBounds(columnOrder[columnOrder.length - 1]);
-			bounds = rect1.union(rect2);
-			bounds.height += tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
-		} else {
-			bounds = items[end].getBounds();
-		}
-		return bounds.contains(pt) ? items[end] : null;		
-	}
-	
-	Rectangle startBounds = items[start].getBounds();
-	if (startBounds.y + startBounds.height < pt.y) {
-		return findItem(items[start].getItems(), pt);
-	}
-	int[] columnOrder = tree.getColumnOrder();
-	Rectangle bounds = null;
-	if (columnOrder.length > 0) {
-		Rectangle rect1 = items[start].getBounds(columnOrder[0]);
-		Rectangle rect2 = items[start].getBounds(columnOrder[columnOrder.length - 1]);
-		bounds = rect1.union(rect2);
-		bounds.height += tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
-	} else {
-		bounds = items[start].getBounds();
-	}
-	return bounds.contains(pt) ? items[start] : null;
-}
-
-/**
- * Returns the background color that the receiver will use to draw.
- *
- * @return the receiver's background color
- */
-public Color getBackground() {
-	checkWidget();
-	if (background == null) {
-		return getDisplay().getSystemColor(BACKGROUND);
-	}
-	return background;
-}
-
-/**
- * Returns the index of the column over which the TreeCursor is positioned.
- * 
- * @return the column index for the current position
- * 
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getColumn() {
-	checkWidget();
-	return column == null ? 0 : tree.indexOf(column);
-}
-
-/**
- * Returns the foreground color that the receiver will use to draw.
- *
- * @return the receiver's foreground color
- */
-public Color getForeground() {
-	checkWidget();
-	if (foreground == null) {
-		return getDisplay().getSystemColor(FOREGROUND);
-	}
-	return foreground;
-}
-
-TreeItem getLastVisibleItem(TreeItem[] items) {
-	if (items == null) return null;
-	TreeItem last = items[items.length - 1];
-	if (last.getExpanded() && last.getItemCount() > 0) {
-		return getLastVisibleItem(last.getItems());
-	}
-	return last;
-}
-
-TreeItem getNextItem(TreeItem item) {
-	if (item == null) return null;
-	if (item.getExpanded() && item.getItemCount() > 0) {
-		return item.getItem(0);
-	}
-
-	TreeItem parentItem = item.getParentItem();
-	while (parentItem != null) {
-		int index = parentItem.indexOf(item);
-		if (index == -1) return null;
-		if (index < parentItem.getItemCount() - 1) {
-			return parentItem.getItem(index + 1);
-		}
-		item = parentItem;
-		parentItem = item.getParentItem();
-	}
-	int index = tree.indexOf(item);
-	if (index == -1) return null;
-	if (index == tree.getItemCount() - 1) return null;
-	return tree.getItem(index + 1);	
-}
-
-TreeItem getPreviousItem(TreeItem item) {
-	if (item == null) return null;
-	TreeItem parentItem = item.getParentItem();
-	if (parentItem == null) {
-		int index = tree.indexOf(item);
-		if (index == -1 || index == 0) return null;
-		item = tree.getItem(index - 1);
-		if (item.getExpanded() && item.getItemCount() > 0) {
-			return getLastVisibleItem(item.getItems());
-		}
-		return item;
-	}
-	int index = parentItem.indexOf(item);
-	if (index == -1) return null;
-	if (index == 0) return parentItem;
-	item = parentItem.getItem(index - 1);
-	if (item.getExpanded() && item.getItemCount() > 0) {
-		return getLastVisibleItem(item.getItems());
-	}
-	return item;
-}
-
-/**
- * Returns the row over which the TreeCursor is positioned.
- * 
- * @return the item for the current position, or <code>null</code> if none
- * 
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public TreeItem getRow() {
-	checkWidget();
-	return row;
-}
-
-void keyDown(Event event) {
-	if (row == null) return;
-	switch (event.character) {
-		case SWT.CR:
-			notifyListeners(SWT.DefaultSelection, new Event());
-			return;
-	}
-	switch (event.keyCode) {
-		case SWT.ARROW_UP:
-			TreeItem previousItem = getPreviousItem(row);
-			if (previousItem != null) {
-				setRowColumn(previousItem, column, true);
-			}
-			break;
-		case SWT.ARROW_DOWN:
-			TreeItem nextItem = getNextItem(row);
-			if (nextItem != null) {
-				setRowColumn(nextItem, column, true);
-			}
-			break;
-		case SWT.ARROW_LEFT:
-		case SWT.ARROW_RIGHT: {
-			if ((event.stateMask & SWT.MOD1) != 0) {
-				row.setExpanded (event.keyCode == SWT.ARROW_RIGHT);
-				break;
-			}
-			int columnCount = tree.getColumnCount();
-			if (columnCount == 0) break;
-			int columnIndex = column == null ? 0 : tree.indexOf(column);
-			int[] columnOrder = tree.getColumnOrder();
-			int index = 0;
-			while (index < columnOrder.length) {
-				if (columnOrder[index] == columnIndex) break;
-				index++;
-			}
-			if (index == columnOrder.length) index = 0;
-			int leadKey = (getStyle() & SWT.RIGHT_TO_LEFT) != 0 ? SWT.ARROW_RIGHT : SWT.ARROW_LEFT;
-			TreeItem parentRow = row.getParentItem();
-			int rowIndex = tree.indexOf(row);
-			if (event.keyCode == leadKey) {
-				if (parentRow != null) {
-					setRowColumn(row, tree.getColumn(columnOrder[Math.max(0, index - 1)]), true);
-				} else {
-					setRowColumn(rowIndex, columnOrder[Math.max(0, index - 1)], true);
-				}
-			} else {
-				if (parentRow != null) {
-					setRowColumn(row, tree.getColumn(columnOrder[Math.min(columnCount - 1, index + 1)]), true);
-				} else {
-					setRowColumn(rowIndex, columnOrder[Math.min(columnCount - 1, index + 1)], true);
-				}
-			}
-			break;
-		}
-		case SWT.HOME:
-			int columnIndex = column == null ? 0 : tree.indexOf(column);
-			setRowColumn(0, columnIndex, true);
-			break;
-		case SWT.END: {
-			TreeItem[] items = tree.getItems();
-			setRowColumn(getLastVisibleItem(items), column, true);
-			break;
-		}
-		case SWT.PAGE_UP: {
-			Rectangle rect = tree.getClientArea();
-			Rectangle itemRect = tree.getTopItem().getBounds();
-			TreeItem item = row;
-			int index = findIndex(tree.getItems(), item);
-			int itemHeight = tree.getItemHeight();
-			rect.height -= itemRect.y;
-			int page = Math.max(1, rect.height / itemHeight);
-			if (index - page <= 0) {
-				TreeItem first = tree.getItem(0);
-				setRowColumn(first, column, true);
-				break;
-			}
-			for (int i = 0; i < page; i++) {
-				item = getPreviousItem(item);
-			}
-			setRowColumn(item, column, true);
-			break;
-		}
-		case SWT.PAGE_DOWN: {
-			Rectangle rect = tree.getClientArea();
-			Rectangle itemRect = tree.getTopItem().getBounds();
-			TreeItem item = row;
-			int index = findIndex(tree.getItems(), item);
-			int height = tree.getItemHeight();
-			rect.height -= itemRect.y;
-			TreeItem last = getLastVisibleItem(tree.getItems());
-			int page = Math.max(1, rect.height / height);
-			int end = findIndex(tree.getItems(), last);
-			if (end <= index + page) {
-				setRowColumn(last, column, true);
-				break;
-			}
-			for (int i = 0; i < page; i++) {
-				item = getNextItem(item);
-			}
-			setRowColumn(item, column, true);
-			break;
-		}
-	}
-}
-
-void onDispose(Event event) {
-	removeListener(SWT.Dispose, listener);
-	notifyListeners(SWT.Dispose, event);
-	event.type = SWT.None;
-
-	tree.removeListener(SWT.Collapse, treeListener);
-	tree.removeListener(SWT.Expand, treeListener);
-	tree.removeListener(SWT.FocusIn, treeListener);
-	tree.removeListener(SWT.MouseDown, treeListener);
-	unhookRowColumnListeners();
-	ScrollBar hBar = tree.getHorizontalBar();
-	if (hBar != null) {
-		hBar.removeListener(SWT.Selection, resizeListener);
-	}
-	ScrollBar vBar = tree.getVerticalBar();
-	if (vBar != null) {
-		vBar.removeListener(SWT.Selection, resizeListener);
-	}
-}
-
-void paint(Event event) {
-	if (row == null) return;
-	int columnIndex = column == null ? 0 : tree.indexOf(column);
-	int orderedIndex = columnIndex;
-	int[] columnOrder = tree.getColumnOrder();
-	for (int i = 0; i < columnOrder.length; i++) {
-		if (columnOrder[i] == columnIndex) {
-			orderedIndex = i;
-			break;
-		}
-	}
-	GC gc = event.gc;
-	gc.setBackground(getBackground());
-	gc.setForeground(getForeground());
-	gc.fillRectangle(event.x, event.y, event.width, event.height);
-	Image image = row.getImage(columnIndex);
-	int x = 0;
-	// Temporary code - need a better way to determine trim
-	String platform = SWT.getPlatform();
-	if (image != null) {
-		if ("win32".equals(platform)) { //$NON-NLS-1$
-			if (orderedIndex > 0) { 
-				x += 2;
-			}
-		} else {
-			x += 2;
-		}
-	}
-	Point size = getSize();
-	if (image != null) {
-		Rectangle imageSize = image.getBounds();
-		int imageY = (size.y - imageSize.height) / 2;
-		gc.drawImage(image, x, imageY);
-		x += imageSize.width;
-	}
-	String text = row.getText(columnIndex);
-	if (text.length() > 0) {
-		Rectangle bounds = row.getBounds(columnIndex);
-		Point extent = gc.stringExtent(text);
-		// Temporary code - need a better way to determine trim
-		if ("win32".equals(platform)) { //$NON-NLS-1$
-			if (tree.getColumnCount() == 0 || orderedIndex == 0) {
-				x += image == null ? 2 : 5;
-			} else {
-				int alignmnent = column.getAlignment();
-				switch (alignmnent) {
-					case SWT.LEFT:
-						x += image == null ? 5 : 3;
-						break;
-					case SWT.RIGHT:
-						x = bounds.width - extent.x - 2;
-						break;
-					case SWT.CENTER:
-						x += Math.ceil((bounds.width - x - extent.x) / 2.0);
-						break;
-				}
-			}
-		} else {
-			if (tree.getColumnCount() == 0) {
-				x += image == null ? 4 : 3;
-			} else {
-				int alignmnent = column.getAlignment();
-				switch (alignmnent) {
-					case SWT.LEFT:
-						x += image == null ? 5 : 3;
-						break;
-					case SWT.RIGHT:
-						x = bounds.width - extent.x - 2;
-						break;
-					case SWT.CENTER:
-						x += (bounds.width - x - extent.x) / 2 + 2;
-						break;
-				}
-			}
-		}
-		int textY = (size.y - extent.y) / 2;
-		gc.drawString(text, x, textY);
-	}
-	if (isFocusControl()) {
-		Display display = getDisplay();
-		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
-		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
-		gc.drawFocus(0, 0, size.x, size.y);
-	}
-}
-
-/**
- * Removes the listener from the collection of listeners who will be notified when the
- * receiver's selection changes.
- * 
- * @param listener the listener which should no longer be notified
- * 
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @see SelectionListener
- * @see #addSelectionListener(SelectionListener)
- */
-public void removeSelectionListener(SelectionListener listener) {
-	checkWidget();
-	if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	removeListener(SWT.Selection, listener);
-	removeListener(SWT.DefaultSelection, listener);
-}
-
-void _resize() {
-	if (row == null) {
-		setBounds(-200, -200, 0, 0);
-	} else {
-		int columnIndex = column == null ? 0 : tree.indexOf(column);
-		setBounds(row.getBounds(columnIndex));
-	}
-}
-
-/**
- * Sets the receiver's background color to the color specified
- * by the argument, or to the default system color for the control
- * if the argument is null.
- * <p>
- * Note: This operation is a hint and may be overridden by the platform.
- * For example, on Windows the background of a Button cannot be changed.
- * </p>
- * @param color the new color (or null)
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setBackground (Color color) {
-	background = color;
-	super.setBackground(getBackground());
-	redraw();
-}
-/**
- * Sets the receiver's foreground color to the color specified
- * by the argument, or to the default system color for the control
- * if the argument is null.
- * <p>
- * Note: This operation is a hint and may be overridden by the platform.
- * </p>
- * @param color the new color (or null)
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setForeground (Color color) {
-	foreground = color;
-	super.setForeground(getForeground());
-	redraw();
-}
-
-void setRowColumn(int row, int column, boolean notify) {
-	TreeItem item = row == -1 ? null : tree.getItem(row);
-	TreeColumn col = column == -1 || tree.getColumnCount() == 0 ? null : tree.getColumn(column);
-	setRowColumn(item, col, notify);
-}
-
-void setRowColumn(TreeItem row, TreeColumn column, boolean notify) {
-	if (this.row != null && this.row != row) {
-		TreeItem currentItem = this.row;
-		while (currentItem != null) {
-			currentItem.removeListener(SWT.Dispose, disposeItemListener);
-			currentItem = currentItem.getParentItem();
-		}
-		this.row = null;
-	}
-	if (this.column != null && this.column != column) {
-		this.column.removeListener(SWT.Dispose, disposeColumnListener);
-		this.column.removeListener(SWT.Move, resizeListener);
-		this.column.removeListener(SWT.Resize, resizeListener);
-		this.column = null;
-	}
-	if (row != null) {
-		if (this.row != row) {
-			this.row = row;
-			TreeItem currentItem = row;
-			while (currentItem != null) {
-				currentItem.addListener(SWT.Dispose, disposeItemListener);
-				currentItem = currentItem.getParentItem();
-			}
-			tree.showItem(row);
-		}
-		if (this.column != column && column != null) {
-			this.column = column;
-			column.addListener(SWT.Dispose, disposeColumnListener);
-			column.addListener(SWT.Move, resizeListener);
-			column.addListener(SWT.Resize, resizeListener);
-			tree.showColumn(column);
-		}
-		int columnIndex = column == null ? 0 : tree.indexOf(column);
-		setBounds(row.getBounds(columnIndex));
-		redraw();
-		if (notify) notifyListeners(SWT.Selection, new Event());
-	}
-}
-
-/**
- * Positions the TreeCursor over the root-level cell at the given row and column in the parent tree.
- * 
- * @param row the index of the root-level row for the cell to select
- * @param column the index of column for the cell to select
- * 
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setSelection(int row, int column) {
-	checkWidget();
-	int columnCount = tree.getColumnCount();
-	int maxColumnIndex = columnCount == 0 ? 0 : columnCount - 1;
-	if (row < 0 || row >= tree.getItemCount() || column < 0 || column > maxColumnIndex) {
-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	}
-	setRowColumn(row, column, false);
-}
-
-/**
- * Positions the TreeCursor over the cell at the given row and column in the parent tree.
- * 
- * @param row the TreeItem of the row for the cell to select
- * @param column the index of column for the cell to select
- * 
- * @exception SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setSelection(TreeItem row, int column) {
-	checkWidget();
-	int columnCount = tree.getColumnCount();
-	int maxColumnIndex = columnCount == 0 ? 0 : columnCount - 1;
-	if (row == null || row.isDisposed() || column < 0 || column > maxColumnIndex) {
-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	}
-	TreeColumn col = tree.getColumnCount() == 0 ? null : tree.getColumn(column);
-	setRowColumn(row, col, false);
-}
-
-public void setVisible(boolean visible) {
-	checkWidget();
-	if (visible) {
-		_resize();
-	}
-	super.setVisible(visible);
-}
-
-void treeCollapse(Event event) {
-	if (row == null) return;
-	TreeItem root = (TreeItem)event.item;
-	TreeItem parentItem = row.getParentItem();
-	while (parentItem != null) {
-		if (parentItem == root) {
-			setRowColumn(root, column, true);
-			return;
-		}
-		parentItem = parentItem.getParentItem();
-	}
-	
-	getDisplay().asyncExec(new Runnable() {
-		public void run() {
-			if (isDisposed()) return;
-			setRowColumn(row, column, true);
-		}
-	});
-}
-
-void treeExpand(Event event) {
-	getDisplay().asyncExec(new Runnable() {
-		public void run() {
-			if (isDisposed()) return;
-			setRowColumn(row, column, true);
-		}
-	});
-}
-
-void treeFocusIn(Event event) {
-	if (isVisible()) {
-		if (row == null && column == null) return;
-		setFocus();
-	}
-}
-
-void treeMouseDown(Event event) {
-	if (tree.getItemCount() == 0) return;
-	Point pt = new Point(event.x, event.y);
-	TreeItem item = tree.getItem(pt);
-	if (item == null && (tree.getStyle() & SWT.FULL_SELECTION) == 0) {
-		TreeItem currentItem = tree.getTopItem();
-		TreeItem parentItem = currentItem.getParentItem();
-		while (parentItem != null) {
-			currentItem = parentItem;
-			parentItem = currentItem.getParentItem();
-		}
-		int start = tree.indexOf(currentItem);
-		int viewportItemCount = tree.getClientArea().height / tree.getItemHeight();
-		int end = Math.min(start + viewportItemCount, tree.getItemCount() - 1);
-		TreeItem[] allItems = tree.getItems();
-		TreeItem[] items = new TreeItem[end - start + 1];
-		System.arraycopy(allItems, start, items, 0, end - start + 1);
-		item = findItem(items, pt);
-	}
-	if (item == null) return;
-
-	TreeColumn newColumn = null;
-	int lineWidth = tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
-	int columnCount = tree.getColumnCount();
-	if (columnCount > 0) {
-		for (int i = 0; i < columnCount; i++) {
-			Rectangle rect = item.getBounds(i);
-			rect.width += lineWidth;
-			rect.height += lineWidth;
-			if (rect.contains(pt)) {
-				newColumn = tree.getColumn(i);
-				break;
-			}
-		}
-		if (newColumn == null) {
-			newColumn = tree.getColumn(0);
-		}
-	}
-	setRowColumn(item, newColumn, true);
-	setFocus();
-}
-
-void unhookRowColumnListeners() {
-	if (column != null && !column.isDisposed()) {
-		column.removeListener(SWT.Dispose, disposeColumnListener);
-		column.removeListener(SWT.Move, resizeListener);
-		column.removeListener(SWT.Resize, resizeListener);
-	}
-	column = null;
-	if (row != null && !row.isDisposed()) {
-		TreeItem currentItem = row;
-		while (currentItem != null) {
-			currentItem.removeListener(SWT.Dispose, disposeItemListener);
-			currentItem = currentItem.getParentItem();
-		}
-	}
-	row = null;
-}
-
-}
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.custom;
+
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+
+/**
+ * A TreeCursor provides a way for the user to navigate around a Tree with columns using the
+ * keyboard. It also provides a mechanism for selecting an individual cell in a tree.
+ * <p>
+ * For a detailed example of using a TreeCursor to navigate to a cell and then edit it see
+ * http://git.eclipse.org/c/platform/eclipse.platform.swt.git/tree/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet360.java .
+ * 
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>BORDER</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Selection, DefaultSelection</dd>
+ * </dl>
+ * 
+ * @since 3.8
+ */
+public class TreeCursor extends Canvas {
+	Tree tree;
+	TreeItem row;
+	TreeColumn column;
+	Listener listener, treeListener, resizeListener, disposeItemListener, disposeColumnListener;
+
+	Color background = null;
+	Color foreground = null;
+	
+	/* By default, invert the list selection colors */
+	static final int BACKGROUND = SWT.COLOR_LIST_SELECTION_TEXT;
+	static final int FOREGROUND = SWT.COLOR_LIST_SELECTION;
+
+/**
+ * Constructs a new instance of this class given its parent tree and a style value describing
+ * its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in class <code>SWT</code> which
+ * is applicable to instances of this class, or must be built by <em>bitwise OR</em>'ing
+ * together (that is, using the <code>int</code> "|" operator) two or more of those
+ * <code>SWT</code> style constants. The class description lists the style constants that are
+ * applicable to the class. Style bits are also inherited from superclasses.
+ * </p>
+ * 
+ * @param parent a Tree control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ * 
+ * @see SWT#BORDER
+ * @see Widget#checkSubclass()
+ * @see Widget#getStyle()
+ */
+public TreeCursor(Tree parent, int style) {
+	super(parent, style);
+	tree = parent;
+	setBackground(null);
+	setForeground(null);
+
+	listener = new Listener() {
+		public void handleEvent(Event event) {
+			if (row != null) {
+				/*
+				 * Detect cases where the cursor position has become invalid and fix it.
+				 * The typical cause of this is programmatic tree changes, such as
+				 * expanding/collapsing and item and creating/disposing items.
+				 */
+				if (row.isDisposed()) {
+					unhookRowColumnListeners();
+					_resize();
+					tree.setFocus();
+					return;
+				}
+				TreeItem current = row;
+				TreeItem parentItem = row.getParentItem();
+				while (parentItem != null && !parentItem.getExpanded()) {
+					current = parentItem;
+					parentItem = current.getParentItem();
+				}
+				if (current != row) {
+					setRowColumn(current, column, false);
+				}
+			}
+			switch (event.type) {
+				case SWT.Dispose:
+					onDispose(event);
+					break;
+				case SWT.FocusIn:
+				case SWT.FocusOut:
+					redraw();
+					break;
+				case SWT.KeyDown:
+					keyDown(event);
+					break;
+				case SWT.Paint:
+					paint(event);
+					break;
+				case SWT.Traverse:
+					event.doit = true;
+					switch (event.detail) {
+						case SWT.TRAVERSE_ARROW_NEXT:
+						case SWT.TRAVERSE_ARROW_PREVIOUS:
+						case SWT.TRAVERSE_RETURN:
+							event.doit = false;
+							break;
+					}
+					break;
+			}
+		}
+	};
+	int[] events = new int[] { SWT.Dispose, SWT.FocusIn, SWT.FocusOut, SWT.KeyDown, SWT.Paint, SWT.Traverse };
+	for (int i = 0; i < events.length; i++) {
+		addListener(events[i], listener);
+	}
+
+	treeListener = new Listener() {
+		public void handleEvent(Event event) {
+			switch (event.type) {
+				case SWT.Collapse:
+					treeCollapse(event);
+					break;
+				case SWT.Expand:
+					treeExpand(event);
+					break;
+				case SWT.FocusIn:
+					treeFocusIn(event);
+					break;
+				case SWT.MouseDown:
+					treeMouseDown(event);
+					break;
+			}
+		}
+	};
+	tree.addListener(SWT.Collapse, treeListener);
+	tree.addListener(SWT.Expand, treeListener);
+	tree.addListener(SWT.FocusIn, treeListener);
+	tree.addListener(SWT.MouseDown, treeListener);
+	
+	disposeItemListener = new Listener() {
+		public void handleEvent(Event event) {
+			TreeItem currentItem = row;
+			while (currentItem != null) {
+				currentItem.removeListener(SWT.Dispose, disposeItemListener);
+				currentItem = currentItem.getParentItem();
+			}
+			TreeItem disposedItem = (TreeItem)event.widget;
+			TreeItem parentItem = disposedItem.getParentItem();
+			if (parentItem != null) {
+				setRowColumn(parentItem, column, true);
+			} else {
+				if (tree.getItemCount() == 1) {
+					unhookRowColumnListeners();
+				} else {
+					TreeItem newFocus = null;
+					int rowIndex = tree.indexOf(disposedItem);
+					if (rowIndex != 0) {
+						TreeItem previousItem = tree.getItem(rowIndex - 1);
+						if (!previousItem.isDisposed()) {
+							newFocus = previousItem;
+						}
+					}
+					if (newFocus == null && rowIndex + 1 < tree.getItemCount()) {
+						TreeItem nextItem = tree.getItem(rowIndex + 1);
+						if (!nextItem.isDisposed()) {
+							newFocus = nextItem;
+						}
+					}
+					if (newFocus != null) {
+						setRowColumn(newFocus, column, true);
+					} else {
+						unhookRowColumnListeners();
+					}
+				}
+			}
+			_resize();
+		}
+	};
+	disposeColumnListener = new Listener() {
+		public void handleEvent(Event event) {
+			if (column != null) {
+				if (tree.getColumnCount() == 1) {
+					column = null;
+				} else {
+					int columnIndex = tree.indexOf(column);
+					int positionIndex = columnIndex;
+					int[] columnOrder = tree.getColumnOrder();
+					for (int i = 0; i < columnOrder.length; i++) {
+						if (columnOrder[i] == columnIndex) {
+							positionIndex = i;
+							break;
+						}
+					}
+					if (positionIndex == columnOrder.length - 1) {
+						setRowColumn(row, tree.getColumn(columnOrder[positionIndex - 1]), true);
+					} else {
+						setRowColumn(row, tree.getColumn(columnOrder[positionIndex + 1]), true);
+					}
+				}
+			}
+			_resize();
+		}
+	};
+	resizeListener = new Listener() {
+		public void handleEvent(Event event) {
+			_resize();
+		}
+	};
+	ScrollBar hBar = tree.getHorizontalBar();
+	if (hBar != null) {
+		hBar.addListener(SWT.Selection, resizeListener);
+	}
+	ScrollBar vBar = tree.getVerticalBar();
+	if (vBar != null) {
+		vBar.addListener(SWT.Selection, resizeListener);
+	}
+	
+	getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
+		public void getRole(AccessibleControlEvent e) {
+			e.detail = ACC.ROLE_TABLECELL;
+		}
+	});
+	getAccessible().addAccessibleListener(new AccessibleAdapter() {
+		public void getName(AccessibleEvent e) {
+			if (row == null) return;
+			int columnIndex = column == null ? 0 : tree.indexOf(column);
+			e.result = row.getText(columnIndex);
+		}
+	});
+}
+
+/**
+ * Adds the listener to the collection of listeners who will be notified when the receiver's
+ * selection changes, by sending it one of the messages defined in the
+ * <code>SelectionListener</code> interface.
+ * <p>
+ * When <code>widgetSelected</code> is called, the item field of the event object is valid. If
+ * the receiver has <code>SWT.CHECK</code> style set and the check selection changes, the event
+ * object detail field contains the value <code>SWT.CHECK</code>.
+ * <code>widgetDefaultSelected</code> is typically called when an item is double-clicked.
+ * </p>
+ * 
+ * @param listener the listener which should be notified
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see SelectionListener
+ * @see SelectionEvent
+ * @see #removeSelectionListener(SelectionListener)
+ */
+public void addSelectionListener(SelectionListener listener) {
+	checkWidget();
+	if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener(listener);
+	addListener(SWT.Selection, typedListener);
+	addListener(SWT.DefaultSelection, typedListener);
+}
+
+int countSubTreePages(TreeItem root) {
+	int pages = 1;
+	if (root == null) return 0;
+	if (root.getItemCount() == 0) return 1;
+	if (!root.getExpanded()) return 1;
+	TreeItem[] items = root.getItems();
+	for (int i = 0; i < items.length; i++) {
+		pages += countSubTreePages(items[i]);
+	}
+	return pages;
+}
+
+int findIndex(TreeItem[] items, TreeItem treeItem) {
+	if (items == null || treeItem == null) return -1;
+	Rectangle rect = treeItem.getBounds();
+	int index = 0;
+	for (int i = 0; i < items.length; i++) {
+		TreeItem previousItem = null;
+		TreeItem currentItem = items[i];
+		if (i > 0) previousItem = items[i - 1];
+		Rectangle rect1 = currentItem.getBounds();
+		if (rect.y == rect1.y) return index;
+		if (rect.y < rect1.y) {
+			return index - 1 + findIndex(previousItem.getItems(), treeItem);
+		}
+		if (rect.y > rect1.y && i == items.length - 1) {
+			return index + findIndex(currentItem.getItems(), treeItem);
+		}
+		if (rect.y >= rect1.y + (1 + currentItem.getItemCount()) * tree.getItemHeight() && currentItem.getExpanded()) {
+			index += countSubTreePages(currentItem);
+			continue;
+		}
+		index++;
+	}
+	return -1;
+}
+
+TreeItem findItem(TreeItem[] items, Point pt) {
+	int start = 0, end = items.length - 1;
+	int index = end / 2;
+	while (end - start > 1) {
+		TreeItem currentItem = items[index];
+		Rectangle bounds = currentItem.getBounds();
+		if (pt.y < bounds.y) {
+			end = index;
+			index = (end - start) / 2;
+		} else {
+			start = index;
+			index = start + ((end - start) / 2);
+		}
+	}
+
+	Rectangle endBounds = items[end].getBounds();
+	if (endBounds.y < pt.y) {
+		if (endBounds.y + endBounds.height < pt.y) {
+			if (!items[end].getExpanded()) return null;
+			return findItem(items[end].getItems(), pt);
+		}
+		int[] columnOrder = tree.getColumnOrder();
+		Rectangle bounds = null;
+		if (columnOrder.length > 0) {
+			Rectangle rect1 = items[end].getBounds(columnOrder[0]);
+			Rectangle rect2 = items[end].getBounds(columnOrder[columnOrder.length - 1]);
+			bounds = rect1.union(rect2);
+			bounds.height += tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
+		} else {
+			bounds = items[end].getBounds();
+		}
+		return bounds.contains(pt) ? items[end] : null;		
+	}
+	
+	Rectangle startBounds = items[start].getBounds();
+	if (startBounds.y + startBounds.height < pt.y) {
+		return findItem(items[start].getItems(), pt);
+	}
+	int[] columnOrder = tree.getColumnOrder();
+	Rectangle bounds = null;
+	if (columnOrder.length > 0) {
+		Rectangle rect1 = items[start].getBounds(columnOrder[0]);
+		Rectangle rect2 = items[start].getBounds(columnOrder[columnOrder.length - 1]);
+		bounds = rect1.union(rect2);
+		bounds.height += tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
+	} else {
+		bounds = items[start].getBounds();
+	}
+	return bounds.contains(pt) ? items[start] : null;
+}
+
+/**
+ * Returns the background color that the receiver will use to draw.
+ *
+ * @return the receiver's background color
+ */
+public Color getBackground() {
+	checkWidget();
+	if (background == null) {
+		return getDisplay().getSystemColor(BACKGROUND);
+	}
+	return background;
+}
+
+/**
+ * Returns the index of the column over which the TreeCursor is positioned.
+ * 
+ * @return the column index for the current position
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public int getColumn() {
+	checkWidget();
+	return column == null ? 0 : tree.indexOf(column);
+}
+
+/**
+ * Returns the foreground color that the receiver will use to draw.
+ *
+ * @return the receiver's foreground color
+ */
+public Color getForeground() {
+	checkWidget();
+	if (foreground == null) {
+		return getDisplay().getSystemColor(FOREGROUND);
+	}
+	return foreground;
+}
+
+TreeItem getLastVisibleItem(TreeItem[] items) {
+	if (items == null) return null;
+	TreeItem last = items[items.length - 1];
+	if (last.getExpanded() && last.getItemCount() > 0) {
+		return getLastVisibleItem(last.getItems());
+	}
+	return last;
+}
+
+TreeItem getNextItem(TreeItem item) {
+	if (item == null) return null;
+	if (item.getExpanded() && item.getItemCount() > 0) {
+		return item.getItem(0);
+	}
+
+	TreeItem parentItem = item.getParentItem();
+	while (parentItem != null) {
+		int index = parentItem.indexOf(item);
+		if (index == -1) return null;
+		if (index < parentItem.getItemCount() - 1) {
+			return parentItem.getItem(index + 1);
+		}
+		item = parentItem;
+		parentItem = item.getParentItem();
+	}
+	int index = tree.indexOf(item);
+	if (index == -1) return null;
+	if (index == tree.getItemCount() - 1) return null;
+	return tree.getItem(index + 1);	
+}
+
+TreeItem getPreviousItem(TreeItem item) {
+	if (item == null) return null;
+	TreeItem parentItem = item.getParentItem();
+	if (parentItem == null) {
+		int index = tree.indexOf(item);
+		if (index == -1 || index == 0) return null;
+		item = tree.getItem(index - 1);
+		if (item.getExpanded() && item.getItemCount() > 0) {
+			return getLastVisibleItem(item.getItems());
+		}
+		return item;
+	}
+	int index = parentItem.indexOf(item);
+	if (index == -1) return null;
+	if (index == 0) return parentItem;
+	item = parentItem.getItem(index - 1);
+	if (item.getExpanded() && item.getItemCount() > 0) {
+		return getLastVisibleItem(item.getItems());
+	}
+	return item;
+}
+
+/**
+ * Returns the row over which the TreeCursor is positioned.
+ * 
+ * @return the item for the current position, or <code>null</code> if none
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public TreeItem getRow() {
+	checkWidget();
+	return row;
+}
+
+void keyDown(Event event) {
+	if (row == null) return;
+	switch (event.character) {
+		case SWT.CR:
+			notifyListeners(SWT.DefaultSelection, new Event());
+			return;
+	}
+	switch (event.keyCode) {
+		case SWT.ARROW_UP:
+			TreeItem previousItem = getPreviousItem(row);
+			if (previousItem != null) {
+				setRowColumn(previousItem, column, true);
+			}
+			break;
+		case SWT.ARROW_DOWN:
+			TreeItem nextItem = getNextItem(row);
+			if (nextItem != null) {
+				setRowColumn(nextItem, column, true);
+			}
+			break;
+		case SWT.ARROW_LEFT:
+		case SWT.ARROW_RIGHT: {
+			if ((event.stateMask & SWT.MOD1) != 0) {
+				row.setExpanded (event.keyCode == SWT.ARROW_RIGHT);
+				break;
+			}
+			int columnCount = tree.getColumnCount();
+			if (columnCount == 0) break;
+			int columnIndex = column == null ? 0 : tree.indexOf(column);
+			int[] columnOrder = tree.getColumnOrder();
+			int index = 0;
+			while (index < columnOrder.length) {
+				if (columnOrder[index] == columnIndex) break;
+				index++;
+			}
+			if (index == columnOrder.length) index = 0;
+			int leadKey = (getStyle() & SWT.RIGHT_TO_LEFT) != 0 ? SWT.ARROW_RIGHT : SWT.ARROW_LEFT;
+			TreeItem parentRow = row.getParentItem();
+			int rowIndex = tree.indexOf(row);
+			if (event.keyCode == leadKey) {
+				if (parentRow != null) {
+					setRowColumn(row, tree.getColumn(columnOrder[Math.max(0, index - 1)]), true);
+				} else {
+					setRowColumn(rowIndex, columnOrder[Math.max(0, index - 1)], true);
+				}
+			} else {
+				if (parentRow != null) {
+					setRowColumn(row, tree.getColumn(columnOrder[Math.min(columnCount - 1, index + 1)]), true);
+				} else {
+					setRowColumn(rowIndex, columnOrder[Math.min(columnCount - 1, index + 1)], true);
+				}
+			}
+			break;
+		}
+		case SWT.HOME:
+			int columnIndex = column == null ? 0 : tree.indexOf(column);
+			setRowColumn(0, columnIndex, true);
+			break;
+		case SWT.END: {
+			TreeItem[] items = tree.getItems();
+			setRowColumn(getLastVisibleItem(items), column, true);
+			break;
+		}
+		case SWT.PAGE_UP: {
+			Rectangle rect = tree.getClientArea();
+			Rectangle itemRect = tree.getTopItem().getBounds();
+			TreeItem item = row;
+			int index = findIndex(tree.getItems(), item);
+			int itemHeight = tree.getItemHeight();
+			rect.height -= itemRect.y;
+			int page = Math.max(1, rect.height / itemHeight);
+			if (index - page <= 0) {
+				TreeItem first = tree.getItem(0);
+				setRowColumn(first, column, true);
+				break;
+			}
+			for (int i = 0; i < page; i++) {
+				item = getPreviousItem(item);
+			}
+			setRowColumn(item, column, true);
+			break;
+		}
+		case SWT.PAGE_DOWN: {
+			Rectangle rect = tree.getClientArea();
+			Rectangle itemRect = tree.getTopItem().getBounds();
+			TreeItem item = row;
+			int index = findIndex(tree.getItems(), item);
+			int height = tree.getItemHeight();
+			rect.height -= itemRect.y;
+			TreeItem last = getLastVisibleItem(tree.getItems());
+			int page = Math.max(1, rect.height / height);
+			int end = findIndex(tree.getItems(), last);
+			if (end <= index + page) {
+				setRowColumn(last, column, true);
+				break;
+			}
+			for (int i = 0; i < page; i++) {
+				item = getNextItem(item);
+			}
+			setRowColumn(item, column, true);
+			break;
+		}
+	}
+}
+
+void onDispose(Event event) {
+	removeListener(SWT.Dispose, listener);
+	notifyListeners(SWT.Dispose, event);
+	event.type = SWT.None;
+
+	tree.removeListener(SWT.Collapse, treeListener);
+	tree.removeListener(SWT.Expand, treeListener);
+	tree.removeListener(SWT.FocusIn, treeListener);
+	tree.removeListener(SWT.MouseDown, treeListener);
+	unhookRowColumnListeners();
+	ScrollBar hBar = tree.getHorizontalBar();
+	if (hBar != null) {
+		hBar.removeListener(SWT.Selection, resizeListener);
+	}
+	ScrollBar vBar = tree.getVerticalBar();
+	if (vBar != null) {
+		vBar.removeListener(SWT.Selection, resizeListener);
+	}
+}
+
+void paint(Event event) {
+	if (row == null) return;
+	int columnIndex = column == null ? 0 : tree.indexOf(column);
+	int orderedIndex = columnIndex;
+	int[] columnOrder = tree.getColumnOrder();
+	for (int i = 0; i < columnOrder.length; i++) {
+		if (columnOrder[i] == columnIndex) {
+			orderedIndex = i;
+			break;
+		}
+	}
+	GC gc = event.gc;
+	gc.setBackground(getBackground());
+	gc.setForeground(getForeground());
+	gc.fillRectangle(event.x, event.y, event.width, event.height);
+	Image image = row.getImage(columnIndex);
+	int x = 0;
+	// Temporary code - need a better way to determine trim
+	String platform = SWT.getPlatform();
+	if (image != null) {
+		if ("win32".equals(platform)) { //$NON-NLS-1$
+			if (orderedIndex > 0) { 
+				x += 2;
+			}
+		} else {
+			x += 2;
+		}
+	}
+	Point size = getSize();
+	if (image != null) {
+		Rectangle imageSize = image.getBounds();
+		int imageY = (size.y - imageSize.height) / 2;
+		gc.drawImage(image, x, imageY);
+		x += imageSize.width;
+	}
+	String text = row.getText(columnIndex);
+	if (text.length() > 0) {
+		Rectangle bounds = row.getBounds(columnIndex);
+		Point extent = gc.stringExtent(text);
+		// Temporary code - need a better way to determine trim
+		if ("win32".equals(platform)) { //$NON-NLS-1$
+			if (tree.getColumnCount() == 0 || orderedIndex == 0) {
+				x += image == null ? 2 : 5;
+			} else {
+				int alignmnent = column.getAlignment();
+				switch (alignmnent) {
+					case SWT.LEFT:
+						x += image == null ? 5 : 3;
+						break;
+					case SWT.RIGHT:
+						x = bounds.width - extent.x - 2;
+						break;
+					case SWT.CENTER:
+						x += Math.ceil((bounds.width - x - extent.x) / 2.0);
+						break;
+				}
+			}
+		} else {
+			if (tree.getColumnCount() == 0) {
+				x += image == null ? 4 : 3;
+			} else {
+				int alignmnent = column.getAlignment();
+				switch (alignmnent) {
+					case SWT.LEFT:
+						x += image == null ? 5 : 3;
+						break;
+					case SWT.RIGHT:
+						x = bounds.width - extent.x - 2;
+						break;
+					case SWT.CENTER:
+						x += (bounds.width - x - extent.x) / 2 + 2;
+						break;
+				}
+			}
+		}
+		int textY = (size.y - extent.y) / 2;
+		gc.drawString(text, x, textY);
+	}
+	if (isFocusControl()) {
+		Display display = getDisplay();
+		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
+		gc.drawFocus(0, 0, size.x, size.y);
+	}
+}
+
+/**
+ * Removes the listener from the collection of listeners who will be notified when the
+ * receiver's selection changes.
+ * 
+ * @param listener the listener which should no longer be notified
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see SelectionListener
+ * @see #addSelectionListener(SelectionListener)
+ */
+public void removeSelectionListener(SelectionListener listener) {
+	checkWidget();
+	if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	removeListener(SWT.Selection, listener);
+	removeListener(SWT.DefaultSelection, listener);
+}
+
+void _resize() {
+	if (row == null) {
+		setBounds(-200, -200, 0, 0);
+	} else {
+		int columnIndex = column == null ? 0 : tree.indexOf(column);
+		setBounds(row.getBounds(columnIndex));
+	}
+}
+
+/**
+ * Sets the receiver's background color to the color specified
+ * by the argument, or to the default system color for the control
+ * if the argument is null.
+ * <p>
+ * Note: This operation is a hint and may be overridden by the platform.
+ * For example, on Windows the background of a Button cannot be changed.
+ * </p>
+ * @param color the new color (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setBackground (Color color) {
+	background = color;
+	super.setBackground(getBackground());
+	redraw();
+}
+/**
+ * Sets the receiver's foreground color to the color specified
+ * by the argument, or to the default system color for the control
+ * if the argument is null.
+ * <p>
+ * Note: This operation is a hint and may be overridden by the platform.
+ * </p>
+ * @param color the new color (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setForeground (Color color) {
+	foreground = color;
+	super.setForeground(getForeground());
+	redraw();
+}
+
+void setRowColumn(int row, int column, boolean notify) {
+	TreeItem item = row == -1 ? null : tree.getItem(row);
+	TreeColumn col = column == -1 || tree.getColumnCount() == 0 ? null : tree.getColumn(column);
+	setRowColumn(item, col, notify);
+}
+
+void setRowColumn(TreeItem row, TreeColumn column, boolean notify) {
+	if (this.row != null && this.row != row) {
+		TreeItem currentItem = this.row;
+		while (currentItem != null) {
+			currentItem.removeListener(SWT.Dispose, disposeItemListener);
+			currentItem = currentItem.getParentItem();
+		}
+		this.row = null;
+	}
+	if (this.column != null && this.column != column) {
+		this.column.removeListener(SWT.Dispose, disposeColumnListener);
+		this.column.removeListener(SWT.Move, resizeListener);
+		this.column.removeListener(SWT.Resize, resizeListener);
+		this.column = null;
+	}
+	if (row != null) {
+		if (this.row != row) {
+			this.row = row;
+			TreeItem currentItem = row;
+			while (currentItem != null) {
+				currentItem.addListener(SWT.Dispose, disposeItemListener);
+				currentItem = currentItem.getParentItem();
+			}
+			tree.showItem(row);
+		}
+		if (this.column != column && column != null) {
+			this.column = column;
+			column.addListener(SWT.Dispose, disposeColumnListener);
+			column.addListener(SWT.Move, resizeListener);
+			column.addListener(SWT.Resize, resizeListener);
+			tree.showColumn(column);
+		}
+		int columnIndex = column == null ? 0 : tree.indexOf(column);
+		setBounds(row.getBounds(columnIndex));
+		redraw();
+		if (notify) notifyListeners(SWT.Selection, new Event());
+	}
+}
+
+/**
+ * Positions the TreeCursor over the root-level cell at the given row and column in the parent tree.
+ * 
+ * @param row the index of the root-level row for the cell to select
+ * @param column the index of column for the cell to select
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setSelection(int row, int column) {
+	checkWidget();
+	int columnCount = tree.getColumnCount();
+	int maxColumnIndex = columnCount == 0 ? 0 : columnCount - 1;
+	if (row < 0 || row >= tree.getItemCount() || column < 0 || column > maxColumnIndex) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+	setRowColumn(row, column, false);
+}
+
+/**
+ * Positions the TreeCursor over the cell at the given row and column in the parent tree.
+ * 
+ * @param row the TreeItem of the row for the cell to select
+ * @param column the index of column for the cell to select
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setSelection(TreeItem row, int column) {
+	checkWidget();
+	int columnCount = tree.getColumnCount();
+	int maxColumnIndex = columnCount == 0 ? 0 : columnCount - 1;
+	if (row == null || row.isDisposed() || column < 0 || column > maxColumnIndex) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+	TreeColumn col = tree.getColumnCount() == 0 ? null : tree.getColumn(column);
+	setRowColumn(row, col, false);
+}
+
+public void setVisible(boolean visible) {
+	checkWidget();
+	if (visible) {
+		_resize();
+	}
+	super.setVisible(visible);
+}
+
+void treeCollapse(Event event) {
+	if (row == null) return;
+	TreeItem root = (TreeItem)event.item;
+	TreeItem parentItem = row.getParentItem();
+	while (parentItem != null) {
+		if (parentItem == root) {
+			setRowColumn(root, column, true);
+			return;
+		}
+		parentItem = parentItem.getParentItem();
+	}
+	
+	getDisplay().asyncExec(new Runnable() {
+		public void run() {
+			if (isDisposed()) return;
+			setRowColumn(row, column, true);
+		}
+	});
+}
+
+void treeExpand(Event event) {
+	getDisplay().asyncExec(new Runnable() {
+		public void run() {
+			if (isDisposed()) return;
+			setRowColumn(row, column, true);
+		}
+	});
+}
+
+void treeFocusIn(Event event) {
+	if (isVisible()) {
+		if (row == null && column == null) return;
+		setFocus();
+	}
+}
+
+void treeMouseDown(Event event) {
+	if (tree.getItemCount() == 0) return;
+	Point pt = new Point(event.x, event.y);
+	TreeItem item = tree.getItem(pt);
+	if (item == null && (tree.getStyle() & SWT.FULL_SELECTION) == 0) {
+		TreeItem currentItem = tree.getTopItem();
+		TreeItem parentItem = currentItem.getParentItem();
+		while (parentItem != null) {
+			currentItem = parentItem;
+			parentItem = currentItem.getParentItem();
+		}
+		int start = tree.indexOf(currentItem);
+		int viewportItemCount = tree.getClientArea().height / tree.getItemHeight();
+		int end = Math.min(start + viewportItemCount, tree.getItemCount() - 1);
+		TreeItem[] allItems = tree.getItems();
+		TreeItem[] items = new TreeItem[end - start + 1];
+		System.arraycopy(allItems, start, items, 0, end - start + 1);
+		item = findItem(items, pt);
+	}
+	if (item == null) return;
+
+	TreeColumn newColumn = null;
+	int lineWidth = tree.getLinesVisible() ? tree.getGridLineWidth() : 0;
+	int columnCount = tree.getColumnCount();
+	if (columnCount > 0) {
+		for (int i = 0; i < columnCount; i++) {
+			Rectangle rect = item.getBounds(i);
+			rect.width += lineWidth;
+			rect.height += lineWidth;
+			if (rect.contains(pt)) {
+				newColumn = tree.getColumn(i);
+				break;
+			}
+		}
+		if (newColumn == null) {
+			newColumn = tree.getColumn(0);
+		}
+	}
+	setRowColumn(item, newColumn, true);
+	setFocus();
+}
+
+void unhookRowColumnListeners() {
+	if (column != null && !column.isDisposed()) {
+		column.removeListener(SWT.Dispose, disposeColumnListener);
+		column.removeListener(SWT.Move, resizeListener);
+		column.removeListener(SWT.Resize, resizeListener);
+	}
+	column = null;
+	if (row != null && !row.isDisposed()) {
+		TreeItem currentItem = row;
+		while (currentItem != null) {
+			currentItem.removeListener(SWT.Dispose, disposeItemListener);
+			currentItem = currentItem.getParentItem();
+		}
+	}
+	row = null;
+}
+
+}
Index: org/eclipse/swt/custom/TableEditor.java
===================================================================
--- org/eclipse/swt/custom/TableEditor.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/custom/TableEditor.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -113,7 +113,7 @@
 	Rectangle rect = item.getImageBounds(column);
 	if (rect.width != 0) {
 		int imageGap = Math.max(rect.x - cell.x, 0);
-		cell.x = rect.x + rect.width;
+	cell.x = rect.x + rect.width;
 		cell.width -= (imageGap + rect.width);
 	}
 	Rectangle area = table.getClientArea();
Index: org/eclipse/swt/internal/image/TIFFFileFormat.java
===================================================================
--- org/eclipse/swt/internal/image/TIFFFileFormat.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/image/TIFFFileFormat.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -54,8 +54,8 @@
 			(header[4] & 0xFF) | ((header[5] & 0xFF) << 8) | ((header[6] & 0xFF) << 16) | ((header[7] & 0xFF) << 24) :
 			(header[7] & 0xFF) | ((header[6] & 0xFF) << 8) | ((header[5] & 0xFF) << 16) | ((header[4] & 0xFF) << 24);
 		while (offset != 0) {
-			file.seek(offset);
-			TIFFDirectory directory = new TIFFDirectory(file, isLittleEndian, loader);
+		file.seek(offset);
+		TIFFDirectory directory = new TIFFDirectory(file, isLittleEndian, loader);
 			int [] nextIFDOffset = new int[1];
 			ImageData image = directory.read(nextIFDOffset);
 			offset = nextIFDOffset[0];
Index: org/eclipse/swt/internal/image/PngEncoder.java
===================================================================
--- org/eclipse/swt/internal/image/PngEncoder.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/image/PngEncoder.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -317,15 +317,15 @@
 				if (colorType == 6) {
 					lineBytes[offset++] = alphaData[x];
 				}
+				
+				}
 			
-			}
-			
 			os.write(lineBytes);
 			
+			}
+		
 		}
 	
-	}
-	
 	os.flush();
 	os.close();
 	
@@ -332,7 +332,7 @@
 	byte[] compressed = baos.toByteArray();
 	if (os == baos) {
 		/* Use PngDeflater for J2ME. */
-		PngDeflater deflater = new PngDeflater();
+	PngDeflater deflater = new PngDeflater();
 		compressed = deflater.deflate(compressed);
 	}
 	
Index: org/eclipse/swt/internal/image/PNGFileFormat.java
===================================================================
--- org/eclipse/swt/internal/image/PNGFileFormat.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/image/PNGFileFormat.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -280,7 +280,7 @@
 					System.arraycopy(data, y * srcBytesPerLine, imageData.data, y * destBytesPerLine, srcBytesPerLine);
 				}
 			} else {
-				imageData.data = data;
+			imageData.data = data;
 			}
 			break;
 	}
Index: org/eclipse/swt/internal/Library.java
===================================================================
--- org/eclipse/swt/internal/Library.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/Library.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -40,7 +40,7 @@
 
 	static final String SEPARATOR;
 	static final String DELIMITER;
-	
+
 	/* 64-bit support */
 	static final boolean IS_64 = longConst() == (int /*long*/)longConst();
 	static final String SUFFIX_64 = "-64";	//$NON-NLS-1$
@@ -257,12 +257,12 @@
 	if (prop == null) prop = System.getProperty ("com.ibm.vm.bitmode"); //$NON-NLS-1$
 	if (prop != null) {
 		if ("32".equals (prop) && IS_64) { //$NON-NLS-1$
-			throw new UnsatisfiedLinkError ("Cannot load 64-bit SWT libraries on 32-bit JVM"); //$NON-NLS-1$
-		}
+				throw new UnsatisfiedLinkError ("Cannot load 64-bit SWT libraries on 32-bit JVM"); //$NON-NLS-1$
+			 }
 		if ("64".equals (prop) && !IS_64) { //$NON-NLS-1$
-			throw new UnsatisfiedLinkError ("Cannot load 32-bit SWT libraries on 64-bit JVM"); //$NON-NLS-1$
+				throw new UnsatisfiedLinkError ("Cannot load 32-bit SWT libraries on 64-bit JVM"); //$NON-NLS-1$
+			}		
 		}
-	}
 	
 	/* Compute the library name and mapped name */
 	String libName1, libName2, mappedName1, mappedName2;
@@ -301,7 +301,7 @@
 	/* Try loading library from java library path */
 	if (load (libName1, message)) return;
 	if (mapName && load (libName2, message)) return;
-
+	
 	/* Try loading library from the tmp directory if swt library path is not specified */
 	String fileName1 = mappedName1;
 	String fileName2 = mappedName2;
Index: org/eclipse/swt/internal/gtk/GdkEventAny.java
===================================================================
--- org/eclipse/swt/internal/gtk/GdkEventAny.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gtk/GdkEventAny.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -8,7 +8,7 @@
  * the LGPL accompanying this distribution and there is any conflict
  * between the two license versions, the terms of the LGPL accompanying
  * this distribution shall govern.
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
Index: org/eclipse/swt/internal/gtk/GdkEventKey.java
===================================================================
--- org/eclipse/swt/internal/gtk/GdkEventKey.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gtk/GdkEventKey.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -33,6 +33,6 @@
 	/** @field cast=(guint16) */
 	public short hardware_keycode;
     /** @field cast=(guint8) */
-	public byte group;
+    public byte group;
    	public static final int sizeof = OS.GdkEventKey_sizeof();
 }
Index: org/eclipse/swt/internal/gtk/OS.java
===================================================================
--- org/eclipse/swt/internal/gtk/OS.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gtk/OS.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -8,9 +8,10 @@
  * the LGPL accompanying this distribution and there is any conflict
  * between the two license versions, the terms of the LGPL accompanying
  * this distribution shall govern.
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     QFS GmbH - Accessibility/Testing hooks (see <QFS>)
  *******************************************************************************/
 package org.eclipse.swt.internal.gtk;
 
@@ -19,13 +20,19 @@
 
 public class OS extends C {
 	static {
+            // <QFS> Try to use extended library
+            try {
+		Library.loadLibrary("qfswt");
+            } catch (UnsatisfiedLinkError ex) {
 		Library.loadLibrary("swt-pi");
+            }
+            // </QFS>
 	}
-	
+
 	/** OS Constants */
 	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, BIG_ENDIAN;
 	static {
-		
+
 		/* Initialize the OS flags and locale constants */
 		String osName = System.getProperty ("os.name");
 		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false;
@@ -35,7 +42,7 @@
 		if (osName.equals ("SunOS")) isSunOS = true;
 		if (osName.equals ("HP-UX")) isHPUX = true;
 		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX;
-		
+
 		byte[] buffer = new byte[4];
 		int /*long*/ ptr = OS.malloc(4);
 		OS.memmove(ptr, new int[]{1}, 4);
@@ -225,7 +232,7 @@
 	public static final int GDK_SB_H_DOUBLE_ARROW = 0x6c;
 	public static final int GDK_SB_UP_ARROW = 0x72;
 	public static final int GDK_SB_V_DOUBLE_ARROW = 0x74;
-	public static final int GDK_SCROLL_UP = 0; 
+	public static final int GDK_SCROLL_UP = 0;
 	public static final int GDK_SCROLL_DOWN = 1;
 	public static final int GDK_SCROLL_LEFT = 2;
 	public static final int GDK_SCROLL_RIGHT = 3;
@@ -249,7 +256,7 @@
 	public static final int GDK_XOR = 0x2;
 	public static final int GDK_XTERM = 0x98;
 	public static final int GDK_X_CURSOR = 0x0;
-	public static final int GDK_VISIBILITY_NOTIFY = 29; 	 
+	public static final int GDK_VISIBILITY_NOTIFY = 29;
 	public static final int GDK_VISIBILITY_FULLY_OBSCURED = 2;
 	public static final int GDK_VISIBILITY_NOTIFY_MASK = 1 << 17;
 	public static final int GDK_WINDOW_CHILD = 2;
@@ -378,7 +385,7 @@
 	public static final int GTK_TOOLBAR_ICONS = 0;
 	public static final int GTK_TOOLBAR_TEXT = 1;
 	public static final int GTK_TOOLBAR_BOTH = 2;
-	public static final int GTK_TOOLBAR_BOTH_HORIZ = 3;	
+	public static final int GTK_TOOLBAR_BOTH_HORIZ = 3;
 	public static final int GTK_TREE_VIEW_COLUMN_GROW_ONLY = 0;
 	public static final int GTK_TREE_VIEW_COLUMN_AUTOSIZE = 1;
 	public static final int GTK_TREE_VIEW_COLUMN_FIXED = 2;
@@ -413,7 +420,7 @@
 	public static final int G_LOG_LEVEL_MASK = 0xfffffffc;
 	public static final int G_APP_INFO_CREATE_NONE = 0;
 	public static final int G_APP_INFO_CREATE_NEEDS_TERMINAL = (1 << 0);
-	public static final int G_APP_INFO_CREATE_SUPPORTS_URIS  = (1 << 1); 
+	public static final int G_APP_INFO_CREATE_SUPPORTS_URIS  = (1 << 1);
 	public static final int None = 0;
 	public static final int PANGO_ALIGN_LEFT = 0;
 	public static final int PANGO_ALIGN_CENTER = 1;
@@ -423,7 +430,7 @@
 	public static final int PANGO_ATTR_UNDERLINE = 11;
 	public static final int PANGO_ATTR_UNDERLINE_COLOR = 18;
 	public static final int PANGO_DIRECTION_LTR = 0;
-	public static final int PANGO_DIRECTION_RTL = 1;	
+	public static final int PANGO_DIRECTION_RTL = 1;
 	public static final int PANGO_SCALE = 1024;
 	public static final int PANGO_STRETCH_ULTRA_CONDENSED = 0x0;
 	public static final int PANGO_STRETCH_EXTRA_CONDENSED = 0x1;
@@ -456,7 +463,7 @@
 	public static final int X_OK = 0x01;
 	public static final int XA_CARDINAL = 6;
 	public static final int XA_WINDOW = 33;
-	
+
 	/** Signals */
 	public static final byte[] activate = ascii("activate");
 	public static final byte[] backspace = ascii("backspace");
@@ -539,7 +546,7 @@
 	public static final byte[] value_changed = ascii("value-changed");
 	public static final byte[] visibility_notify_event = ascii("visibility-notify-event");
 	public static final byte[] window_state_event = ascii("window-state-event");
-	
+
 	/** Properties */
 	public static final byte[] active = ascii("active");
 	public static final byte[] background_gdk = ascii("background-gdk");
@@ -579,9 +586,11 @@
 	public static final byte[] GTK_STOCK_FIND = ascii("gtk-find");
 	public static final byte[] GTK_STOCK_CANCEL = ascii("gtk-cancel");
 	public static final byte[] GTK_STOCK_CLEAR = ascii("gtk-clear");
-	
-	public static final int GTK_VERSION = VERSION(gtk_major_version(), gtk_minor_version(), gtk_micro_version()); 
-	public static final boolean USE_CAIRO, INIT_CAIRO;
+
+	public static final int GTK_VERSION = VERSION(gtk_major_version(), gtk_minor_version(), gtk_micro_version());
+    // <QFS> non-final, we may need to temporarily override it to work around a Cairo bug
+        public static boolean USE_CAIRO, INIT_CAIRO;
+    // </QFS>
 	static {
 		boolean useCairo = false;
 		if (!"false".equals(System.getProperty("org.eclipse.swt.internal.gtk.cairoGraphics"))) {
@@ -594,7 +603,7 @@
 		}
 		INIT_CAIRO = initCairo;
 	}
-	
+
 protected static byte [] ascii (String name) {
 	int length = name.length ();
 	char [] chars = new char [length];
@@ -683,7 +692,7 @@
 
 /** @param object_class cast=(GObjectClass *) */
 public static final native int /*long*/ G_OBJECT_CLASS_CONSTRUCTOR(int /*long*/ object_class);
-/** 
+/**
  * @param object_class cast=(GObjectClass *)
  * @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))
  */
@@ -1253,7 +1262,7 @@
  * @param screen cast=(GdkScreen *)
  */
 public static final native int /*long*/ _gdk_x11_screen_get_window_manager_name(int /*long*/ screen);
-public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {	
+public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {
 	lock.lock();
 	try {
 		return _gdk_x11_screen_get_window_manager_name(screen);
@@ -2823,7 +2832,7 @@
  */
 public static final native void _g_object_notify (int /*long*/ object, byte[] property_name);
 public static final void g_object_notify (int /*long*/ object, byte[] property_name) {
-	lock.lock(); 
+	lock.lock();
 	try {
 		_g_object_notify(object, property_name);
 	} finally {
@@ -3280,7 +3289,7 @@
 public static final native int _GString_len(int /*long*/ string);
 public static final int GString_len(int /*long*/ string) {
 	lock.lock();
-	try { 
+	try {
 		return _GString_len(string);
 	} finally {
 		lock.unlock();
@@ -3293,7 +3302,7 @@
 public static final native int /*long*/ _GString_str(int /*long*/ string);
 public static final int /*long*/ GString_str(int /*long*/ string) {
 	lock.lock();
-	try { 
+	try {
 		return _GString_str(string);
 	} finally {
 		lock.unlock();
@@ -3747,12 +3756,12 @@
  */
 public static final native boolean _gdk_color_parse(byte[] spec, GdkColor color);
 public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
-	lock.lock();
-	try {
+        lock.lock();
+        try {
 		return _gdk_color_parse(spec, color);
 	} finally {
-		lock.unlock();
-	}
+                lock.unlock();
+        }
 }
 /**
  * @param colormap cast=(GdkColormap *)
@@ -4478,8 +4487,8 @@
 		lock.unlock();
 	}
 }
-/** 
- * @method flags=dynamic 
+/**
+ * @method flags=dynamic
  */
 public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
 public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
@@ -4585,7 +4594,7 @@
 	}
 }
 /**
- * @method flags=dynamic 
+ * @method flags=dynamic
  * @param context cast=(PangoContext *)
  * @param colormap cast=(GdkColormap *)
  */
@@ -4749,7 +4758,7 @@
  * @param filename cast=(const char *)
  * @param error cast=(GError**)
  */
-public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error); 
+public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error);
 public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error) {
 	lock.lock();
 	try {
@@ -5297,7 +5306,7 @@
 	}
 }
 /**
- * @method flags=dynamic 
+ * @method flags=dynamic
  * @param window cast=(GdkWindow *)
  */
 public static final native int /*long*/ _gdk_window_create_similar_surface(int /*long*/ window, int content, int width, int height);
@@ -5606,7 +5615,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @method flags=dynamic
  * @param window cast=(GdkWindow *)
  * @param sibling cast=(GdkWindow *)
@@ -5674,7 +5683,7 @@
 }
 /** @param setting cast=(gboolean) */
 public static final native void _gdk_window_set_debug_updates(boolean setting);
-public static final void gdk_window_set_debug_updates(boolean setting) {	
+public static final void gdk_window_set_debug_updates(boolean setting) {
 	lock.lock();
 	try {
 		_gdk_window_set_debug_updates(setting);
@@ -7942,7 +7951,7 @@
 	}
 }
 /** @param pixbuf cast=(GdkPixbuf *) */
-public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf); 
+public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf);
 public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf) {
 	lock.lock();
 	try {
@@ -8339,8 +8348,8 @@
 	}
 }
 /**
- * @method flags=dynamic 
- * @param menu_item cast=(GtkMenuItem *) 
+ * @method flags=dynamic
+ * @param menu_item cast=(GtkMenuItem *)
  */
 public static final native void _gtk_menu_item_remove_submenu(int /*long*/ menu_item);
 public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
@@ -10173,9 +10182,9 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param spin_button cast=(GtkSpinButton*)
- * @param adjustment cast=(GtkAdjustment *) 
+ * @param adjustment cast=(GtkAdjustment *)
  **/
 public static final native void _gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits);
 public static final void gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits) {
@@ -11234,7 +11243,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param button cast=(GtkToolButton *)
  * @param widget cast=(GtkWidget *)
  */
@@ -11247,7 +11256,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param button cast=(GtkToolButton *)
  * @param label cast=(const gchar *)
  */
@@ -11273,7 +11282,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param item cast=(GtkToolButton *)
  * @param underline cast=(gboolean)
  */
@@ -11286,10 +11295,10 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param item cast=(GtkToolItem *)
  * @param menu_id cast=(const gchar *)
- */ 
+ */
 public static final native int /*long*/ _gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id);
 public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id) {
 	lock.lock();
@@ -11309,7 +11318,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param item cast=(GtkToolItem *)
  * @param important cast=(gboolean)
  */
@@ -11322,7 +11331,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param item cast=(GtkToolItem *)
  * @param menu_id cast=(const gchar *)
  * @param widget cast=(GtkWidget *)
@@ -11388,7 +11397,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param toolbar cast=(GtkToolbar *)
  * @param show_arrow cast=(gboolean)
  */
@@ -11401,7 +11410,7 @@
 		lock.unlock();
 	}
 }
-/** @param toolbar cast=(GtkToolbar *) 
+/** @param toolbar cast=(GtkToolbar *)
  * @param style cast=(GtkToolbarStyle)
  */
 public static final native void _gtk_toolbar_set_style(int /*long*/ toolbar, int style);
@@ -12108,9 +12117,9 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @method flags=dynamic
- * @param tree_column cast=(GtkTreeViewColumn *) 
+ * @param tree_column cast=(GtkTreeViewColumn *)
  */
 public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);
 public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {
@@ -12707,7 +12716,7 @@
 	} finally {
 		lock.unlock();
 	}
-} 
+}
 /**
  * @method flags=dynamic
  * @param tree_view cast=(GtkTreeView*)
@@ -12780,9 +12789,9 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @method flags=dynamic
- * @param tree_view cast=(GtkTreeView *) 
+ * @param tree_view cast=(GtkTreeView *)
  */
 public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
 public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
@@ -12793,9 +12802,9 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @method flags=dynamic
- * @param tree_view cast=(GtkTreeView *) 
+ * @param tree_view cast=(GtkTreeView *)
  */
 public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(int /*long*/ tree_view, int bx, int by, int[] tx, int[] ty);
 public static final void gtk_tree_view_convert_bin_window_to_tree_coords(int /*long*/ tree_view, int bx, int by, int[] tx, int[] ty) {
@@ -13329,7 +13338,7 @@
 	} finally {
 		lock.unlock();
 	}
-} 
+}
 /**
  * @param widget cast=(GtkWidget *)
  * @param dir cast=(GtkTextDirection)
@@ -13888,7 +13897,7 @@
  * @param list cast=(GList *)
  */
 public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list);
-public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {	
+public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {
 	lock.lock();
 	try {
 		_gtk_window_set_icon_list(window, list);
@@ -13941,7 +13950,7 @@
  * @param parent_window cast=(GdkWindow *)
  */
 public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window);
-public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {	
+public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {
 	lock.lock();
 	try {
 		_gtk_widget_set_parent_window(widget, parent_window);
@@ -14295,6 +14304,63 @@
 		lock.unlock();
 	}
 }
+
+// <QFS>
+public static final native void memmove(XClientMessageEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, GdkEventCrossing src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, GdkEventKey src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, GdkEventFocus src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, GdkEventAny src, int /*long*/ size);
+public static final native int GDK_WINDOW_XID(int /*long*/ window);
+public static final native void gtk_menu_item_activate(int /*long*/ handle);
+public static final native void gtk_item_select(int /*long*/ handle);
+public static final native int gdk_x11_get_server_time(int /*long*/ handle);
+public static final native int gdk_window_get_size(int /*long*/ window, int[] x, int[] y);
+public static final native void gtk_dialog_response(int /*long*/ dialog, int result);
+public static final native int /*long*/ gdk_window_peek_children(int /*long*/ window);
+public static final native void _gtk_menu_popup_fake_xgrab(int /*long*/ window);
+public static final void gtk_menu_popup_fake_xgrab(int /*long*/ menu) {
+	lock.lock();
+	try {
+		_gtk_menu_popup_fake_xgrab(menu);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native void _gtk_menu_item_activate_item(int /*long*/ menu_item);
+public static final void gtk_menu_item_activate_item(int /*long*/ menu_item) {
+	lock.lock();
+	try {
+                _gtk_menu_item_activate_item(menu_item);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native void _gtk_menu_shell_activate_item(int /*long*/ menu_shell, int /*long*/ menu_item, boolean deactivate);
+public static final void gtk_menu_shell_activate_item(int /*long*/ menu_shell, int /*long*/ menu_item, boolean deactivate) {
+	lock.lock();
+	try {
+                _gtk_menu_shell_activate_item(menu_shell, menu_item, deactivate);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native void _gtk_menu_shell_deselect(int /*long*/ menu_shell);
+public static final void gtk_menu_shell_deselect(int /*long*/ menu_shell) {
+	lock.lock();
+	try {
+                _gtk_menu_shell_deselect(menu_shell);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native int _g_idle_add_full(int priority, int /*long*/ function, int /*long*/ data, int /*long*/ notify);
+public static final int g_idle_add_full(int priority, int /*long*/ function, int /*long*/ data, int /*long*/ notify) {
+        // No locking, g_idle_add_full is thread safe
+        return _g_idle_add_full(priority, function, data, notify);
+}
+// </QFS>
+
 /** @param desc cast=(const PangoFontDescription *) */
 public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc);
 public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
Index: org/eclipse/swt/internal/gtk/GdkEventMotion.java
===================================================================
--- org/eclipse/swt/internal/gtk/GdkEventMotion.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gtk/GdkEventMotion.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,42 +1,42 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
- * The contents of this file are made available under the terms
- * of the GNU Lesser General Public License (LGPL) Version 2.1 that
- * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
- * available at http://www.gnu.org/licenses/lgpl.html.  If the version
- * of the LGPL at http://www.gnu.org is different to the version of
- * the LGPL accompanying this distribution and there is any conflict
- * between the two license versions, the terms of the LGPL accompanying
- * this distribution shall govern.
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class GdkEventMotion extends GdkEvent {
-	/** @field cast=(GdkWindow *) */
-	public int /*long*/ window;
-	/** @field cast=(gint8) */
-	public byte send_event;
-	/** @field cast=(guint32) */
-	public int time;
-	/** @field cast=(gdouble) */
-	public double x;
-	/** @field cast=(gdouble) */
-	public double y;
-	/** @field cast=(gdouble *) */
-	public int /*long*/ axes;
-	/** @field cast=(guint) */
-	public int state;
-	/** @field cast=(gint16) */
-	public short is_hint;
-	/** @field cast=(GdkDevice *) */
-	public int /*long*/ device;
-	/** @field cast=(gdouble) */
-	public double x_root;
-	/** @field cast=(gdouble) */
-	public double y_root;
-	public static final int sizeof = OS.GdkEventMotion_sizeof();
-}
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+ * The contents of this file are made available under the terms
+ * of the GNU Lesser General Public License (LGPL) Version 2.1 that
+ * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+ * available at http://www.gnu.org/licenses/lgpl.html.  If the version
+ * of the LGPL at http://www.gnu.org is different to the version of
+ * the LGPL accompanying this distribution and there is any conflict
+ * between the two license versions, the terms of the LGPL accompanying
+ * this distribution shall govern.
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.gtk;
+
+
+public class GdkEventMotion extends GdkEvent {
+	/** @field cast=(GdkWindow *) */
+	public int /*long*/ window;
+	/** @field cast=(gint8) */
+	public byte send_event;
+	/** @field cast=(guint32) */
+	public int time;
+	/** @field cast=(gdouble) */
+	public double x;
+	/** @field cast=(gdouble) */
+	public double y;
+	/** @field cast=(gdouble *) */
+	public int /*long*/ axes;
+	/** @field cast=(guint) */
+	public int state;
+	/** @field cast=(gint16) */
+	public short is_hint;
+	/** @field cast=(GdkDevice *) */
+	public int /*long*/ device;
+	/** @field cast=(gdouble) */
+	public double x_root;
+	/** @field cast=(gdouble) */
+	public double y_root;
+	public static final int sizeof = OS.GdkEventMotion_sizeof();
+}
Index: org/eclipse/swt/internal/gtk/GdkDragContext.java
===================================================================
--- org/eclipse/swt/internal/gtk/GdkDragContext.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gtk/GdkDragContext.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -17,22 +17,22 @@
 
 public class GdkDragContext {     
    /** @field cast=(GdkDragProtocol) */
-	public int protocol;
+   public int protocol;
    /** @field cast=(gboolean) */
-	public boolean is_source;
+   public boolean is_source;
    /** @field cast=(GdkWindow *) */
-	public int /*long*/ source_window;
+   public int /*long*/ source_window;
    /** @field cast=(GdkWindow *) */
-	public int /*long*/ dest_window;
+   public int /*long*/ dest_window;
    /** @field cast=(GList *) */
-	public int /*long*/ targets;
+   public int /*long*/ targets;
    /** @field cast=(GdkDragAction) */
-	public int actions;
+   public int actions;
    /** @field cast=(GdkDragAction) */
-	public int suggested_action;
+   public int suggested_action;
    /** @field cast=(GdkDragAction) */
-	public int action; 
+   public int action; 
    /** @field cast=(guint32) */
-	public int start_time;
+   public int start_time;
    public static final int sizeof = OS.GdkDragContext_sizeof();
 }
Index: org/eclipse/swt/internal/BidiUtil.java
===================================================================
--- org/eclipse/swt/internal/BidiUtil.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/BidiUtil.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -94,7 +94,7 @@
  * Not implemented.
  */
 public static void removeLanguageListener(int /*long*/ hwnd) {
-}	
+}
 public static void removeLanguageListener (Control control) {
 }
 /*
Index: org/eclipse/swt/internal/accessibility/gtk/ATK.java
===================================================================
--- org/eclipse/swt/internal/accessibility/gtk/ATK.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/accessibility/gtk/ATK.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
 	static {
 		Library.loadLibrary("swt-atk");
 	}
-
+	
 	/** Constants */
 	public static final int ATK_RELATION_NULL = 0;
 	public static final int ATK_RELATION_CONTROLLED_BY = 1;
Index: org/eclipse/swt/internal/cairo/Cairo.java
===================================================================
--- org/eclipse/swt/internal/cairo/Cairo.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/cairo/Cairo.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -31,7 +31,7 @@
 	public static final int CAIRO_ANTIALIAS_DEFAULT = 0;
 	public static final int CAIRO_ANTIALIAS_NONE = 1;
 	public static final int CAIRO_ANTIALIAS_GRAY = 2;
-	public static final int CAIRO_ANTIALIAS_SUBPIXEL = 3;   
+	public static final int CAIRO_ANTIALIAS_SUBPIXEL = 3;
 	public static final int CAIRO_CONTENT_COLOR = 0x1000;
 	public static final int CAIRO_CONTENT_ALPHA = 0x2000;
 	public static final int CAIRO_CONTENT_COLOR_ALPHA = 0x3000;
Index: org/eclipse/swt/internal/gnome/GNOME.java
===================================================================
--- org/eclipse/swt/internal/gnome/GNOME.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/gnome/GNOME.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -268,7 +268,7 @@
 		lock.unlock();
 	}
 }
-/** 
+/**
  * @param mime_type cast=(const char *)
  * @param base_mime_type cast=(const char *) 
  */
Index: org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,67 +1,67 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2003, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMEventTarget extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	public static final String NS_IDOMEVENTTARGET_IID_STR =
-		"1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
-
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMEventTarget extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDOMEVENTTARGET_IID_STR =
+		"1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
+
 	public static final String NS_IDOMEVENTTARGET_10_IID_STR =
 		"1797d5a4-b12a-428d-9eef-a0e13839728c";
 	
-	public static final nsID NS_IDOMEVENTTARGET_IID =
-		new nsID(NS_IDOMEVENTTARGET_IID_STR);
-
+	public static final nsID NS_IDOMEVENTTARGET_IID =
+		new nsID(NS_IDOMEVENTTARGET_IID_STR);
+
 	public static final nsID NS_IDOMEVENTTARGET_10_IID =
 		new nsID(NS_IDOMEVENTTARGET_10_IID_STR);
 
-	public nsIDOMEventTarget(int /*long*/ address) {
-		super(address);
-	}
-
-	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+	public nsIDOMEventTarget(int /*long*/ address) {
+		super(address);
+	}
+
+	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
-	}
-
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
+	}
+
 	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture, int wantsUntrusted, int _argc) {
 		if (!IsXULRunner10) return AddEventListener(type, listener, useCapture);
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture, wantsUntrusted, _argc);
 	}
 
-	public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
-	}
-
-	public int DispatchEvent(int /*long*/ evt, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
-	}
-}
+	public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
+	}
+
+	public int DispatchEvent(int /*long*/ evt, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIIOService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIIOService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIIOService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -65,15 +65,15 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
 	}
 
-	public int GetOffline(int[] aOffline) {
+	public int GetOffline(int[] aOffline) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);
 	}
 
-	public int SetOffline(int aOffline) {
+	public int SetOffline(int aOffline) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);
 	}
 
-	public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {
+	public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
 	}
 
@@ -80,4 +80,4 @@
 	public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IX509CERTVALIDITY_IID =
 		new nsID(NS_IX509CERTVALIDITY_IID_STR);
 
-	public nsIX509CertValidity(int /*long*/ address) {
+	public  nsIX509CertValidity(int /*long*/ address) {
 		super(address);
 	}
 
@@ -72,4 +72,4 @@
 	public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsICookieService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICookieService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICookieService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
-
-public class nsICookieService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	public static final String NS_ICOOKIESERVICE_IID_STR =
-		"011c3190-1434-11d6-a618-0010a401eb10";
-
-	public static final nsID NS_ICOOKIESERVICE_IID =
-		new nsID(NS_ICOOKIESERVICE_IID_STR);
-
-	public nsICookieService(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
-	}
-
-	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
-	}
-
-	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
-	}
-
-	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
-	}
-
-	public int GetCookieIconIsVisible(int[] aCookieIconIsVisible) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCookieIconIsVisible);
-	}
-}
+
+public class nsICookieService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+	public static final String NS_ICOOKIESERVICE_IID_STR =
+		"011c3190-1434-11d6-a618-0010a401eb10";
+
+	public static final nsID NS_ICOOKIESERVICE_IID =
+		new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+	public nsICookieService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+	}
+
+	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+	}
+
+	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+	}
+
+	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+	}
+
+	public int GetCookieIconIsVisible(int[] aCookieIconIsVisible) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCookieIconIsVisible);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -57,11 +57,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
-	public int GetVisibility(int[] aVisibility) {
+	public int GetVisibility(int[] aVisibility) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
 	}
 
-	public int SetVisibility(int aVisibility) {
+	public int SetVisibility(int aVisibility) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
 	}
 
@@ -76,4 +76,4 @@
 	public int GetSiteWindow(int /*long*/[] aSiteWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDocShell.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDocShell.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDocShell.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -53,7 +53,7 @@
 		super(address);
 	}
 
-	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
 	}
 
@@ -61,7 +61,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
 	}
 
-	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
 	}
 
@@ -121,43 +121,43 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
 	}
 
-	public int GetAllowPlugins(int[] aAllowPlugins) {
+	public int GetAllowPlugins(int[] aAllowPlugins) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);
 	}
 
-	public int SetAllowPlugins(int aAllowPlugins) {
+	public int SetAllowPlugins(int aAllowPlugins) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);
 	}
 
-	public int GetAllowJavascript(int[] aAllowJavascript) {
+	public int GetAllowJavascript(int[] aAllowJavascript) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);
 	}
 
-	public int SetAllowJavascript(int aAllowJavascript) {
+	public int SetAllowJavascript(int aAllowJavascript) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);
 	}
 
-	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
+	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);
 	}
 
-	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
+	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);
 	}
 
-	public int GetAllowSubframes(int[] aAllowSubframes) {
+	public int GetAllowSubframes(int[] aAllowSubframes) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);
 	}
 
-	public int SetAllowSubframes(int aAllowSubframes) {
+	public int SetAllowSubframes(int aAllowSubframes) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);
 	}
 
-	public int GetAllowImages(int[] aAllowImages) {
+	public int GetAllowImages(int[] aAllowImages) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);
 	}
 
-	public int SetAllowImages(int aAllowImages) {
+	public int SetAllowImages(int aAllowImages) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAllowImages);
 	}
 
@@ -181,11 +181,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);
 	}
 
-	public int GetAllowAuth(int[] aAllowAuth) {
+	public int GetAllowAuth(int[] aAllowAuth) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);
 	}
 
-	public int SetAllowAuth(int aAllowAuth) {
+	public int SetAllowAuth(int aAllowAuth) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);
 	}
 
@@ -213,23 +213,23 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);
 	}
 
-	public int GetHasFocus(int[] aHasFocus) {
+	public int GetHasFocus(int[] aHasFocus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);
 	}
 
-	public int SetHasFocus(int aHasFocus) {
+	public int SetHasFocus(int aHasFocus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);
 	}
 
-	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
+	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);
 	}
 
-	public int SetCanvasHasFocus(int aCanvasHasFocus) {
+	public int SetCanvasHasFocus(int aCanvasHasFocus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);
 	}
 
-	public int TabToTreeOwner(int forward, int[] tookFocus) {
+	public int TabToTreeOwner(int forward, int[] tookFocus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), forward, tookFocus);
 	}
 
@@ -253,11 +253,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);
 	}
 
-	public int IsBeingDestroyed(int[] _retval) {
+	public int IsBeingDestroyed(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);
 	}
 
-	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
+	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
 	}
 
@@ -269,7 +269,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
 	}
 
-	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
+	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIURI.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIURI.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIURI.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -28,7 +28,7 @@
 package org.eclipse.swt.internal.mozilla;
 
 public class nsIURI extends nsISupports {
-	
+
 	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 32 : 26);
 
 	public static final String NS_IURI_IID_STR =
@@ -39,7 +39,7 @@
 
 	public static final nsID NS_IURI_IID =
 		new nsID(NS_IURI_IID_STR);
-	
+
 	public static final nsID NS_IURI_10_IID =
 			new nsID(NS_IURI_10_IID_STR);
 
@@ -123,11 +123,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
 	}
 
-	public int Equals(int /*long*/ other, int[] _retval) {
+	public int Equals(int /*long*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
 	}
 
-	public int SchemeIs(byte[] scheme, int[] _retval) {
+	public int SchemeIs(byte[] scheme, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
 	}
 
@@ -180,4 +180,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aHasRef);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsITooltipListener.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsITooltipListener.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsITooltipListener.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -48,4 +48,4 @@
 	public int OnHideTooltip() {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebProgress.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebProgress.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebProgress.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -64,7 +64,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
 	}
 
-	public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
+	public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsICookieManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICookieManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICookieManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -49,7 +49,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
 	}
 
-	public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
+	public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
 	}
 }
Index: org/eclipse/swt/internal/mozilla/nsISerializable.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISerializable.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISerializable.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -27,7 +27,7 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-public class nsISerializable extends nsISupports {
+public class  nsISerializable extends nsISupports {
 
 	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
 
@@ -37,7 +37,7 @@
 	public static final nsID NS_ISERIALIZABLE_IID =
 		new nsID(NS_ISERIALIZABLE_IID_STR);
 
-	public nsISerializable(int /*long*/ address) {
+	public  nsISerializable(int /*long*/ address) {
 		super(address);
 	}
 
@@ -48,4 +48,4 @@
 	public int Write(int /*long*/ aOutputStream) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDownload.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDownload.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDownload.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -92,4 +92,4 @@
 	public int SetObserver(int /*long*/ aObserver) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIFactory.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIFactory.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIFactory.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -45,7 +45,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
 	}
 
-	public int LockFactory(int lock) {
+	public int LockFactory(int lock) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsICategoryManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICategoryManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICategoryManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -45,11 +45,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
 	}
 
-	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
+	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
 	}
 
-	public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {
+	public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist);
 	}
 
@@ -64,4 +64,4 @@
 	public int EnumerateCategories(int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -53,11 +53,11 @@
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
@@ -73,7 +73,7 @@
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
 	}
 
-	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
+	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIFocusManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIFocusManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIFocusManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,137 +1,137 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFocusManager extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17);
-
-	public static final String NS_IFOCUSMANAGER_IID_STR =
-			"cd6040a8-243f-412a-8a16-0bf2aa1083b9";
-	
-	public static final String NS_IFOCUSMANAGER_10_IID_STR =
-			"51db277b-7ee7-4bce-9b84-fd2efcd2c8bd";
-
-	public static final nsID NS_IFOCUSMANAGER_IID =
-		new nsID(NS_IFOCUSMANAGER_IID_STR);
-	
-	public static final nsID NS_IFOCUSMANAGER_10_IID =
-			new nsID(NS_IFOCUSMANAGER_10_IID_STR);
-
-	public nsIFocusManager(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetActiveWindow(int /*long*/[] aActiveWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
-	}
-
-	public int SetActiveWindow(int /*long*/ aActiveWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
-	}
-
-	public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
-	}
-
-	public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
-	}
-
-	public int GetFocusedElement(int /*long*/[] aFocusedElement) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
-	}
-
-	public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
-	}
-
-	public int SetFocus(int /*long*/ aElement, int aFlags) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
-	}
-
-	public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
-	}
-
-	public int ClearFocus(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
-	}
-
-	public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
-	}
-
-	public int MoveCaretToFocus(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
-	}
-
-	public static final int FLAG_RAISE = 1;
-	public static final int FLAG_NOSCROLL = 2;
-	public static final int FLAG_NOSWITCHFRAME = 4;
-	public static final int FLAG_BYMOUSE = 4096;
-	public static final int FLAG_BYKEY = 8192;
-	public static final int FLAG_BYMOVEFOCUS = 16384;
-	public static final int MOVEFOCUS_FORWARD = 1;
-	public static final int MOVEFOCUS_BACKWARD = 2;
-	public static final int MOVEFOCUS_FORWARDDOC = 3;
-	public static final int MOVEFOCUS_BACKWARDDOC = 4;
-	public static final int MOVEFOCUS_FIRST = 5;
-	public static final int MOVEFOCUS_LAST = 6;
-	public static final int MOVEFOCUS_ROOT = 7;
-	public static final int MOVEFOCUS_CARET = 8;
-
-	public int WindowRaised(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
-	}
-
-	public int WindowLowered(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
-	}
-
-	public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
-	}
-
-	public int WindowShown(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
-	}
-
-	public int WindowHidden(int /*long*/ aWindow) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
-	}
-
-	public int FireDelayedEvents(int /*long*/ aDocument) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
-	}
-	
-	public int FocusPlugin(int /*long*/ aPlugin) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIFocusManager extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17);
+
+	public static final String NS_IFOCUSMANAGER_IID_STR =
+		"cd6040a8-243f-412a-8a16-0bf2aa1083b9";
+
+	public static final String NS_IFOCUSMANAGER_10_IID_STR =
+			"51db277b-7ee7-4bce-9b84-fd2efcd2c8bd";
+
+	public static final nsID NS_IFOCUSMANAGER_IID =
+		new nsID(NS_IFOCUSMANAGER_IID_STR);
+
+	public static final nsID NS_IFOCUSMANAGER_10_IID =
+			new nsID(NS_IFOCUSMANAGER_10_IID_STR);
+
+	public  nsIFocusManager(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetActiveWindow(int /*long*/[] aActiveWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
+	}
+
+	public int SetActiveWindow(int /*long*/ aActiveWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
+	}
+
+	public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
+	}
+
+	public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
+	}
+
+	public int GetFocusedElement(int /*long*/[] aFocusedElement) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
+	}
+
+	public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
+	}
+
+	public int SetFocus(int /*long*/ aElement, int aFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
+	}
+
+	public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
+	}
+
+	public int ClearFocus(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
+	}
+
+	public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
+	}
+
+	public int MoveCaretToFocus(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
+	}
+
+	public static final int FLAG_RAISE = 1;
+	public static final int FLAG_NOSCROLL = 2;
+	public static final int FLAG_NOSWITCHFRAME = 4;
+	public static final int FLAG_BYMOUSE = 4096;
+	public static final int FLAG_BYKEY = 8192;
+	public static final int FLAG_BYMOVEFOCUS = 16384;
+	public static final int MOVEFOCUS_FORWARD = 1;
+	public static final int MOVEFOCUS_BACKWARD = 2;
+	public static final int MOVEFOCUS_FORWARDDOC = 3;
+	public static final int MOVEFOCUS_BACKWARDDOC = 4;
+	public static final int MOVEFOCUS_FIRST = 5;
+	public static final int MOVEFOCUS_LAST = 6;
+	public static final int MOVEFOCUS_ROOT = 7;
+	public static final int MOVEFOCUS_CARET = 8;
+
+	public int WindowRaised(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
+	}
+
+	public int WindowLowered(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
+	}
+
+	public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
+	}
+
+	public int WindowShown(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
+	}
+
+	public int WindowHidden(int /*long*/ aWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
+	}
+
+	public int FireDelayedEvents(int /*long*/ aDocument) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
+	}
+	
+	public int FocusPlugin(int /*long*/ aPlugin) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/XPCOM.java
===================================================================
--- org/eclipse/swt/internal/mozilla/XPCOM.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/XPCOM.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -47,7 +47,7 @@
 	public static final String DOMEVENT_KEYDOWN = "keydown"; //$NON-NLS-1$
 	public static final String DOMEVENT_KEYPRESS = "keypress"; //$NON-NLS-1$
 	public static final String DOMEVENT_KEYUP = "keyup"; //$NON-NLS-1$
-
+	
 	/* CID constants */
 	public static final nsID EXTERNAL_CID = new nsID ("f2c59ad0-bd76-11dd-ad8b-0800200c9a66"); //$NON-NLS-1$
 	public static final nsID NS_APPSHELL_CID =	new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
Index: org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -76,4 +76,4 @@
 	public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -102,7 +102,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 
-	public int IsWindowModal(int[] _retval) {
+	public int IsWindowModal(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
 	}
 
@@ -109,4 +109,4 @@
 	public int ExitModalEventLoop(int aStatus) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -67,11 +67,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
 	}
 
-	public int GetBubbles(int[] aBubbles) {
+	public int GetBubbles(int[] aBubbles) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
 	}
 
-	public int GetCancelable(int[] aCancelable) {
+	public int GetCancelable(int[] aCancelable) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
 	}
 
@@ -87,7 +87,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
 	}
 
-	public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+	public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
 	}
 	
@@ -100,4 +100,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -44,4 +44,4 @@
 	public int GetFiles(byte[] prop, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMNode.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMNode.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMNode.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,231 +1,231 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMNode extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 36 : 25);
-
-	public static final String NS_IDOMNODE_IID_STR =
-		"a6cf907c-15b3-11d2-932e-00805f8add32";
-
-	public static final String NS_IDOMNODE_10_IID_STR =
-		"ce82fb71-60f2-4c38-be31-de5f2f90dada";
-
-	public static final nsID NS_IDOMNODE_IID =
-		new nsID(NS_IDOMNODE_IID_STR);
-
-	public static final nsID NS_IDOMNODE_10_IID =
-		new nsID(NS_IDOMNODE_10_IID_STR);
-
-	public nsIDOMNode(int /*long*/ address) {
-		super(address);
-	}
-
-	public static final int ELEMENT_NODE = 1;
-	public static final int ATTRIBUTE_NODE = 2;
-	public static final int TEXT_NODE = 3;
-	public static final int CDATA_SECTION_NODE = 4;
-	public static final int ENTITY_REFERENCE_NODE = 5;
-	public static final int ENTITY_NODE = 6;
-	public static final int PROCESSING_INSTRUCTION_NODE = 7;
-	public static final int COMMENT_NODE = 8;
-	public static final int DOCUMENT_NODE = 9;
-	public static final int DOCUMENT_TYPE_NODE = 10;
-	public static final int DOCUMENT_FRAGMENT_NODE = 11;
-	public static final int NOTATION_NODE = 12;
-
-	public int GetNodeName(int /*long*/ aNodeName) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
-	}
-
-	public int GetNodeValue(int /*long*/ aNodeValue) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
-	}
-
-	public int SetNodeValue(int /*long*/ aNodeValue) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
-	}
-
-	public int GetNodeType(short[] aNodeType) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
-	}
-
-	public int GetParentNode(int /*long*/[] aParentNode) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
-	}
-
-	public int GetParentElement(int /*long*/[] aParentElement) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
-	}
-
-	public int GetChildNodes(int /*long*/[] aChildNodes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
-	}
-
-	public int GetFirstChild(int /*long*/[] aFirstChild) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
-	}
-
-	public int GetLastChild(int /*long*/[] aLastChild) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
-	}
-
-	public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
-	}
-
-	public int GetNextSibling(int /*long*/[] aNextSibling) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
-	}
-
-	public int GetAttributes(int /*long*/[] aAttributes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
-	}
-
-	public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
-	}
-
-	public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
-	}
-
-	public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
-	}
-
-	public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
-	}
-
-	public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
-	}
-
-	public int HasChildNodes(int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
-	}
-
-	public int CloneNode(int deep, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
-	}
-
-	public int Normalize() {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
-	}
-
-	public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
-	}
-
-	public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
-	}
-
-	public int GetPrefix(int /*long*/ aPrefix) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
-	}
-
-	public int SetPrefix(int /*long*/ aPrefix) {
-		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
-	}
-
-	public int GetLocalName(int /*long*/ aLocalName) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
-	}
-
-	public int HasAttributes(int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
-	}
-	
-	public int GetDOMBaseURI(int /*long*/ aBaseURI) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
-	}
-
-	/* the following constants are defined in Mozilla 10 */
-	public static final int DOCUMENT_POSITION_DISCONNECTED = 1;
-	public static final int DOCUMENT_POSITION_PRECEDING = 2;
-	public static final int DOCUMENT_POSITION_FOLLOWING = 4;
-	public static final int DOCUMENT_POSITION_CONTAINS = 8;
-	public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
-	public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
-
-	public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
-	}
-
-	public int GetTextContent(int /*long*/ aTextContent) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
-	}
-
-	public int SetTextContent(int /*long*/ aTextContent) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
-	}
-
-	public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
-	}
-
-	public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
-	}
-
-	public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
-	}
-
-	public int IsEqualNode(int /*long*/ arg, int[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
-	}
-
-	public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
-	}
-
-	public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
-	}
-
-	public int Contains(int /*long*/ aOther, int[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIDOMNode extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 36 : 25);
+
+	public static final String NS_IDOMNODE_IID_STR =
+		"a6cf907c-15b3-11d2-932e-00805f8add32";
+
+	public static final String NS_IDOMNODE_10_IID_STR =
+		"ce82fb71-60f2-4c38-be31-de5f2f90dada";
+
+	public static final nsID NS_IDOMNODE_IID =
+		new nsID(NS_IDOMNODE_IID_STR);
+
+	public static final nsID NS_IDOMNODE_10_IID =
+		new nsID(NS_IDOMNODE_10_IID_STR);
+
+	public  nsIDOMNode(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int ELEMENT_NODE = 1;
+	public static final int ATTRIBUTE_NODE = 2;
+	public static final int TEXT_NODE = 3;
+	public static final int CDATA_SECTION_NODE = 4;
+	public static final int ENTITY_REFERENCE_NODE = 5;
+	public static final int ENTITY_NODE = 6;
+	public static final int PROCESSING_INSTRUCTION_NODE = 7;
+	public static final int COMMENT_NODE = 8;
+	public static final int DOCUMENT_NODE = 9;
+	public static final int DOCUMENT_TYPE_NODE = 10;
+	public static final int DOCUMENT_FRAGMENT_NODE = 11;
+	public static final int NOTATION_NODE = 12;
+
+	public int GetNodeName(int /*long*/ aNodeName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
+	}
+
+	public int GetNodeValue(int /*long*/ aNodeValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
+	}
+
+	public int SetNodeValue(int /*long*/ aNodeValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
+	}
+
+	public int GetNodeType(short[] aNodeType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
+	}
+
+	public int GetParentNode(int /*long*/[] aParentNode) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
+	}
+
+	public int GetParentElement(int /*long*/[] aParentElement) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
+	}
+
+	public int GetChildNodes(int /*long*/[] aChildNodes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
+	}
+
+	public int GetFirstChild(int /*long*/[] aFirstChild) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
+	}
+
+	public int GetLastChild(int /*long*/[] aLastChild) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
+	}
+
+	public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
+	}
+
+	public int GetNextSibling(int /*long*/[] aNextSibling) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
+	}
+
+	public int GetAttributes(int /*long*/[] aAttributes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
+	}
+
+	public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
+	}
+
+	public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
+	}
+
+	public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
+	}
+
+	public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
+	}
+
+	public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
+	}
+
+	public int HasChildNodes(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
+	}
+
+	public int CloneNode(int deep, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
+	}
+
+	public int Normalize() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
+	}
+
+	public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
+	}
+
+	public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
+	}
+
+	public int GetPrefix(int /*long*/ aPrefix) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
+	}
+
+	public int SetPrefix(int /*long*/ aPrefix) {
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
+	}
+
+	public int GetLocalName(int /*long*/ aLocalName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
+	}
+
+	public int HasAttributes(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
+	}
+	
+	public int GetDOMBaseURI(int /*long*/ aBaseURI) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
+	}
+
+	/* the following constants are defined in Mozilla 10 */
+	public static final int DOCUMENT_POSITION_DISCONNECTED = 1;
+	public static final int DOCUMENT_POSITION_PRECEDING = 2;
+	public static final int DOCUMENT_POSITION_FOLLOWING = 4;
+	public static final int DOCUMENT_POSITION_CONTAINS = 8;
+	public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
+	public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
+
+	public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+	}
+
+	public int GetTextContent(int /*long*/ aTextContent) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
+	}
+
+	public int SetTextContent(int /*long*/ aTextContent) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
+	}
+
+	public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
+	}
+
+	public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
+	}
+
+	public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
+	}
+
+	public int IsEqualNode(int /*long*/ arg, int[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
+	}
+
+	public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
+	}
+
+	public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
+	}
+
+	public int Contains(int /*long*/ aOther, int[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWindowCreator.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWindowCreator.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -44,4 +44,4 @@
 	public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -161,7 +161,7 @@
 	public static final int DOM_VK_CLOSE_BRACKET = 221;
 	public static final int DOM_VK_QUOTE = 222;
 	public static final int DOM_VK_META = 224;
-	
+
 	/* the following constants are defined in Mozilla 10 */
 	public static final int DOM_VK_KANA = 21;
 	public static final int DOM_VK_HANGUL = 21;
@@ -188,23 +188,23 @@
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aKeyCode);
 	}
 
-	public int GetAltKey(int[] aAltKey) {
+	public int GetAltKey(int[] aAltKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);
 	}
 
-	public int GetCtrlKey(int[] aCtrlKey) {
+	public int GetCtrlKey(int[] aCtrlKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);
 	}
 
-	public int GetShiftKey(int[] aShiftKey) {
+	public int GetShiftKey(int[] aShiftKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);
 	}
 
-	public int GetMetaKey(int[] aMetaKey) {
+	public int GetMetaKey(int[] aMetaKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
 	}
 
-	public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+	public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
 	}
 }
Index: org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -45,11 +45,11 @@
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
 	}
 
-	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
 	}
 
-	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
 	}
 
@@ -68,4 +68,4 @@
 	public int SetDialog(int /*long*/ aDialog) {
 		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIServiceManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIServiceManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIServiceManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -49,11 +49,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
 	}
 
-	public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
+	public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
 	}
 
-	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
+	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebNavigation.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebNavigation.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -41,11 +41,11 @@
 		super(address);
 	}
 
-	public int GetCanGoBack(int[] aCanGoBack) {
+	public int GetCanGoBack(int[] aCanGoBack) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
 	}
 
-	public int GetCanGoForward(int[] aCanGoForward) {
+	public int GetCanGoForward(int[] aCanGoForward) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
 	}
 
@@ -106,4 +106,4 @@
 	public int SetSessionHistory(int /*long*/ aSessionHistory) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIPromptService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIPromptService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIPromptService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,97 +1,97 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2003, 2011 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIPromptService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-	public static final String NS_IPROMPTSERVICE_IID_STR =
-		"1630c61a-325e-49ca-8759-a31b16c47aa5";
-
-	public static final nsID NS_IPROMPTSERVICE_IID =
-		new nsID(NS_IPROMPTSERVICE_IID_STR);
-
-	public nsIPromptService(int /*long*/ address) {
-		super(address);
-	}
-
-	public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
-	}
-
-	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
-	}
-
-	public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
-	}
-
-	public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
-	}
-
-	public static final int BUTTON_POS_0 = 1;
-	public static final int BUTTON_POS_1 = 256;
-	public static final int BUTTON_POS_2 = 65536;
-	public static final int BUTTON_TITLE_OK = 1;
-	public static final int BUTTON_TITLE_CANCEL = 2;
-	public static final int BUTTON_TITLE_YES = 3;
-	public static final int BUTTON_TITLE_NO = 4;
-	public static final int BUTTON_TITLE_SAVE = 5;
-	public static final int BUTTON_TITLE_DONT_SAVE = 6;
-	public static final int BUTTON_TITLE_REVERT = 7;
-	public static final int BUTTON_TITLE_IS_STRING = 127;
-	public static final int BUTTON_POS_0_DEFAULT = 0;
-	public static final int BUTTON_POS_1_DEFAULT = 16777216;
-	public static final int BUTTON_POS_2_DEFAULT = 33554432;
-	public static final int BUTTON_DELAY_ENABLE = 67108864;
-	public static final int STD_OK_CANCEL_BUTTONS = 513;
-	public static final int STD_YES_NO_BUTTONS = 1027;
-	
-	public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
-	}
-
-	public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
-	}
-
-	public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
-	}
-
-	public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
-	}
-
-	public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPromptService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+	public static final String NS_IPROMPTSERVICE_IID_STR =
+		"1630c61a-325e-49ca-8759-a31b16c47aa5";
+
+	public static final nsID NS_IPROMPTSERVICE_IID =
+		new nsID(NS_IPROMPTSERVICE_IID_STR);
+
+	public nsIPromptService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
+	}
+
+	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
+	}
+
+	public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
+	}
+
+	public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
+	}
+
+	public static final int BUTTON_POS_0 = 1;
+	public static final int BUTTON_POS_1 = 256;
+	public static final int BUTTON_POS_2 = 65536;
+	public static final int BUTTON_TITLE_OK = 1;
+	public static final int BUTTON_TITLE_CANCEL = 2;
+	public static final int BUTTON_TITLE_YES = 3;
+	public static final int BUTTON_TITLE_NO = 4;
+	public static final int BUTTON_TITLE_SAVE = 5;
+	public static final int BUTTON_TITLE_DONT_SAVE = 6;
+	public static final int BUTTON_TITLE_REVERT = 7;
+	public static final int BUTTON_TITLE_IS_STRING = 127;
+	public static final int BUTTON_POS_0_DEFAULT = 0;
+	public static final int BUTTON_POS_1_DEFAULT = 16777216;
+	public static final int BUTTON_POS_2_DEFAULT = 33554432;
+	public static final int BUTTON_DELAY_ENABLE = 67108864;
+	public static final int STD_OK_CANCEL_BUTTONS = 513;
+	public static final int STD_YES_NO_BUTTONS = 1027;
+
+	public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -53,11 +53,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
@@ -76,4 +76,4 @@
 	public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIJSContextStack.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIJSContextStack.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIJSContextStack extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	public static final String NS_IJSCONTEXTSTACK_IID_STR =
-		"c67d8270-3189-11d3-9885-006008962422";
-
-	public static final nsID NS_IJSCONTEXTSTACK_IID =
-		new nsID(NS_IJSCONTEXTSTACK_IID_STR);
-
-	public nsIJSContextStack(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetCount(int[] aCount) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
-	}
-
-	public int Peek(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
-	}
-
-	public int Pop(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
-	}
-
-	public int Push(int /*long*/ cx) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIJSContextStack extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_IJSCONTEXTSTACK_IID_STR =
+		"c67d8270-3189-11d3-9885-006008962422";
+
+	public static final nsID NS_IJSCONTEXTSTACK_IID =
+		new nsID(NS_IJSCONTEXTSTACK_IID_STR);
+
+	public nsIJSContextStack(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCount(int[] aCount) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
+	}
+
+	public int Peek(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+
+	public int Pop(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+	}
+
+	public int Push(int /*long*/ cx) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -76,4 +76,4 @@
 	public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIAppShell.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIAppShell.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIAppShell.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -57,7 +57,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
-	public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
+	public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
 	}
 
@@ -65,7 +65,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
 	}
 
-	public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
+	public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
 	}
 
@@ -72,4 +72,4 @@
 	public int Exit() {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHttpChannel.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHttpChannel.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IHTTPCHANNEL_IID =
 		new nsID(NS_IHTTPCHANNEL_IID_STR);
 
-	public nsIHttpChannel(int /*long*/ address) {
+	public  nsIHttpChannel(int /*long*/ address) {
 		super(address);
 	}
 
Index: org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
===================================================================
--- org/eclipse/swt/internal/mozilla/init/XPCOMInit.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/init/XPCOMInit.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -32,7 +32,7 @@
 /** @jniclass flags=cpp */
 public class XPCOMInit extends Platform {
 	public static final int PATH_MAX = 4096;
-
+	
 public static final native int GREProperty_sizeof ();
 public static final native int GREVersionRange_sizeof ();
 
Index: org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -44,4 +44,4 @@
 	public int GetInterface(nsID uuid, int /*long*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -51,4 +51,4 @@
 	public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIPrincipal.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIPrincipal.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIPrincipal.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -27,7 +27,7 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-public class nsIPrincipal extends nsISerializable {
+public class  nsIPrincipal extends nsISerializable {
 
 	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 23);
 
@@ -43,7 +43,7 @@
 	public static final nsID NS_IPRINCIPAL_10_IID =
 		new nsID(NS_IPRINCIPAL_10_IID_STR);
 
-	public nsIPrincipal(int /*long*/ address) {
+	public  nsIPrincipal(int /*long*/ address) {
 		super(address);
 	}
 
@@ -158,4 +158,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIX509Cert.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIX509Cert.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIX509Cert.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IX509CERT_IID =
 		new nsID(NS_IX509CERT_IID_STR);
 
-	public nsIX509Cert(int /*long*/ address) {
+	public  nsIX509Cert(int /*long*/ address) {
 		super(address);
 	}
 
@@ -175,4 +175,4 @@
 	public int Equals(int /*long*/ other, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIPromptService2.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIPromptService2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIPromptService2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -41,11 +41,11 @@
 		super(address);
 	}
 
-	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 
-	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
 	}
 }
Index: org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,67 +1,67 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2003, 2011 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFilePicker_1_8 extends nsISupports {
-
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFilePicker_1_8 extends nsISupports {
+
 	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15);
-
-	public static final String NS_IFILEPICKER_IID_STR =
-		"80faf095-c807-4558-a2cc-185ed70754ea";
-
+
+	public static final String NS_IFILEPICKER_IID_STR =
+		"80faf095-c807-4558-a2cc-185ed70754ea";
+
 	public static final String NS_IFILEPICKER_10_IID_STR =
 		"f2c0e216-5d07-4df4-bbcb-37683077ae7e";
 	
-	public static final nsID NS_IFILEPICKER_IID =
-		new nsID(NS_IFILEPICKER_IID_STR);
-
+	public static final nsID NS_IFILEPICKER_IID =
+		new nsID(NS_IFILEPICKER_IID_STR);
+
 	public static final nsID NS_IFILEPICKER_10_IID =
 		new nsID(NS_IFILEPICKER_10_IID_STR);
 	
-	public nsIFilePicker_1_8(int /*long*/ address) {
-		super(address);
-	}
-
-	public static final int modeOpen = 0;
-	public static final int modeSave = 1;
-	public static final int modeGetFolder = 2;
-	public static final int modeOpenMultiple = 3;
-	public static final int returnOK = 0;
-	public static final int returnCancel = 1;
-	public static final int returnReplace = 2;
-	public static final int filterAll = 1;
-	public static final int filterHTML = 2;
-	public static final int filterText = 4;
-	public static final int filterImages = 8;
-	public static final int filterXML = 16;
-	public static final int filterXUL = 32;
-	public static final int filterApps = 64;
-	
+	public nsIFilePicker_1_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int modeOpen = 0;
+	public static final int modeSave = 1;
+	public static final int modeGetFolder = 2;
+	public static final int modeOpenMultiple = 3;
+	public static final int returnOK = 0;
+	public static final int returnCancel = 1;
+	public static final int returnReplace = 2;
+	public static final int filterAll = 1;
+	public static final int filterHTML = 2;
+	public static final int filterText = 4;
+	public static final int filterImages = 8;
+	public static final int filterXML = 16;
+	public static final int filterXUL = 32;
+	public static final int filterApps = 64;
+
 	/* the following constants are defined in mozilla 8 */
 	public static final int filterAllowURLs = 128;
 	public static final int filterAudio = 256;
@@ -68,62 +68,62 @@
 	public static final int filterVideo = 512;
 
 	public int Init(int /*long*/ parent, int /*long*/ title, short mode) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
-	}
-
-	public int AppendFilters(int filterMask) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
-	}
-
-	public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
-	}
-
-	public int GetDefaultString(int /*long*/ aDefaultString) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
-	}
-
-	public int SetDefaultString(int /*long*/ aDefaultString) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
-	}
-
-	public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
-	}
-
-	public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
-	}
-
-	public int GetFilterIndex(int[] aFilterIndex) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);
-	}
-
-	public int SetFilterIndex(int aFilterIndex) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
-	}
-
-	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
-	}
-
-	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
-	}
-
-	public int GetFile(int /*long*/[] aFile) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
-	}
-
-	public int GetFileURL(int /*long*/[] aFileURL) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
-	}
-
-	public int GetFiles(int /*long*/[] aFiles) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
-	}
-
-	public int Show(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+	}
+
+	public int AppendFilters(int filterMask) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
+	}
+
+	public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+	}
+
+	public int GetDefaultString(int /*long*/ aDefaultString) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+	}
+
+	public int SetDefaultString(int /*long*/ aDefaultString) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+	}
+
+	public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+	}
+
+	public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
+	}
+
+	public int GetFilterIndex(int[] aFilterIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);
+	}
+
+	public int SetFilterIndex(int aFilterIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+	}
+
+	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+	}
+
+	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+	}
+
+	public int GetFile(int /*long*/[] aFile) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+	}
+
+	public int GetFileURL(int /*long*/[] aFileURL) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+	}
+
+	public int GetFiles(int /*long*/[] aFiles) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+	}
+
+	public int Show(int /*long*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15), getAddress(), _retval);
 	}
 	
@@ -135,5 +135,5 @@
 	public int SetAddToRecentDocs(int aAddToRecentDocs) {
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAddToRecentDocs);
-	}
-}
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -84,4 +84,4 @@
 	public int SetActiveWindow(int /*long*/ aActiveWindow) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDirectoryService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDirectoryService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	public static final String NS_IDIRECTORYSERVICE_IID_STR =
-		"57a66a60-d43a-11d3-8cc2-00609792278c";
-
-	public static final nsID NS_IDIRECTORYSERVICE_IID =
-		new nsID(NS_IDIRECTORYSERVICE_IID_STR);
-
-	public nsIDirectoryService(int /*long*/ address) {
-		super(address);
-	}
-
-	public int Init() {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
-	}
-
-	public int RegisterProvider(int /*long*/ prov) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
-	}
-
-	public int UnregisterProvider(int /*long*/ prov) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDIRECTORYSERVICE_IID_STR =
+		"57a66a60-d43a-11d3-8cc2-00609792278c";
+
+	public static final nsID NS_IDIRECTORYSERVICE_IID =
+		new nsID(NS_IDIRECTORYSERVICE_IID_STR);
+
+	public nsIDirectoryService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Init() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+	}
+
+	public int RegisterProvider(int /*long*/ prov) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
+	}
+
+	public int UnregisterProvider(int /*long*/ prov) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -44,4 +44,4 @@
 	public int GetWeakReference(int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsISeekableStream.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISeekableStream.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISeekableStream.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_ISEEKABLESTREAM_IID =
 		new nsID(NS_ISEEKABLESTREAM_IID_STR);
 
-	public nsISeekableStream(int /*long*/ address) {
+	public  nsISeekableStream(int /*long*/ address) {
 		super(address);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIRequest.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIRequest.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIRequest.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -45,7 +45,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
 	}
 
-	public int IsPending(int[] _retval) {
+	public int IsPending(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIDOMElement.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMElement.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMElement.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,133 +1,133 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMElement extends nsIDOMNode {
-
-	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 16);
-
-	public static final String NS_IDOMELEMENT_IID_STR =
-		"a6cf9078-15b3-11d2-932e-00805f8add32";
-
-	public static final String NS_IDOMELEMENT_10_IID_STR =
-		"1f249e8b-7b41-44c0-a8d5-15298c1198cd";
-
-	public static final nsID NS_IDOMELEMENT_IID =
-		new nsID(NS_IDOMELEMENT_IID_STR);
-
-	public static final nsID NS_IDOMELEMENT_10_IID =
-		new nsID(NS_IDOMELEMENT_10_IID_STR);
-
-	public nsIDOMElement(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetTagName(int /*long*/ aTagName) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
-	}
-
-	public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
-	}
-
-	public int SetAttribute(int /*long*/ name, int /*long*/ value) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
-	}
-
-	public int RemoveAttribute(int /*long*/ name) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
-	}
-
-	public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
-	}
-
-	public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
-	}
-
-	public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
-	}
-
-	public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
-	}
-
-	public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
-	}
-
-	public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
-	}
-
-	public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
-	}
-
-	public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
-	}
-
-	public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
-	}
-
-	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
-	}
-
-	public int HasAttribute(int /*long*/ name, int[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
-	}
-
-	public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
-	}
-
-	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
-	}
-
-	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
-	}
-
-	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
-	}
-
-	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIDOMElement extends nsIDOMNode {
+
+	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 16);
+
+	public static final String NS_IDOMELEMENT_IID_STR =
+		"a6cf9078-15b3-11d2-932e-00805f8add32";
+
+	public static final String NS_IDOMELEMENT_10_IID_STR =
+		"1f249e8b-7b41-44c0-a8d5-15298c1198cd";
+
+	public static final nsID NS_IDOMELEMENT_IID =
+		new nsID(NS_IDOMELEMENT_IID_STR);
+
+	public static final nsID NS_IDOMELEMENT_10_IID =
+		new nsID(NS_IDOMELEMENT_10_IID_STR);
+
+	public  nsIDOMElement(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetTagName(int /*long*/ aTagName) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
+	}
+
+	public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
+	}
+
+	public int SetAttribute(int /*long*/ name, int /*long*/ value) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
+	}
+
+	public int RemoveAttribute(int /*long*/ name) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
+	}
+
+	public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
+	}
+
+	public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
+	}
+
+	public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
+	}
+
+	public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
+	}
+
+	public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
+	}
+
+	public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
+	}
+
+	public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
+	}
+
+	public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
+	}
+
+	public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
+	}
+
+	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
+	}
+
+	public int HasAttribute(int /*long*/ name, int[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
+	}
+
+	public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
+	}
+
+	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
+	}
+
+	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,87 +1,87 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIHelperAppLauncher_8 extends nsICancelable {
-
-	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 11;
-
-	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
-		"d9a19faf-497b-408c-b995-777d956b72c0";
-
-	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
-		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-	public nsIHelperAppLauncher_8(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
-	}
-
-	public int GetSource(int /*long*/[] aSource) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
-	}
-
-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
-	}
-
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
-	}
-
-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
-	}
-
-	public int CloseProgressWindow() {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
-	}
-
-	public int GetTargetFile(int /*long*/[] aTargetFile) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
-	}
-
-	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
-	}
-
-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
-	}
-	
-	public int GetContentLength(int /*long*/ aContentLength) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2012 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher_8 extends nsICancelable {
+
+	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 11;
+
+	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+		"d9a19faf-497b-408c-b995-777d956b72c0";
+
+	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+	public nsIHelperAppLauncher_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+	}
+
+	public int GetSource(int /*long*/[] aSource) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+	}
+
+	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+	}
+
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+	}
+
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+	}
+
+	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+	}
+
+	public int CloseProgressWindow() {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+	}
+
+	public int GetTargetFile(int /*long*/[] aTargetFile) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+	}
+
+	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
+	}
+
+	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+	}
+	
+	public int GetContentLength(int /*long*/ aContentLength) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -41,7 +41,7 @@
 		super(address);
 	}
 
-	public int HasMoreElements(int[] _retval) {
+	public int HasMoreElements(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIProperties.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIProperties.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIProperties.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -49,7 +49,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
 	}
 
-	public int Has(byte[] prop, int[] _retval) {
+	public int Has(byte[] prop, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IBADCERTLISTENER2_IID =
 		new nsID(NS_IBADCERTLISTENER2_IID_STR);
 
-	public nsIBadCertListener2(int /*long*/ address) {
+	public  nsIBadCertListener2(int /*long*/ address) {
 		super(address);
 	}
 
@@ -44,4 +44,4 @@
 	public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsISupports.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISupports.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISupports.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -67,4 +67,4 @@
 	public int Release() {
 		return XPCOM.VtblCall(FIRST_METHOD_ID + 2, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIURIContentListener.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIURIContentListener.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -41,19 +41,19 @@
 		super(address);
 	}
 
-	public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
+	public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
 	}
 
-	public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
+	public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
 	}
 
-	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
+	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
 	}
 
-	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
+	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
 	}
 
@@ -72,4 +72,4 @@
 	public int SetParentContentListener(int /*long*/ aParentContentListener) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,47 +1,47 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryServiceProvider extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
-		"bbf8cab0-d43a-11d3-8cc2-00609792278c";
-
-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
-		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
-
-	public nsIDirectoryServiceProvider(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryServiceProvider extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+	public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
+		"bbf8cab0-d43a-11d3-8cc2-00609792278c";
+
+	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
+		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
+
+	public nsIDirectoryServiceProvider(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
+	}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIBaseWindow.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIBaseWindow.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -67,7 +67,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);
 	}
 
-	public int SetSize(int cx, int cy, int fRepaint) {
+	public int SetSize(int cx, int cy, int fRepaint) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
 	}
 
@@ -75,7 +75,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);
 	}
 
-	public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
+	public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
 	}
 
@@ -83,7 +83,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
 	}
 
-	public int Repaint(int force) {
+	public int Repaint(int force) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
 	}
 
@@ -103,28 +103,28 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
 	}
 
-	public int GetVisibility(int[] aVisibility) {
+	public int GetVisibility(int[] aVisibility) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
 	}
 
-	public int SetVisibility(int aVisibility) {
+	public int SetVisibility(int aVisibility) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
 	}
 
-	public int GetEnabled(int[] aEnabled) {
+	public int GetEnabled(int[] aEnabled) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
 	}
 
-	public int SetEnabled(int aEnabled) {
+	public int SetEnabled(int aEnabled) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
 	}
 
-	public int GetBlurSuppression(int[] aBlurSuppression) {
+	public int GetBlurSuppression(int[] aBlurSuppression) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
 	}
 
-	public int SetBlurSuppression(int aBlurSuppression) {
+	public int SetBlurSuppression(int aBlurSuppression) {
 		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
 	}
@@ -144,4 +144,4 @@
 	public int SetTitle(char[] aTitle) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 24), getAddress(), aTitle);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/XPCOMObject.java
===================================================================
--- org/eclipse/swt/internal/mozilla/XPCOMObject.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/XPCOMObject.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -20,9 +20,9 @@
 		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
 		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
 	}
+
+	private int /*long*/ ppVtable;
 	
-	private int /*long*/ ppVtable;
-
 	static private final int MAX_ARG_COUNT = 12;
 	static private final int MAX_VTABLE_LENGTH = 80;
 	static final int OS_OFFSET = IsSolaris ? 2 : 0;
Index: org/eclipse/swt/internal/mozilla/nsISSLStatus.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsISSLStatus.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsISSLStatus.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -43,7 +43,7 @@
 	public static final nsID NS_ISSLSTATUS_10_IID =
 		new nsID(NS_ISSLSTATUS_10_IID_STR);
 
-	public nsISSLStatus(int /*long*/ address) {
+	public  nsISSLStatus(int /*long*/ address) {
 		super(address);
 	}
 
@@ -79,4 +79,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aIsExtendedValidation);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWeakReference.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWeakReference.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWeakReference.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -44,4 +44,4 @@
 	public int QueryReferent(nsID uuid, int /*long*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMWindow.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMWindow.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -675,4 +675,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 129, getAddress(), cx, aOnmouseleave);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IHTTPHEADERVISITOR_IID =
 		new nsID(NS_IHTTPHEADERVISITOR_IID_STR);
 
-	public nsIHttpHeaderVisitor(int /*long*/ address) {
+	public  nsIHttpHeaderVisitor(int /*long*/ address) {
 		super(address);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsICookie.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICookie.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICookie.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -49,7 +49,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
 	}
 
-	public int GetIsDomain(int[] aIsDomain) {
+	public int GetIsDomain(int[] aIsDomain) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
 	}
 
@@ -61,7 +61,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
 	}
 
-	public int GetIsSecure(int[] aIsSecure) {
+	public int GetIsSecure(int[] aIsSecure) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -49,4 +49,4 @@
 	public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -43,7 +43,7 @@
 
 	public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
 
-	public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
+	public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
 	}
 }
Index: org/eclipse/swt/internal/mozilla/nsIFile.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIFile.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIFile.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -100,7 +100,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
 	}
 
-	public int Remove(int recursive) {
+	public int Remove(int recursive) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);
 	}
 
@@ -164,39 +164,39 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
 	}
 
-	public int Exists(int[] _retval) {
+	public int Exists(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
 	}
 
-	public int IsWritable(int[] _retval) {
+	public int IsWritable(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
 	}
 
-	public int IsReadable(int[] _retval) {
+	public int IsReadable(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
 	}
 
-	public int IsExecutable(int[] _retval) {
+	public int IsExecutable(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
 	}
 
-	public int IsHidden(int[] _retval) {
+	public int IsHidden(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
 	}
 
-	public int IsDirectory(int[] _retval) {
+	public int IsDirectory(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
 	}
 
-	public int IsFile(int[] _retval) {
+	public int IsFile(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
 	}
 
-	public int IsSymlink(int[] _retval) {
+	public int IsSymlink(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
 	}
 
-	public int IsSpecial(int[] _retval) {
+	public int IsSpecial(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);
 	}
 
@@ -208,11 +208,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
 	}
 
-	public int Equals(int /*long*/ inFile, int[] _retval) {
+	public int Equals(int /*long*/ inFile, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
 	}
 
-	public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
+	public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
 	}
 
@@ -223,4 +223,4 @@
 	public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -55,7 +55,7 @@
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
 	}
 
-	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
+	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
 	}
 	
@@ -112,4 +112,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 13, getAddress(), aIsChar);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -48,4 +48,4 @@
 	public int FocusPrevElement() {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -27,7 +27,7 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-public class nsIMIMEInputStream extends nsIInputStream {
+public class  nsIMIMEInputStream extends nsIInputStream {
 
 	static final int LAST_METHOD_ID = nsIInputStream.LAST_METHOD_ID + 4;
 
@@ -37,7 +37,7 @@
 	public static final nsID NS_IMIMEINPUTSTREAM_IID =
 		new nsID(NS_IMIMEINPUTSTREAM_IID_STR);
 
-	public nsIMIMEInputStream(int /*long*/ address) {
+	public  nsIMIMEInputStream(int /*long*/ address) {
 		super(address);
 	}
 
@@ -56,4 +56,4 @@
 	public int SetData(int /*long*/ stream) {
 		return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 4, getAddress(), stream);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsID.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsID.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsID.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -137,4 +137,4 @@
     	toHex (m3[2], 2) + toHex (m3[3], 2) + toHex (m3[4], 2) + toHex (m3[5], 2) + toHex (m3[6], 2) + toHex (m3[7], 2) + '}';
 }
 
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIProgressDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIProgressDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -45,11 +45,11 @@
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
 	}
 
-	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
 	}
 
-	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
 	}
 
@@ -60,4 +60,4 @@
 	public int SetDialog(int /*long*/ aDialog) {
 		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -64,4 +64,4 @@
 	public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -65,11 +65,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
 	}
 
-	public int IsCIDRegistered(nsID aClass, int[] _retval) {
+	public int IsCIDRegistered(nsID aClass, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);
 	}
 
-	public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {
+	public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
 	}
 
@@ -88,4 +88,4 @@
 	public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsILocalFile.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsILocalFile.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsILocalFile.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -53,11 +53,11 @@
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
 	}
 
-	public int GetFollowLinks(int[] aFollowLinks) {
+	public int GetFollowLinks(int[] aFollowLinks) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
 	}
 
-	public int SetFollowLinks(int aFollowLinks) {
+	public int SetFollowLinks(int aFollowLinks) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
 	}
 
@@ -108,4 +108,4 @@
 	public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
 		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -63,19 +63,19 @@
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);
 	}
 
-	public int GetCtrlKey(int[] aCtrlKey) {
+	public int GetCtrlKey(int[] aCtrlKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
 	}
 
-	public int GetShiftKey(int[] aShiftKey) {
+	public int GetShiftKey(int[] aShiftKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
 	}
 
-	public int GetAltKey(int[] aAltKey) {
+	public int GetAltKey(int[] aAltKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
 	}
 
-	public int GetMetaKey(int[] aMetaKey) {
+	public int GetMetaKey(int[] aMetaKey) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
 	}
 
@@ -87,7 +87,7 @@
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
 	}
 
-	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
+	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
 	}
 
@@ -115,4 +115,4 @@
 		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 14, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg);
 	}
 
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIComponentManager.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIComponentManager.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIComponentManager.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -56,4 +56,4 @@
 	public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -52,4 +52,4 @@
 	public int CloseStream() {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2003, 2011 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsICookieService_1_9 extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	public static final String NS_ICOOKIESERVICE_IID_STR =
-		"2aaa897a-293c-4d2b-a657-8c9b7136996d";
-
-	public static final nsID NS_ICOOKIESERVICE_IID =
-		new nsID(NS_ICOOKIESERVICE_IID_STR);
-
-	public nsICookieService_1_9(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
-	}
-
-	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
-	}
-
-	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
-	}
-
-	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsICookieService_1_9 extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_ICOOKIESERVICE_IID_STR =
+		"2aaa897a-293c-4d2b-a657-8c9b7136996d";
+
+	public static final nsID NS_ICOOKIESERVICE_IID =
+		new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+	public  nsICookieService_1_9(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+	}
+
+	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+	}
+
+	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+	}
+
+	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsIMemory.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIMemory.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIMemory.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -53,11 +53,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
 	}
 
-	public int HeapMinimize(int immediate) {
+	public int HeapMinimize(int immediate) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
 	}
 
-	public int IsLowMemory(int[] _retval) {
+	public int IsLowMemory(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIObserverService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIObserverService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIObserverService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -41,7 +41,7 @@
 		super(address);
 	}
 
-	public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
+	public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -53,11 +53,11 @@
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
 		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIPrefBranch.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIPrefBranch.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -60,7 +60,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aPrefName, _retval);
 	}
 
-	public int GetBoolPref(byte[] aPrefName, int[] _retval) {
+	public int GetBoolPref(byte[] aPrefName, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrefName, _retval);
 	}
 
@@ -100,11 +100,11 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aPrefName);
 	}
 
-	public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {
+	public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
 	}
 
-	public int PrefIsLocked(byte[] aPrefName, int[] _retval) {
+	public int PrefIsLocked(byte[] aPrefName, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aPrefName, _retval);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsIInputStream.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIInputStream.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIInputStream.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
@@ -57,7 +57,7 @@
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
 	}
 
-	public int IsNonBlocking(int[] _retval) {
+	public int IsNonBlocking(int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIUploadChannel.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIUploadChannel.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_IUPLOADCHANNEL_IID =
 		new nsID(NS_IUPLOADCHANNEL_IID_STR);
 
-	public nsIUploadChannel(int /*long*/ address) {
+	public  nsIUploadChannel(int /*long*/ address) {
 		super(address);
 	}
 
Index: org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsICertOverrideService.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsICertOverrideService.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -37,7 +37,7 @@
 	public static final nsID NS_ICERTOVERRIDESERVICE_IID =
 		new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
 
-	public nsICertOverrideService(int /*long*/ address) {
+	public  nsICertOverrideService(int /*long*/ address) {
 		super(address);
 	}
 
@@ -68,4 +68,4 @@
 	public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMDocument.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMDocument.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,349 +1,349 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
  * -  Copyright (C) 2011, 2012 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMDocument extends nsIDOMNode {
-
-	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 61 : 17);
-
-	public static final String NS_IDOMDOCUMENT_IID_STR =
-		"a6cf9075-15b3-11d2-932e-00805f8add32";
-
-	public static final String NS_IDOMDOCUMENT_10_IID_STR =
-		"5c3bff4d-ae7f-4c93-948c-519589672c30";
-
-	public static final nsID NS_IDOMDOCUMENT_IID =
-		new nsID(NS_IDOMDOCUMENT_IID_STR);
-
-	public static final nsID NS_IDOMDOCUMENT_10_IID =
-		new nsID(NS_IDOMDOCUMENT_10_IID_STR);
-
-	public nsIDOMDocument(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetDoctype(int /*long*/[] aDoctype) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
-	}
-
-	public int GetImplementation(int /*long*/[] aImplementation) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
-	}
-
-	public int GetDocumentElement(int /*long*/[] aDocumentElement) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
-	}
-
-	public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
-	}
-
-	public int CreateDocumentFragment(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
-	}
-
-	public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
-	}
-
-	public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
-	}
-
-	public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
-	}
-
-	public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
-	}
-
-	public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
-	}
-
-	public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
-		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
-	}
-
-	public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
-	}
-
-	public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
-		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
-	}
-
-	public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
-	}
-
-	public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
-	}
-
-	public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
-	}
-
-	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
-	}
-
-	public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
-	}
-	
-	public int GetInputEncoding(int /*long*/ aInputEncoding) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
-	}
-
-	public int GetDocumentURI(int /*long*/ aDocumentURI) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
-	}
-
-	public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
-	}
-
-	public int CreateRange(int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
-	}
-
-	public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
-	}
-
-	public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
-	}
-
-	public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
-	}
-
-	public int GetDefaultView(int /*long*/[] aDefaultView) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
-	}
-
-	public int GetCharacterSet(int /*long*/ aCharacterSet) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
-	}
-
-	public int GetDir(int /*long*/ aDir) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
-	}
-
-	public int SetDir(int /*long*/ aDir) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
-	}
-
-	public int GetLocation(int /*long*/[] aLocation) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
-	}
-
-	public int GetTitle(int /*long*/ aTitle) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
-	}
-
-	public int SetTitle(int /*long*/ aTitle) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
-	}
-
-	public int GetReadyState(int /*long*/ aReadyState) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
-	}
-
-	public int GetLastModified(int /*long*/ aLastModified) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
-	}
-
-	public int GetReferrer(int /*long*/ aReferrer) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
-	}
-
-	public int HasFocus(int[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
-	}
-
-	public int GetActiveElement(int /*long*/[] aActiveElement) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
-	}
-
-	public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
-	}
-
-	public int GetStyleSheets(int /*long*/[] aStyleSheets) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
-	}
-
-	public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
-	}
-
-	public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
-	}
-
-	public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
-	}
-
-	public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
-	}
-
-	public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
-	}
-
-	public int EnableStyleSheetsForSet(int /*long*/ name) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
-	}
-
-	public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
-	}
-
-	public int GetContentType(int /*long*/ aContentType) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
-	}
-
-	public int GetMozSyntheticDocument(int[] aMozSyntheticDocument) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
-	}
-
-	public int GetCurrentScript(int /*long*/[] aCurrentScript) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
-	}
-
-	public int ReleaseCapture() {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
-	}
-
-	public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
-	}
-
-	public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
-	}
-
-	public int MozCancelFullScreen() {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 51, getAddress());
-	}
-
-	public int GetMozFullScreen(int[] aMozFullScreen) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 52, getAddress(), aMozFullScreen);
-	}
-
-	public int GetMozFullScreenEnabled(int[] aMozFullScreenEnabled) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
-	}
-
-	public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
-	}
-
-	public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
-	}
-
-	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
-	}
-
-	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
-	}
-
-	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
-	}
-
-	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
-	}
-
-	public int GetMozHidden(int[] aMozHidden) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
-	}
-
-	public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
-		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
-	}
-}
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIDOMDocument extends nsIDOMNode {
+
+	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 61 : 17);
+
+	public static final String NS_IDOMDOCUMENT_IID_STR =
+		"a6cf9075-15b3-11d2-932e-00805f8add32";
+
+	public static final String NS_IDOMDOCUMENT_10_IID_STR =
+		"5c3bff4d-ae7f-4c93-948c-519589672c30";
+
+	public static final nsID NS_IDOMDOCUMENT_IID =
+		new nsID(NS_IDOMDOCUMENT_IID_STR);
+
+	public static final nsID NS_IDOMDOCUMENT_10_IID =
+		new nsID(NS_IDOMDOCUMENT_10_IID_STR);
+
+	public  nsIDOMDocument(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetDoctype(int /*long*/[] aDoctype) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
+	}
+
+	public int GetImplementation(int /*long*/[] aImplementation) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
+	}
+
+	public int GetDocumentElement(int /*long*/[] aDocumentElement) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
+	}
+
+	public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
+	}
+
+	public int CreateDocumentFragment(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
+	}
+
+	public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
+	}
+
+	public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
+	}
+
+	public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
+	}
+
+	public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
+	}
+
+	public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
+	}
+
+	public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
+	}
+
+	public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
+	}
+
+	public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
+	}
+
+	public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
+	}
+
+	public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
+	}
+
+	public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
+	}
+
+	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
+	}
+
+	public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
+	}
+	
+	public int GetInputEncoding(int /*long*/ aInputEncoding) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
+	}
+
+	public int GetDocumentURI(int /*long*/ aDocumentURI) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
+	}
+
+	public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
+	}
+
+	public int CreateRange(int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
+	}
+
+	public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
+	}
+
+	public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
+	}
+
+	public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
+	}
+
+	public int GetDefaultView(int /*long*/[] aDefaultView) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
+	}
+
+	public int GetCharacterSet(int /*long*/ aCharacterSet) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
+	}
+
+	public int GetDir(int /*long*/ aDir) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
+	}
+
+	public int SetDir(int /*long*/ aDir) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
+	}
+
+	public int GetLocation(int /*long*/[] aLocation) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
+	}
+
+	public int GetTitle(int /*long*/ aTitle) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
+	}
+
+	public int SetTitle(int /*long*/ aTitle) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
+	}
+
+	public int GetReadyState(int /*long*/ aReadyState) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
+	}
+
+	public int GetLastModified(int /*long*/ aLastModified) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
+	}
+
+	public int GetReferrer(int /*long*/ aReferrer) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
+	}
+
+	public int HasFocus(int[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
+	}
+
+	public int GetActiveElement(int /*long*/[] aActiveElement) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
+	}
+
+	public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
+	}
+
+	public int GetStyleSheets(int /*long*/[] aStyleSheets) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
+	}
+
+	public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
+	}
+
+	public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
+	}
+
+	public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
+	}
+
+	public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
+	}
+
+	public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
+	}
+
+	public int EnableStyleSheetsForSet(int /*long*/ name) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
+	}
+
+	public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
+	}
+
+	public int GetContentType(int /*long*/ aContentType) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
+	}
+
+	public int GetMozSyntheticDocument(int[] aMozSyntheticDocument) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
+	}
+
+	public int GetCurrentScript(int /*long*/[] aCurrentScript) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
+	}
+
+	public int ReleaseCapture() {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
+	}
+
+	public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
+	}
+
+	public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
+	}
+
+	public int MozCancelFullScreen() {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 51, getAddress());
+	}
+
+	public int GetMozFullScreen(int[] aMozFullScreen) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 52, getAddress(), aMozFullScreen);
+	}
+
+	public int GetMozFullScreenEnabled(int[] aMozFullScreenEnabled) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
+	}
+
+	public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
+	}
+
+	public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
+	}
+
+	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
+	}
+
+	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
+	}
+
+	public int GetMozHidden(int[] aMozHidden) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
+	}
+
+	public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
+	}
+}
Index: org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebBrowser.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebBrowser.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -84,4 +84,4 @@
 		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aIsActive);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -72,4 +72,4 @@
 	public int SetFocusedElement(int /*long*/ aFocusedElement) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -52,4 +52,4 @@
 	public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);
 	}
-}
+}
\ No newline at end of file
Index: org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
===================================================================
--- org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java	(.../vendor/swt/linux-gtk/3.8/src)	(revision 23809)
+++ org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java	(.../trunk/thirdparty/swt/3.8/linux-gtk/src)	(revision 23809)
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMWindowCollection extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =
-		"a6cf906f-15b3-11d2-932e-00805f8add32";
-
-	public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
-		new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
-
-	public nsIDOMWindowCollection(int /*long*/ address) {
-		super(address);
-	}
-
-	public int GetLength(int[] aLength) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
-	}
-
-	public int Item(int index, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
-	}
-
-	public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMWindowCollection extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =
+		"a6cf906f-15b3-11d2-932e-00805f8add32";
+
+	public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
+		new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
+
+	public nsIDOMWindowCollection(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetLength(int[] aLength) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
+	}
+
+	public int Item(int index, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
+	}
+
+	public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
+	}
+}
\ No newline at end of file
Index: os.c
===================================================================
--- os.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ os.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -9558,7 +9558,7 @@
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
-	}
+		}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
 }
 #endif
Index: make_linux.mak
===================================================================
--- make_linux.mak	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ make_linux.mak	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -90,7 +90,7 @@
 	-DNO__1Call__JJJJJI \
 	-DNO_nsDynamicFunctionLoad
 XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-
+	
 WEBKITCFLAGS = `pkg-config --cflags glib-2.0`
 
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
Index: build.sh
===================================================================
--- build.sh	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ build.sh	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -50,14 +50,14 @@
 		PROC=`uname -i`
 		MAKEFILE=make_solaris.mak
 		if [ "${MODEL}" = "" ]; then
-			if uname -p > /dev/null 2>&1; then
-				MODEL=`uname -p`
-			fi
+		if uname -p > /dev/null 2>&1; then
+			MODEL=`uname -p`
 		fi
+		fi
 		case $MODEL in
 			"i386" | "x86")
-				MAKEFILE=make_solaris_x86.mak
-				MAKE_TYPE=gmake
+			MAKEFILE=make_solaris_x86.mak
+			MAKE_TYPE=gmake
 				;;
 		esac
 		;;
@@ -252,7 +252,7 @@
 #		export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"
 		if [ "${CC}" = "" ]; then
 			export CC="cc"
-		fi	
+		fi
 		if [ "${CXX}" = "" ]; then
 			export CXX="CC"
 		fi
@@ -423,12 +423,12 @@
 			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
+		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"
Index: about.html
===================================================================
--- about.html	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ about.html	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -70,7 +70,7 @@
 <ul>
 	<li>The contents of the directory org/eclipse/swt/internal/accessibility/gtk (but not including any sub-directories)</li>
 	<li>The contents of the directory org/eclipse/swt/internal/cde (but not including any sub-directories)</li>
-	<li>The contents of the directory org/eclipse/swt/internal/gtk (but not including any sub-directories)</li>				
+	<li>The contents of the directory org/eclipse/swt/internal/gtk (but not including any sub-directories)</li>
 </ul>
 
 <p>The GTK+ Binding contains portions of GTK+ (&quot;Library&quot;).  GTK+ is made available by The Free Software Foundation.  Use of the Library is governed by the terms and
Index: fragment.properties
===================================================================
Index: META-INF/eclipse.inf
===================================================================
--- META-INF/eclipse.inf	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ META-INF/eclipse.inf	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true
Index: META-INF/ECLIPSEF.SF
===================================================================
--- META-INF/ECLIPSEF.SF	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ META-INF/ECLIPSEF.SF	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,1906 @@
+Signature-Version: 1.0
+SHA1-Digest-Manifest: 091wtw7w64CNvIwTgIM0zjagPbY=
+Created-By: 1.6.0 (IBM Corporation)
+SHA1-Digest-Manifest-Main-Attributes: pwCcYVg3Da7jt0b8wy2xkmDpU6Q=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+SHA1-Digest: IEjMGI2vHsnZxS5o7XLAsERE0CQ=
+
+Name: org/eclipse/swt/internal/gtk/XExposeEvent.java
+SHA1-Digest: uH5GQsc+1LZk3KnyAsmn3YcZVyA=
+
+Name: org/eclipse/swt/graphics/Image.java
+SHA1-Digest: UZX53Vdt3vZ49BIHStro3iFjipQ=
+
+Name: org/eclipse/swt/accessibility/Accessible.java
+SHA1-Digest: yvZp5HXoTEA0P9j4TwWBCgpd6EI=
+
+Name: org/eclipse/swt/widgets/ImageList.java
+SHA1-Digest: ies5Z9vZNZhvpGAm6uvXRnf538M=
+
+Name: org/eclipse/swt/events/MouseMoveListener.java
+SHA1-Digest: bQ4s5vsG4qV5DHAPF78NkhI0g6s=
+
+Name: org/eclipse/swt/internal/cde/DtActionArg.java
+SHA1-Digest: rY98LUaiZfMELAwiugsH/BptzS0=
+
+Name: org/eclipse/swt/browser/AuthenticationListener.java
+SHA1-Digest: dVMTX/kltzm5RzL61nLYYX60vY0=
+
+Name: about_files/about_cairo.html
+SHA1-Digest: cIGcYxNbgonKz8LhQEhkzSLEDI0=
+
+Name: org/eclipse/swt/accessibility/AccessibleFactory.java
+SHA1-Digest: pPiz7gdhoTK08RB8nRrynvXfTuY=
+
+Name: org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+SHA1-Digest: 6Pud95blWU5tllaUabksRuB4Q6s=
+
+Name: org/eclipse/swt/layout/FillData.java
+SHA1-Digest: 9YiGVMcOc64w2VnPWhdzQm35XaY=
+
+Name: org/eclipse/swt/internal/gtk/PangoAttrColor.java
+SHA1-Digest: 5in2/7g+phv0Iv60FD0HMmutIJk=
+
+Name: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+SHA1-Digest: Ypclczyatn+0VMwx184pxb5jeRM=
+
+Name: org/eclipse/swt/dnd/DropTargetEffect.java
+SHA1-Digest: zMQTol0m82rtwWIcKGhQ2byu2hs=
+
+Name: org/eclipse/swt/custom/TableCursor.java
+SHA1-Digest: lghsvdpKDjgMShm63quBvmPJHNc=
+
+Name: xpcom_custom.cpp
+SHA1-Digest: w3tGtVGafcTq5TvaYIZiWSl84sI=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+SHA1-Digest: fTbzrAFXxsNtQ5s1Nuu2RiKEFyM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+SHA1-Digest: zN9BWZthLks0IUu9wAR9U3pbXeM=
+
+Name: org/eclipse/swt/internal/gtk/GdkGeometry.java
+SHA1-Digest: OYKalZC1+KEuoFyzrRY1z47hc+M=
+
+Name: org/eclipse/swt/graphics/GC.java
+SHA1-Digest: HpeuAO7Bc69ewV7lUYy0Gs3y7LE=
+
+Name: xpcom_stats.h
+SHA1-Digest: QEmEa2UMRDkWKG0mZW4KuecsHAY=
+
+Name: org/eclipse/swt/opengl/GLCanvas.java
+SHA1-Digest: 31iXBWSMshnFag3FXfXM2FjO/bA=
+
+Name: org/eclipse/swt/internal/SWTMessages.properties
+SHA1-Digest: MCkv5LNV6OOANnwczOr+nWG8SgQ=
+
+Name: org/eclipse/swt/internal/image/PNGFileFormat.java
+SHA1-Digest: tjvobIGJGklWJUllps62HuWZxLs=
+
+Name: org/eclipse/swt/internal/image/FileFormat.java
+SHA1-Digest: q7vsdJNPNoJfx2E1ADPWk78gPIY=
+
+Name: atk_stats.c
+SHA1-Digest: T/hZCnBic5W7fmVoXGkUlR4ZYzU=
+
+Name: org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.j
+ ava
+SHA1-Digest: KDiS4S5OFU8zoG/Ce7muNUw9vzQ=
+
+Name: org/eclipse/swt/layout/FormLayout.java
+SHA1-Digest: MtnZnx4q2XdwspQbTV7ZxpDfC5g=
+
+Name: org/eclipse/swt/events/ShellListener.java
+SHA1-Digest: 1g4esdasSNnqc9AQseCVmGTjOiA=
+
+Name: atk_stats.h
+SHA1-Digest: OkvnC77Ttd0a3C3sIQOPyOpDErk=
+
+Name: org/eclipse/swt/custom/PopupList.java
+SHA1-Digest: HTY72vGjVickbazwNkz/5Uo+xf4=
+
+Name: gnome_structs.c
+SHA1-Digest: CDTfnXq5Om0/lq4nB2/T0c1PJPw=
+
+Name: org/eclipse/swt/custom/StyleRange.java
+SHA1-Digest: JJUpuZ4BPKi9A/JNCr7I4/Nydqk=
+
+Name: org/eclipse/swt/internal/image/JPEGRestartInterval.java
+SHA1-Digest: bFmCwLja646QaYyvsfUC82ESdFI=
+
+Name: gnome_structs.h
+SHA1-Digest: Sgczrmvyp82yqZUXlcDfjo7VHlI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIAppShell.java
+SHA1-Digest: ripuF6RlCMxALOkI19bmG5oNPSo=
+
+Name: org/eclipse/swt/dnd/URLTransfer.java
+SHA1-Digest: JXHJFd0ORKl9/MknYglAX3lOzZc=
+
+Name: cairo_custom.h
+SHA1-Digest: fZR9KT+xRX4O4tLR+5/N4MyTJYs=
+
+Name: org/eclipse/swt/internal/gtk/PangoAttrInt.java
+SHA1-Digest: 5PPYWhvagxE3+Vrb2a0QixiQimQ=
+
+Name: org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+SHA1-Digest: gk9NQoPSd3pADSuFS+EHAvEYbK4=
+
+Name: org/eclipse/swt/accessibility/AccessibleControlEvent.java
+SHA1-Digest: +bpZKd25qkLJ/xW7wSO7y7gqP/0=
+
+Name: org/eclipse/swt/internal/image/JPEGScanHeader.java
+SHA1-Digest: p8+ewC9Aj0DwMntP6n/7MJcwCJE=
+
+Name: org/eclipse/swt/browser/PromptDialog.java
+SHA1-Digest: qDWWLGaWVFVRe6AyqjUUG9jU9Ck=
+
+Name: make_linux.mak
+SHA1-Digest: LgjHIsLBlzBC5KS5EDoq+iR7P7w=
+
+Name: org/eclipse/swt/internal/mozilla/nsISerializable.java
+SHA1-Digest: K/2e/DP26i6FafdvrXGi+6r5Xu8=
+
+Name: org/eclipse/swt/custom/CBanner.java
+SHA1-Digest: YiH83rxg2UkvdM75A8qkRzA+cdc=
+
+Name: org/eclipse/swt/custom/CaretEvent.java
+SHA1-Digest: V9iAqZk98EGsV67VnUhPmiqhK6g=
+
+Name: org/eclipse/swt/events/ControlEvent.java
+SHA1-Digest: nmq79JZ70UOhK8rLOQDCwpH5NGI=
+
+Name: org/eclipse/swt/custom/TableTree.java
+SHA1-Digest: EdhQBAXwWPhfgmY9J8RWy7Fzuic=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+SHA1-Digest: zDd1bAHtLI1z07jGy7WhXkCVPLk=
+
+Name: org/eclipse/swt/opengl/GLData.java
+SHA1-Digest: gG93AqNWYmSL+tVz8dpvfw8yp7M=
+
+Name: org/eclipse/swt/printing/PrinterData.java
+SHA1-Digest: vAgpz1Br9Q4FOsQPnx3uo20cILE=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+SHA1-Digest: Zp37xbR5V1Z2O4Gh80NVOfmRsuk=
+
+Name: org/eclipse/swt/events/SelectionListener.java
+SHA1-Digest: fzo3FezLB30Aj0jQUskf0ilXzdc=
+
+Name: org/eclipse/swt/graphics/RGB.java
+SHA1-Digest: hDZ6eYxHzi3zGkfjgb87qi11qKc=
+
+Name: org/eclipse/swt/internal/image/JPEGSegment.java
+SHA1-Digest: 0V/YZrPHwqHzByIIKZL6nkkjCVE=
+
+Name: version.txt
+SHA1-Digest: RYRqiBQUQfEMjhyj+pY1QAGh82I=
+
+Name: org/eclipse/swt/custom/ViewForm.java
+SHA1-Digest: 82WLNB8o+Hf6VWuhLZOucla2GTU=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+SHA1-Digest: qEs/Xu5TL+j13X8REctCnBTJFDw=
+
+Name: org/eclipse/swt/widgets/Menu.java
+SHA1-Digest: tGB+sHoOZTPdgAdg4ZiZSFh0Th8=
+
+Name: org/eclipse/swt/widgets/Caret.java
+SHA1-Digest: JRfsT307EDgxnenlECXgCBi+0k4=
+
+Name: org/eclipse/swt/dnd/Clipboard.java
+SHA1-Digest: 6JPgN7u5ywwshTjLpSDFua/RaBo=
+
+Name: org/eclipse/swt/custom/TableEditor.java
+SHA1-Digest: +EqmSbiBJueuHLPltLhzGjOpOS4=
+
+Name: org/eclipse/swt/events/ShellEvent.java
+SHA1-Digest: HiMopwKnzPcBUTlA32gAxQtmROY=
+
+Name: org/eclipse/swt/custom/CaretListener.java
+SHA1-Digest: HZZxgiaiziUirc3yXqcyFCyUi4Q=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+SHA1-Digest: 17uP0pkzQBEKNJYpSuXsigPkwPw=
+
+Name: org/eclipse/swt/custom/LineStyleEvent.java
+SHA1-Digest: cRg/uM25dhOZ5N7UjtmJIvIpi4k=
+
+Name: org/eclipse/swt/widgets/Monitor.java
+SHA1-Digest: xmNZFafcRDgA4VLIEbHBxeuu7kw=
+
+Name: org/eclipse/swt/internal/mozilla/nsIURI.java
+SHA1-Digest: 7D+Yq7ZyMXBpinj2JdsxzY2NRkI=
+
+Name: org/eclipse/swt/internal/Callback.java
+SHA1-Digest: KlmKn1tM3ubwzXAwQOF+rcOTfHs=
+
+Name: org/eclipse/swt/dnd/DragSourceEvent.java
+SHA1-Digest: LsCIU6KwoSD668Ouw9F3X8qVsi8=
+
+Name: org/eclipse/swt/layout/GridLayout.java
+SHA1-Digest: 44N0dXx6ptzsv/2/GXvSkSus2P8=
+
+Name: org/eclipse/swt/internal/theme/ToolItemDrawData.java
+SHA1-Digest: 8ygh8UwcMlDK7HMqx+KZ+HJVr9w=
+
+Name: org/eclipse/swt/custom/ControlEditor.java
+SHA1-Digest: 45UYO6SmMpQiIjiMU3fppTqYTko=
+
+Name: org/eclipse/swt/graphics/ImageLoaderEvent.java
+SHA1-Digest: xdsyGWreWdlJdEBn790Xj+J7S78=
+
+Name: org/eclipse/swt/browser/TitleEvent.java
+SHA1-Digest: HEsUQgwfmoJ9MD4Hs0Jeks6Nhrg=
+
+Name: org/eclipse/swt/events/FocusAdapter.java
+SHA1-Digest: ckMI56VCSNafajkZzlbj0VmqxcU=
+
+Name: org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+SHA1-Digest: gcaEfN5itNsIP96FdhsCGRPtX64=
+
+Name: org/eclipse/swt/widgets/FileDialog.java
+SHA1-Digest: 8dQa5QonpV8AAaWgCEtJumzCseE=
+
+Name: org/eclipse/swt/widgets/Synchronizer.java
+SHA1-Digest: GUIr/Cj4/aYyexlJcFen5SDi2Oc=
+
+Name: org/eclipse/swt/browser/VisibilityWindowAdapter.java
+SHA1-Digest: VmLETeHrs+o2gpQbOQQvWH8Eqs4=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass
+ .java
+SHA1-Digest: 1TNNxtgBNdalz57lDBVfP4R1cs0=
+
+Name: org/eclipse/swt/dnd/Transfer.java
+SHA1-Digest: ofkzdxTegrzHpgykqcBzjYykv1w=
+
+Name: org/eclipse/swt/custom/CTabItem.java
+SHA1-Digest: OS3lmKPUg3t/pilR/ELcEI0iZwk=
+
+Name: org/eclipse/swt/widgets/List.java
+SHA1-Digest: aq/yWu2i+itRrx7Fo6rI4Rm2nEw=
+
+Name: org/eclipse/swt/events/DragDetectListener.java
+SHA1-Digest: 53ZeDMxcdGOQyEjnci72o14P2D4=
+
+Name: xpcom_structs.h
+SHA1-Digest: /Ot32famBdWtSi2g9les4z+PgMA=
+
+Name: org/eclipse/swt/events/ArmListener.java
+SHA1-Digest: 7FkqZEs5QZ5iPHRLjHskjerk1LU=
+
+Name: swt.c
+SHA1-Digest: hwIH38+fO7jaFqWR018RTNB3q/k=
+
+Name: org/eclipse/swt/widgets/Canvas.java
+SHA1-Digest: ZovYnmAll2ciuofCQJQIs6aFnl4=
+
+Name: org/eclipse/swt/internal/theme/GroupDrawData.java
+SHA1-Digest: aYOCXL20ex07svCUHEhWtfTT/5w=
+
+Name: swt.h
+SHA1-Digest: wT3b+m82cFGgU2zFVnp4wD2dvks=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+SHA1-Digest: jcIGd6CmBknQW8eRE9n0+Eo8Sqg=
+
+Name: org/eclipse/swt/events/ArmEvent.java
+SHA1-Digest: NEPDCV3A4qdEx5uXFW9CDSHESog=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+SHA1-Digest: j22KU21/F3Dl8Q+0kGwSqsP61rg=
+
+Name: org/eclipse/swt/browser/Download.java
+SHA1-Digest: ULBF0qhLo7ilTjYqbrdi8GXx1UI=
+
+Name: org/eclipse/swt/SWT.java
+SHA1-Digest: B+o+t0K+G0U01oZXD+/Dfc0elF4=
+
+Name: org/eclipse/swt/dnd/DropTargetListener.java
+SHA1-Digest: tYSSDaH/d2oN+u9FTQXY95+y4FA=
+
+Name: org/eclipse/swt/events/MouseEvent.java
+SHA1-Digest: srDPHUcAX0NjIzPouK1e7PV/CMY=
+
+Name: build.xml
+SHA1-Digest: HkkyKRvOHQ6cwEtRza77O1lzvng=
+
+Name: org/eclipse/swt/internal/image/PngChunk.java
+SHA1-Digest: r1f+1aGqwIgwqbLPFlKwOIoMtyA=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+SHA1-Digest: 38M5l1AnzrY5ugmcsCc7wsXkwCk=
+
+Name: org/eclipse/swt/dnd/DND.java
+SHA1-Digest: 5Sa9IC8jMUVJtD8HVGWtHFO40Rg=
+
+Name: org/eclipse/swt/internal/gtk/XCrossingEvent.java
+SHA1-Digest: Yhotf9Wioa9x0ayj010K7cwYFpw=
+
+Name: org/eclipse/swt/widgets/Decorations.java
+SHA1-Digest: ceXgV9oXppBsOZ1uVGd8/cqYGG0=
+
+Name: org/eclipse/swt/widgets/DateTime.java
+SHA1-Digest: bANC3AS440O+e4xLRjeLcDQKV9Q=
+
+Name: glx_structs.c
+SHA1-Digest: wVtI93vpL1imtfUF8rL+4qQQWtE=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+SHA1-Digest: Kc7lzHp0wuJvR+wofBqw7kuLvZc=
+
+Name: glx_structs.h
+SHA1-Digest: AF6WILdE2ACMAQ7G7tc/kPjyqwo=
+
+Name: org/eclipse/swt/internal/image/JPEGComment.java
+SHA1-Digest: uf/uMRM5NMWUjLdrHx0gAW8P9ps=
+
+Name: org/eclipse/swt/internal/mozilla/nsIChannel.java
+SHA1-Digest: qFCGrZEzRMm9i8eohWQ5d+RkxXQ=
+
+Name: org/eclipse/swt/events/VerifyEvent.java
+SHA1-Digest: hpm320MeOOFTLvX4Zp83fe4rTTk=
+
+Name: org/eclipse/swt/accessibility/AccessibleListener.java
+SHA1-Digest: dfMFpbqxgXwe6c5069FeYZQHiVY=
+
+Name: org/eclipse/swt/internal/image/PngHuffmanTables.java
+SHA1-Digest: zktWjphtkNmJFqWr91mNthconSY=
+
+Name: xpcominit_stats.h
+SHA1-Digest: XTeo/nU2+rDwtsVQpk8RnjCaBLs=
+
+Name: org/eclipse/swt/internal/LONG.java
+SHA1-Digest: MYEVDNCN/6WLNhJAd1qhKOdMkh0=
+
+Name: org/eclipse/swt/internal/gtk/PangoRectangle.java
+SHA1-Digest: oWWFGP5QPVo1tCiT5ng51U3qwNU=
+
+Name: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+SHA1-Digest: Z9Rpidk4J8AEqIre3ljq/iTiqFw=
+
+Name: org/eclipse/swt/custom/ScrolledCompositeLayout.java
+SHA1-Digest: MLjJ3UBcsRAwwATURmnEYNXKTQE=
+
+Name: org/eclipse/swt/custom/CCombo.java
+SHA1-Digest: ricktNCU3+B4QCuh2TZKt5L+mL4=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.jav
+ a
+SHA1-Digest: 5vRQ6dk6muL1O3165vppUy1nCDE=
+
+Name: org/eclipse/swt/internal/image/JPEGFileFormat.java
+SHA1-Digest: /33yliMHMOt2EtUX+UcYjKIEd9o=
+
+Name: org/eclipse/swt/events/PaintListener.java
+SHA1-Digest: qI2igSVnh9DDnv51aLMVMYP85b0=
+
+Name: org/eclipse/swt/events/MouseAdapter.java
+SHA1-Digest: 8bp2JNzcnGusag2u1f9skAMHl7I=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventScroll.java
+SHA1-Digest: kW77JJEQG+lEBbxeh5prZV6z71g=
+
+Name: org/eclipse/swt/dnd/DropTargetAdapter.java
+SHA1-Digest: maER557EcmrQ/oWYf2Qr8y70vzA=
+
+Name: atk_structs.c
+SHA1-Digest: AG5e28S1BzAPiloG9FnZ9lBUE5A=
+
+Name: org/eclipse/swt/custom/DefaultContent.java
+SHA1-Digest: 6zWE0QM6QXbZsegcAeqLcGw8ZXI=
+
+Name: org/eclipse/swt/browser/CloseWindowListener.java
+SHA1-Digest: EyYffGDUva71l0ZLkqhDMV+CR7o=
+
+Name: org/eclipse/swt/graphics/PathData.java
+SHA1-Digest: UfHR7HlG5CaBKVD9nkG/2/nN2/8=
+
+Name: org/eclipse/swt/internal/image/WinICOFileFormat.java
+SHA1-Digest: KDsN3hAducOEhomBugE87ySdq4I=
+
+Name: org/eclipse/swt/events/KeyEvent.java
+SHA1-Digest: bc6sznTZXbghl8rwdudljGwUfCI=
+
+Name: atk_structs.h
+SHA1-Digest: US61JTaREWfkBXMlozN9Sh99CH8=
+
+Name: org/eclipse/swt/graphics/LineAttributes.java
+SHA1-Digest: 7ErJ081MXW/PFSmLMZkEyFqwpUI=
+
+Name: org/eclipse/swt/custom/SashFormLayout.java
+SHA1-Digest: HuFN1XzmUeVlptJSAdZhnKh5gE4=
+
+Name: org/eclipse/swt/custom/AnimatedProgress.java
+SHA1-Digest: oGV+UTGb02a3r9TN5Wjo5kEuH9g=
+
+Name: org/eclipse/swt/internal/cairo/cairo_path_data_t.java
+SHA1-Digest: ONDrR1nkg5eDlNWdgrNwgAUj3Qk=
+
+Name: c_structs.c
+SHA1-Digest: n601YpHWfhXZbbrwr1W7vtYUuh4=
+
+Name: org/eclipse/swt/widgets/ColorDialog.java
+SHA1-Digest: PONnOeY2a2vMBT+5+E+rMOZbJzE=
+
+Name: c_structs.h
+SHA1-Digest: wfezwG6N3C6ipD9FqjJ4B6mDiFo=
+
+Name: cairo_stats.c
+SHA1-Digest: 6GOvRa6oMFkTwZlnsFgfC7WpONE=
+
+Name: org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+SHA1-Digest: l7EQLL/cib7U6Iw6ZlOD5ORFQ2c=
+
+Name: org/eclipse/swt/printing/Printer.java
+SHA1-Digest: 392r4WetBI8WYe1Azt/4/rCOpD4=
+
+Name: org/eclipse/swt/browser/FilePicker_1_8.java
+SHA1-Digest: L6Gn94Ht1PX2tPdtc7wftJu2i9o=
+
+Name: cairo_stats.h
+SHA1-Digest: G6/kyh4BK8zmOyylhKw30grg5Mw=
+
+Name: org/eclipse/swt/internal/gtk/XWindowChanges.java
+SHA1-Digest: 10eTJkX6lv56rnZPB9csqkz6yAU=
+
+Name: org/eclipse/swt/widgets/Tray.java
+SHA1-Digest: Vk16Deo+eq+zvJKhBdlp2g6+mmY=
+
+Name: org/eclipse/swt/graphics/ImageDataLoader.java
+SHA1-Digest: g1Ok3PH0mo1LURoAHQhJsgP7xT8=
+
+Name: org/eclipse/swt/accessibility/AccessibleAdapter.java
+SHA1-Digest: 8K79PcSc/ShGnqkvKPixxkbMX6E=
+
+Name: org/eclipse/swt/internal/theme/Theme.java
+SHA1-Digest: nj63lVH+mRGVVooHqwXnzm1ijLU=
+
+Name: org/eclipse/swt/graphics/Font.java
+SHA1-Digest: mp3xLq9TR2IpqcbOoHaXTxlqzWE=
+
+Name: org/eclipse/swt/internal/mozilla/nsIFile.java
+SHA1-Digest: w2QbIdIqWw6FQAr8XlXR7kOfRdA=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.jav
+ a
+SHA1-Digest: Juh+/3nH9vxxzPu5mzJuutOkpuQ=
+
+Name: org/eclipse/swt/graphics/Point.java
+SHA1-Digest: TxpVbY6eKWGJef/zSOfi0Ddtv6g=
+
+Name: org/eclipse/swt/internal/image/JPEGHuffmanTable.java
+SHA1-Digest: CpN+jMrTUa/RpEASCWes8nswmk0=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventFocus.java
+SHA1-Digest: UjOpyoJuYCx3ZkGap36V5Bc5Dck=
+
+Name: org/eclipse/swt/internal/image/TIFFModifiedHuffmanCodec.java
+SHA1-Digest: giA2cpCyNmh5D5/euc+K/rXzyA4=
+
+Name: org/eclipse/swt/internal/cde/CDE.java
+SHA1-Digest: Ie0QHP88P5om3M+UJiz7v5u8MK0=
+
+Name: callback.c
+SHA1-Digest: WK2OaHvOUajqPh2oV8YRS604pO4=
+
+Name: org/eclipse/swt/internal/Platform.java
+SHA1-Digest: JLEo5RdsTdtBJYwYSbW7A0xCKcQ=
+
+Name: org/eclipse/swt/custom/TableTreeItem.java
+SHA1-Digest: SXeeOJRRebyD+i/ZEVofiSZ7SXg=
+
+Name: org/eclipse/swt/internal/SerializableCompatibility.java
+SHA1-Digest: ehkJ12/7eiG9wvvzGFe6oOEhKj0=
+
+Name: callback.h
+SHA1-Digest: Wxpy3d8PNoy3jvdpl1psVnt0x+E=
+
+Name: org/eclipse/swt/custom/Bullet.java
+SHA1-Digest: UvMGLbEbwUolgj+rl7W8g2q+ym8=
+
+Name: org/eclipse/swt/browser/Download_1_8.java
+SHA1-Digest: bAcunGWdJOneHFX1ZnCjosiyH78=
+
+Name: org/eclipse/swt/accessibility/AccessibleTextListener.java
+SHA1-Digest: abOb0W7lsvPQDyVKIbeIH97P9vE=
+
+Name: org/eclipse/swt/custom/BusyIndicator.java
+SHA1-Digest: qnR7eTAHrCiTMnYAYGHkz5qgXs0=
+
+Name: org/eclipse/swt/graphics/TextLayout.java
+SHA1-Digest: Wlnen+BlkwxwQEyzfO2cFilHURs=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+SHA1-Digest: RuWmSNfJocefqzxPxCM3kljxB3c=
+
+Name: org/eclipse/swt/events/FocusEvent.java
+SHA1-Digest: S+iIj7y3uyDsZdPRd0ECVZTmpNM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+SHA1-Digest: TiH0Kb/1e/ph2WSrHFv36W1CLNs=
+
+Name: org/eclipse/swt/internal/mozilla/nsIFactory.java
+SHA1-Digest: uL0ma9X657g/xytfIrl8me0zBwU=
+
+Name: org/eclipse/swt/internal/mozilla/nsICookieManager.java
+SHA1-Digest: 3AR6mFTRJDSZgXNIzXQ13n37xt4=
+
+Name: org/eclipse/swt/browser/HelperAppLauncherDialog.java
+SHA1-Digest: iUTGdgtMECErkbLYg+TXnf+V9Yo=
+
+Name: org/eclipse/swt/events/PaintEvent.java
+SHA1-Digest: O8bu+wmsyVR0bcSSkQO5tAdATyU=
+
+Name: xpcominit_structs.h
+SHA1-Digest: hc4AJEsxqBI5zfUlAeeMuFcuwMw=
+
+Name: os_structs.c
+SHA1-Digest: JfA6Edxi2vEwtnuO5zqC5jv+RK8=
+
+Name: cde.c
+SHA1-Digest: bQSg7+GBj2AyVCeXvSccErvVWbo=
+
+Name: os_structs.h
+SHA1-Digest: Q5sq6QgXJiO92ES9l5qETcUSGmc=
+
+Name: cde.h
+SHA1-Digest: TrLLaKpIF6acciYhmVPOXxZ8arU=
+
+Name: os_custom.c
+SHA1-Digest: ViVVYzv61EJOyAgcS3bbooR+wSc=
+
+Name: xpcom_custom.h
+SHA1-Digest: yaK6D7APVqzI2rNysitMjaCncoA=
+
+Name: org/eclipse/swt/internal/BidiUtil.java
+SHA1-Digest: nOqD42oPwBPdG0AeOqHNvTNK8gA=
+
+Name: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+SHA1-Digest: n8ji0MRjt6C7l3v5Xc/XLgrV1zg=
+
+Name: org/eclipse/swt/events/ControlListener.java
+SHA1-Digest: fQDy9jzlQ2SdDrjv/IORwDYIYXo=
+
+Name: org/eclipse/swt/custom/ST.java
+SHA1-Digest: bv3h/fJu+evdgI0PEOM86NeO8FA=
+
+Name: org/eclipse/swt/browser/StatusTextListener.java
+SHA1-Digest: wvxNSI3qzFKdH7N5OAbZ8Kf0g4U=
+
+Name: org/eclipse/swt/internal/mozilla/nsIIOService.java
+SHA1-Digest: mZU7hNSkz5+Hid2sEl7fL0O60Bw=
+
+Name: os_custom.h
+SHA1-Digest: lwvijK+R2mIIFXoFd7PgP/atRmw=
+
+Name: org/eclipse/swt/internal/mozilla/XPCOMObject.java
+SHA1-Digest: jy69iVtKF61WRF88tuhNJyXPAJs=
+
+Name: org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+SHA1-Digest: ibVu6nldTRUEJx22duN0iiNP/dM=
+
+Name: org/eclipse/swt/events/SelectionAdapter.java
+SHA1-Digest: 5C4OUryFrbJtGnpmKLYoSjVCxoM=
+
+Name: nsIScriptGlobalObject.h
+SHA1-Digest: VZ5/4AyULMd+5khNdf3/rI8E4fk=
+
+Name: org/eclipse/swt/internal/image/TIFFDirectory.java
+SHA1-Digest: jmJKg1igiMJOwowI5FtFTYDKOaA=
+
+Name: org/eclipse/swt/internal/image/GIFFileFormat.java
+SHA1-Digest: Z4aRjCyAPQSEQMzxDSpwluCPjeo=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+SHA1-Digest: BuyG7I2kUCSmoyd8o5etdAADsm0=
+
+Name: org/eclipse/swt/widgets/Combo.java
+SHA1-Digest: DXrModFhNrD1acI1QgI5/uPMeYA=
+
+Name: org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.
+ java
+SHA1-Digest: kr4UCHRAArB1YDEawdT46XWQG10=
+
+Name: org/eclipse/swt/internal/Library.java
+SHA1-Digest: vIX3/cF7P49Sy2E/aBkj4EfP5ko=
+
+Name: org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+SHA1-Digest: pgrp4wDKlQffeat/nGgqVlKYALc=
+
+Name: org/eclipse/swt/internal/opengl/glx/GLX.java
+SHA1-Digest: t7nAGG82x3S0PJJYucNCh1m+QP8=
+
+Name: org/eclipse/swt/internal/gtk/XAnyEvent.java
+SHA1-Digest: JiwF+07Z0K6ZL2Oyaq83rMK2B3w=
+
+Name: org/eclipse/swt/internal/gtk/GtkRequisition.java
+SHA1-Digest: bCCgi/cbinMpAxz/9dFXZdk+dSg=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+SHA1-Digest: zXpdhP/djSEaJSL+h3bcprHPDjk=
+
+Name: org/eclipse/swt/custom/StyledTextContent.java
+SHA1-Digest: Na8upy1nCwBHUiJorNFg/eFvuoA=
+
+Name: org/eclipse/swt/widgets/Tracker.java
+SHA1-Digest: 1z4lxpicdhhM4hBzjYpZLbSAz8c=
+
+Name: org/eclipse/swt/browser/ExternalFactory.java
+SHA1-Digest: hNkYR5j64JMkdE1n8VjW6JR2myI=
+
+Name: org/eclipse/swt/internal/gtk/GtkCombo.java
+SHA1-Digest: gu+MjJoFqEW8ScP/aGF9SHuoExE=
+
+Name: org/eclipse/swt/widgets/Text.java
+SHA1-Digest: b8JQMfymplGBCy6FgOqEV1oMIJw=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+SHA1-Digest: 7w9npgXr84kC+07N3zE2I1LJtSw=
+
+Name: org/eclipse/swt/layout/FormAttachment.java
+SHA1-Digest: DzztBStuvy/a/bWfnvdwtU3C0P4=
+
+Name: org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java
+SHA1-Digest: m90V9JGhzfLcAUQKQOJePzUOcWY=
+
+Name: org/eclipse/swt/internal/image/LEDataInputStream.java
+SHA1-Digest: P/kF1Nq8w7GMQwAygD+bc5uZfv4=
+
+Name: org/eclipse/swt/graphics/PaletteData.java
+SHA1-Digest: auyULUB5e7v8rrgm77F4+ZKQthc=
+
+Name: org/eclipse/swt/browser/FilePickerFactory_1_8.java
+SHA1-Digest: aZyhmeESSbC2rv4+j1E+AucFYhA=
+
+Name: org/eclipse/swt/layout/RowLayout.java
+SHA1-Digest: rFiWoqU0IyexFDTJPb5p2yNDeNM=
+
+Name: org/eclipse/swt/events/KeyListener.java
+SHA1-Digest: Md6pkz/XV9fHJTbl+nH6MnJjQxw=
+
+Name: org/eclipse/swt/internal/theme/ScrollBarDrawData.java
+SHA1-Digest: ij8zkkKxAiCiD8BCMgE1/xl0/vU=
+
+Name: org/eclipse/swt/custom/CTabFolderEvent.java
+SHA1-Digest: TRa8zzjwOePj77NbvC23fveg1b0=
+
+Name: org/eclipse/swt/accessibility/ACC.java
+SHA1-Digest: N8AT3qRa69va4fHoUmohEMusneI=
+
+Name: org/eclipse/swt/internal/SWTEventObject.java
+SHA1-Digest: iyaT193xvfks94S+TveTKFEajVQ=
+
+Name: glx.c
+SHA1-Digest: I5aIscnOzguAM0ewnfTw2yznhhE=
+
+Name: org/eclipse/swt/dnd/RTFTransfer.java
+SHA1-Digest: kStQRhPL1GSbFZItDgRuUo9waIc=
+
+Name: about.html
+SHA1-Digest: ZqHDa87mOwjkS/0O+6luq7ruRiE=
+
+Name: org/eclipse/swt/events/TraverseEvent.java
+SHA1-Digest: Jb9XOHE7LKJDj7reniHcjn+jtD8=
+
+Name: glx.h
+SHA1-Digest: CnxnKD/gl0DZL5DlN0O/d5VGnuo=
+
+Name: org/eclipse/swt/internal/gtk/GdkDragContext.java
+SHA1-Digest: WJeFeF5VlR34y7VAzBVUowMuXa0=
+
+Name: org/eclipse/swt/widgets/ToolItem.java
+SHA1-Digest: vQk9zFF3zVvsYTzwZRNiSf+BHbE=
+
+Name: org/eclipse/swt/internal/gtk/GtkBorder.java
+SHA1-Digest: G54wFWBPma9z5nI9SXLrqSlvjUE=
+
+Name: org/eclipse/swt/internal/image/PngInputStream.java
+SHA1-Digest: NZcYo48/qmoa5kMToNNibHfhkZA=
+
+Name: org/eclipse/swt/dnd/ByteArrayTransfer.java
+SHA1-Digest: Kkb3FQC0+cCtDuVyeoEGZ1UVK04=
+
+Name: org/eclipse/swt/internal/theme/DrawData.java
+SHA1-Digest: 0ZGq6pfkBJY7drY95Pk52aUvLWM=
+
+Name: cairo_structs.c
+SHA1-Digest: yPiAOFwVGk8eCdwZKsPWjD26H4A=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventMotion.java
+SHA1-Digest: m70CopmZhkLSuv0HCqen1f6rYvA=
+
+Name: org/eclipse/swt/graphics/TextStyle.java
+SHA1-Digest: PnnGPQCOauqqw0uEPaWxAF3mHKk=
+
+Name: org/eclipse/swt/SWTException.java
+SHA1-Digest: yK4pwvgLReCV+vL+TXYGMFM1Qow=
+
+Name: org/eclipse/swt/widgets/Tree.java
+SHA1-Digest: 9xmVFg5mrkKpXQPfLkzhzXVh0fM=
+
+Name: cairo_structs.h
+SHA1-Digest: 63qK6I2fhyg48K/s7XUhBBJTFWk=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPrefService.java
+SHA1-Digest: uxsQqhhPalAvUWaRlgsrWqRRRng=
+
+Name: org/eclipse/swt/custom/CBannerLayout.java
+SHA1-Digest: nnHYK9BSSUDwyWGi571sABrJ8PY=
+
+Name: org/eclipse/swt/browser/ProgressAdapter.java
+SHA1-Digest: tvCaB4CHIUkmkdFk1DaPFHzntbA=
+
+Name: org/eclipse/swt/widgets/ExpandBar.java
+SHA1-Digest: 6XP9Qvjp/HlhsWtmMwu0uWIwntw=
+
+Name: org/eclipse/swt/browser/BrowserFunction.java
+SHA1-Digest: 5pLw8tGd53uGQJESDR63lCfIhqw=
+
+Name: org/eclipse/swt/widgets/MenuItem.java
+SHA1-Digest: 4wB1CRw2oR5IFFiGfO62WBZrIdc=
+
+Name: org/eclipse/swt/graphics/Resource.java
+SHA1-Digest: vY7xThPE42vyxpWGJYIb4+0y9HI=
+
+Name: org/eclipse/swt/custom/TextChangedEvent.java
+SHA1-Digest: gu9ljHU0hcMSk5Ce+PxnWk+KupQ=
+
+Name: org/eclipse/swt/custom/StyledTextDropTargetEffect.java
+SHA1-Digest: NgJVNv5pmGiaR9xUGzE0F64lBLQ=
+
+Name: org/eclipse/swt/events/ExpandEvent.java
+SHA1-Digest: Hahbiv/OD+BZ1ImMjkIZOX0+aM4=
+
+Name: org/eclipse/swt/widgets/TrayItem.java
+SHA1-Digest: 1Gz+YRA3gUe2IUm61/9pCNilk8Q=
+
+Name: gnome_stats.c
+SHA1-Digest: PY3ORVu4NIyHauF9OG50wzrNZWE=
+
+Name: org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+SHA1-Digest: Blvs17Nizp36R8aQnjRiWIhjtgY=
+
+Name: c.c
+SHA1-Digest: CfcPB/LF1F5w8HMDCmQrjRyriF4=
+
+Name: org/eclipse/swt/graphics/GCData.java
+SHA1-Digest: wCM/NfKTK/yHMQQzXhW/qKjO3/Q=
+
+Name: org/eclipse/swt/internal/cairo/cairo_path_t.java
+SHA1-Digest: pEHIXZ7oLEJeK8IZ35fKIzqb7g0=
+
+Name: gnome_stats.h
+SHA1-Digest: oEhLXRljaHg6hD4c/d8UjClkFd0=
+
+Name: org/eclipse/swt/widgets/ProgressBar.java
+SHA1-Digest: +2wIVstD1r8gu86IMy4bxdC5pII=
+
+Name: c.h
+SHA1-Digest: +B00noE9fih7PulcRZmGt9m71BM=
+
+Name: org/eclipse/swt/internal/gtk/GdkRectangle.java
+SHA1-Digest: /x7ka8+ETtja47XRlPtaIlBYyMQ=
+
+Name: org/eclipse/swt/internal/Compatibility.java
+SHA1-Digest: lwVwTwZLQQ66ebGgfC9dJdpNXag=
+
+Name: org/eclipse/swt/widgets/TableItem.java
+SHA1-Digest: tg16N1kYWXStXYXNpw8pVoqZITM=
+
+Name: org/eclipse/swt/browser/WebBrowser.java
+SHA1-Digest: 0P1qjYpyMeAQJ/CYkHxa3u9Mos4=
+
+Name: org/eclipse/swt/internal/mozilla/XPCOM.java
+SHA1-Digest: iqvx+tVuJJShFrGqG4Z1pbZqyFY=
+
+Name: org/eclipse/swt/internal/image/PngDecodingDataStream.java
+SHA1-Digest: XtpPy3ExYub4NRYGAA9qSiKrlHI=
+
+Name: org/eclipse/swt/dnd/TableDragSourceEffect.java
+SHA1-Digest: deFXVcyvX1Uj0/CXcXe8fMQxXgI=
+
+Name: about_files/lgpl-v21.txt
+SHA1-Digest: vLRHQ0KCBB5YFm/5YnaVHxopBAU=
+
+Name: org/eclipse/swt/layout/GridData.java
+SHA1-Digest: ImZNY7GipvVdbZq0DXiCzm2L2Eo=
+
+Name: org/eclipse/swt/internal/mozilla/nsID.java
+SHA1-Digest: TyHP/uP+FeTkL+USOfWc3pZ+Km0=
+
+Name: org/eclipse/swt/events/DragDetectEvent.java
+SHA1-Digest: PbtHIwow3F0Sxnju8l9RpFe6pOA=
+
+Name: cde_stats.c
+SHA1-Digest: cL5KgAacTkIQOHlvPQma9sxLo0g=
+
+Name: xpcom.cpp
+SHA1-Digest: fPT+jiwYk00GuEx9G4F27zcx2Ao=
+
+Name: cde_stats.h
+SHA1-Digest: QDgQ2XDJDOuihgTj7yyroxwaO54=
+
+Name: org/eclipse/swt/events/ExpandListener.java
+SHA1-Digest: 31upaO7fGgB95esx+5YbaNiImJI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+SHA1-Digest: LJd0spy7V1+TOE7pGbBzxeuRKos=
+
+Name: org/eclipse/swt/internal/image/TIFFRandomFileAccess.java
+SHA1-Digest: 9WJ1iNVVlt/Ba7gZ0YfLJQxC/Oc=
+
+Name: make_common.mak
+SHA1-Digest: h3DKZN8yNujTYjrU51Tkd3GvDJs=
+
+Name: org/eclipse/swt/internal/mozilla/nsIMemory.java
+SHA1-Digest: ETR0mYVszHpy7pWkOofhRN4eaeY=
+
+Name: org/eclipse/swt/custom/StackLayout.java
+SHA1-Digest: yWZHS2PYoqdSTMRHAM/wLgEEoRA=
+
+Name: org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+SHA1-Digest: oC0I+g8x6i6umJedyUKomxCksKU=
+
+Name: org/eclipse/swt/events/ShellAdapter.java
+SHA1-Digest: U0f1hEbCb7yZGdIu89o7n/sDZdk=
+
+Name: org/eclipse/swt/custom/StyledTextListener.java
+SHA1-Digest: hj1ayWoABBsfHT49aFMKACBemtE=
+
+Name: about_files/IJG_README
+SHA1-Digest: zYrTwlj+wl1kYzRSa3fOxOkPAfs=
+
+Name: org/eclipse/swt/widgets/Shell.java
+SHA1-Digest: L+nXcwj9Ncofesz732H3FPXiPVM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+SHA1-Digest: X58LFzIPcrZc4+QLbSOQFAqZKFU=
+
+Name: org/eclipse/swt/internal/gtk/GdkEvent.java
+SHA1-Digest: KEffqdkjqpvxtr0Qv4ftXZq6scA=
+
+Name: build.sh
+SHA1-Digest: cTN4ePMN4Z5vjWr5QromAkjcwH8=
+
+Name: org/eclipse/swt/browser/PromptService2.java
+SHA1-Digest: gFvpno5fsq9Z+/dHMcg6aj1BAlk=
+
+Name: org/eclipse/swt/internal/image/LZWNode.java
+SHA1-Digest: GOXwaEc3r5bCN3+s+oZALRl5Knw=
+
+Name: org/eclipse/swt/internal/theme/ComboDrawData.java
+SHA1-Digest: 3thSSRkOiLPs16unCH0kCFr3IAU=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+SHA1-Digest: +fb2zqoEDuLQZ96DurnwIdUNTv4=
+
+Name: org/eclipse/swt/internal/image/PngLzBlockReader.java
+SHA1-Digest: GAuYmtwAGUIUbM4v3c+Cd3KpjL0=
+
+Name: org/eclipse/swt/custom/LineBackgroundEvent.java
+SHA1-Digest: +hTWYb6PBkMKz1D2r4S4N4PG1y0=
+
+Name: org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+SHA1-Digest: 4uwSAAIrfjqQN/WpDQcHhc5hf6c=
+
+Name: org/eclipse/swt/internal/image/JPEGDecoder.java
+SHA1-Digest: 0P/zkojGU7obfY0IlEUd/lrqmW8=
+
+Name: org/eclipse/swt/dnd/DropTarget.java
+SHA1-Digest: da6o1u9MRMetaetCWKORmQDt1fs=
+
+Name: org/eclipse/swt/browser/FilePickerFactory.java
+SHA1-Digest: 3WIiY4GBZULx2Yf0Xa2yM8ygvWI=
+
+Name: org/eclipse/swt/graphics/Region.java
+SHA1-Digest: RGCXQFWajPqA5VnAdLkEMLDRsLU=
+
+Name: org/eclipse/swt/layout/FormData.java
+SHA1-Digest: w1JliU+nlTaSALEyfqv++9Pbm5A=
+
+Name: org/eclipse/swt/internal/gtk/XButtonEvent.java
+SHA1-Digest: 402bJ0nSCMFN1eveK+5+wrhMUF8=
+
+Name: org/eclipse/swt/widgets/Layout.java
+SHA1-Digest: h07vKCh+EjqZiUv+2yvSM4EJf4c=
+
+Name: org/eclipse/swt/internal/theme/ExpanderDrawData.java
+SHA1-Digest: fgcEHfEkcTLJKGNS6aPqQil2DxM=
+
+Name: gnome.c
+SHA1-Digest: X7OC6F/XgImqtDn5EoskW8kmgms=
+
+Name: org/eclipse/swt/internal/gtk/XFocusChangeEvent.java
+SHA1-Digest: Yl2Qym80DzvpzjaW2vt4IARPFPc=
+
+Name: org/eclipse/swt/internal/gtk/GTypeQuery.java
+SHA1-Digest: efmHAZRnVQyw0LWylP5mSxfXzyU=
+
+Name: gnome.h
+SHA1-Digest: QHd4SQD5YFma3lY+ZlbouuZYKkI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+SHA1-Digest: ruvlZ/q0Wq99m6Ic261E2StqPCA=
+
+Name: org/eclipse/swt/widgets/Display.java
+SHA1-Digest: an1sN3C8/DIzti0oVoHWi/8TPmQ=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+SHA1-Digest: M4tZiUiu8J832sQ2e59Hr9hkQUY=
+
+Name: org/eclipse/swt/browser/AppFileLocProvider.java
+SHA1-Digest: lFcNR/tuXH4B66Cf4VdAT3W8QJ8=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPromptService.java
+SHA1-Digest: tojew5R0wQdTZg1d4QHEwRH/JFk=
+
+Name: org/eclipse/swt/custom/CLayoutData.java
+SHA1-Digest: eoDu3b7LjckaTeCgK55Zmnt99rE=
+
+Name: org/eclipse/swt/internal/cairo/cairo_text_extents_t.java
+SHA1-Digest: KHXRmMkV9QlVtNWXDuUJ/rV9YYY=
+
+Name: org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+SHA1-Digest: v5CVb3nfPKogu1apjyzevLOpDPc=
+
+Name: org/eclipse/swt/internal/image/PngEncoder.java
+SHA1-Digest: bWQcTjCOZA1GOAHh1Byus6Wz4Xw=
+
+Name: org/eclipse/swt/custom/LineStyleListener.java
+SHA1-Digest: 7YVyhVizJkUqytPDLcbKtIybEAI=
+
+Name: org/eclipse/swt/graphics/FontMetrics.java
+SHA1-Digest: 3rnDN4+axaz4FRtglfRAyRHgvCk=
+
+Name: org/eclipse/swt/layout/FillLayout.java
+SHA1-Digest: KVDYtKFJWE+1fKwVBmVI+y4Rph4=
+
+Name: org/eclipse/swt/dnd/ImageTransfer.java
+SHA1-Digest: RUMWNSAdkSjHmYo07CJH6q/PjaA=
+
+Name: org/eclipse/swt/dnd/TableDropTargetEffect.java
+SHA1-Digest: /wZMRCCWw29InyL865Ut/rlr2OY=
+
+Name: org/eclipse/swt/events/MenuListener.java
+SHA1-Digest: kEwxhFctvQ5l0SY8K/cdqKc8TG8=
+
+Name: org/eclipse/swt/widgets/MessageBox.java
+SHA1-Digest: FOcMM4Io4lgGDkSk2GWTScN8pyg=
+
+Name: org/eclipse/swt/events/TypedEvent.java
+SHA1-Digest: OpLiMzOA+i/BNdLSRKh7HqkKOmk=
+
+Name: org/eclipse/swt/dnd/DropTargetEvent.java
+SHA1-Digest: hnCadOoP6HmIR8LjmTBFHgC31bA=
+
+Name: org/eclipse/swt/graphics/ImageLoaderListener.java
+SHA1-Digest: 1OhJF2YJWnJ+OYRe5QlFFw98RRg=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+SHA1-Digest: cyghLp40bbUmbahYmATZPmtEaGM=
+
+Name: org/eclipse/swt/events/MouseWheelListener.java
+SHA1-Digest: 2qUMxTJRewpjUPtTcUX/2RNeHl0=
+
+Name: org/eclipse/swt/custom/StyledText.java
+SHA1-Digest: 0rrC3+IvcpX/705ILYiBIfebehg=
+
+Name: org/eclipse/swt/browser/LocationEvent.java
+SHA1-Digest: Mf32BygCrpRFNgiFF+4bj5g8vOk=
+
+Name: org/eclipse/swt/internal/theme/TabFolderDrawData.java
+SHA1-Digest: YqNwujr9HUhI3+AJhSQFZ1GreT0=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+SHA1-Digest: QcbRzAiVkX12RNHapoOOSgyaCC8=
+
+Name: org/eclipse/swt/internal/image/JPEGAppn.java
+SHA1-Digest: 4UQs9L9U5wymkIgvIxFU+p2f2Io=
+
+Name: org/eclipse/swt/internal/gtk/PangoItem.java
+SHA1-Digest: xDkc0+Bpg/PPckOuBwQGZUk84Lw=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+SHA1-Digest: BkDxnznAKyA+g3mCsWR5v3fmAx4=
+
+Name: org/eclipse/swt/dnd/TreeDragSourceEffect.java
+SHA1-Digest: uaL7WUEENhIaBigdTcb3LzrBKSo=
+
+Name: org/eclipse/swt/widgets/TreeItem.java
+SHA1-Digest: 2hfkDN/GuzqzdUShLnf7+Xgpggs=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventExpose.java
+SHA1-Digest: Xc3PnwTJUAtH8RuYhLY6Pn81FAc=
+
+Name: org/eclipse/swt/events/MouseTrackListener.java
+SHA1-Digest: zAA0yPxZmIq0um5NFA0rkpPSAB4=
+
+Name: org/eclipse/swt/dnd/HTMLTransfer.java
+SHA1-Digest: SKt9BWsGOLP5EOT8kGNGN9KD9zw=
+
+Name: org/eclipse/swt/accessibility/AccessibleTextAdapter.java
+SHA1-Digest: RQB6GIxoudktcIr5lSSBs5jnHyk=
+
+Name: org/eclipse/swt/widgets/TabItem.java
+SHA1-Digest: LOQY3zyMFbuJ6ZFzCponLJa+qRI=
+
+Name: org/eclipse/swt/dnd/DragSource.java
+SHA1-Digest: Sb/+pYbkswVp8hVXmbTXNtjPqxk=
+
+Name: org/eclipse/swt/events/TreeListener.java
+SHA1-Digest: inA0boKyg8WTD4AAecrXd0Q+wy8=
+
+Name: about_files/pixman-licenses.txt
+SHA1-Digest: FtOh06hwhe/AnE7wwVESyXkkfDU=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+SHA1-Digest: 1G9oqhLEo5GdL9vJgxohUXQ+SmQ=
+
+Name: org/eclipse/swt/widgets/TableColumn.java
+SHA1-Digest: o2Wm+Jkud16rc+t27i9B8YseJ2g=
+
+Name: org/eclipse/swt/graphics/DeviceData.java
+SHA1-Digest: PHBv+eoQo9iJjgcShAEv7U4bdi0=
+
+Name: org/eclipse/swt/events/VerifyListener.java
+SHA1-Digest: QRbYwVNVWoKy0seWV1BOLoSikJQ=
+
+Name: org/eclipse/swt/internal/image/JPEGQuantizationTable.java
+SHA1-Digest: IHS3GUjH+0RAxcvUYsv6VgKv4zA=
+
+Name: org/eclipse/swt/widgets/Control.java
+SHA1-Digest: FcFrR4rh0Om/JE36DKVm9LuB5t4=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+SHA1-Digest: lQvdo6biI3seCBotC640EX5ZrOU=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+SHA1-Digest: O4JcPbxEbuZDW3x9IfSYmiZH0Tw=
+
+Name: org/eclipse/swt/internal/mozilla/nsICookie.java
+SHA1-Digest: rQl93WkNenipuin/6NY/q4fREU8=
+
+Name: org/eclipse/swt/graphics/GlyphMetrics.java
+SHA1-Digest: MuQHYzCCBiQ+cbRJKkrVtEdU/zs=
+
+Name: org/eclipse/swt/internal/mozilla/nsEmbedString.java
+SHA1-Digest: GX8e6nkI22yhTAb4NV4dU7K7Bh4=
+
+Name: org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+SHA1-Digest: 2yW+khPcUQ24CFrnJpt4+b+XYHY=
+
+Name: xpcominit.cpp
+SHA1-Digest: hfgtl/bodJbP7GvqYsjFz8EHJ9U=
+
+Name: org/eclipse/swt/internal/gtk/XVisibilityEvent.java
+SHA1-Digest: OXLSxBD8Fe1MIU3n2lfs19M2ktg=
+
+Name: org/eclipse/swt/custom/TextChangeListener.java
+SHA1-Digest: 4h+Cd+LL8N6tZ2zBak8LjlYO/AE=
+
+Name: org/eclipse/swt/internal/image/PngDeflater.java
+SHA1-Digest: r2sJJkEA9mXPdgX1BMD+lYBSKNc=
+
+Name: org/eclipse/swt/custom/CTabFolder2Listener.java
+SHA1-Digest: ru448JoF54HLocW3MxbQ+E7Z3eg=
+
+Name: org/eclipse/swt/internal/mozilla/nsICancelable.java
+SHA1-Digest: N0ZlgYtPNNvPZU4x9tnlb/gHrmQ=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+SHA1-Digest: zhbpVrPb259V2n1bdWD2JEh9Ob4=
+
+Name: org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+SHA1-Digest: CfRmajFMtdShk5ZTrrEhgqivpJE=
+
+Name: org/eclipse/swt/internal/gtk/OS.java
+SHA1-Digest: 1kCDc7c6UyKyD7Gah3JGutg8z80=
+
+Name: org/eclipse/swt/internal/gtk/XEvent.java
+SHA1-Digest: D5/HiqzhC45sG/uhmmDHXZJfBfk=
+
+Name: make_freebsd.mak
+SHA1-Digest: M/RtV/unO5QeOqzrLPJRYSDXvcM=
+
+Name: org/eclipse/swt/internal/mozilla/nsITransfer.java
+SHA1-Digest: 0ieq9OAA7vu1uXKF+Uaqax1o6VU=
+
+Name: org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+SHA1-Digest: vpZ2Fjrs72BLd8Rv0KH76Gj4xw4=
+
+Name: org/eclipse/swt/SWTError.java
+SHA1-Digest: 9n4BjYgeE0mnHJws/6f18DNPIIk=
+
+Name: org/eclipse/swt/browser/AuthenticationEvent.java
+SHA1-Digest: 79Xq6Ao4Uku3TjZeotl4zqQaiks=
+
+Name: org/eclipse/swt/browser/OpenWindowListener.java
+SHA1-Digest: tlo/e/m+jLxID8VB5mAiKxNked0=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/ATK.java
+SHA1-Digest: CPeLT95NgIQKq1qS4bfg4wRFIi8=
+
+Name: org/eclipse/swt/internal/mozilla/nsIVariant.java
+SHA1-Digest: N0UMJkLueNx5JcdyX5ld+c3Fpc4=
+
+Name: org/eclipse/swt/internal/image/OS2BMPFileFormat.java
+SHA1-Digest: JhiGdb5aEO8649knKvZV1AMN0T8=
+
+Name: org/eclipse/swt/graphics/Pattern.java
+SHA1-Digest: pZCghfLmMPudzDMjQhIWbAceGZ4=
+
+Name: org/eclipse/swt/graphics/ImageLoader.java
+SHA1-Digest: F9hhOc+Tq2n3321AnGG/VOz93lg=
+
+Name: org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+SHA1-Digest: /SbbdC84ItrK/+7J9VhasHQSRfo=
+
+Name: org/eclipse/swt/events/MenuDetectListener.java
+SHA1-Digest: Jjay/NTMruC9OXzoIKVa7zRNVTk=
+
+Name: org/eclipse/swt/events/ControlAdapter.java
+SHA1-Digest: 2m17bNMTLWTnFN2F9c9SlvW1ZC8=
+
+Name: org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+SHA1-Digest: d1kwtl0/tqOOmumpaEH6mCRXO1Q=
+
+Name: org/eclipse/swt/events/HelpEvent.java
+SHA1-Digest: fnJ4/OgC+q5tyjUN8l4YC6v5950=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.ja
+ va
+SHA1-Digest: xRLIXNhgKyfQBQwTq3yzEboUCm4=
+
+Name: org/eclipse/swt/events/KeyAdapter.java
+SHA1-Digest: f6cAgdYjNxW1tGKOTnsc4gMxMs8=
+
+Name: org/eclipse/swt/internal/gnome/GNOME.java
+SHA1-Digest: 7jOYlUGn37HbAR6tzOvANbjrtso=
+
+Name: org/eclipse/swt/events/ExpandAdapter.java
+SHA1-Digest: K6yQyBgqjB7dH2VMQGCj3ztnV48=
+
+Name: org/eclipse/swt/widgets/TabFolder.java
+SHA1-Digest: FUFqcRgXLUd6OSgwD8QevmOU6lU=
+
+Name: org/eclipse/swt/custom/ScrolledComposite.java
+SHA1-Digest: vme9BWYwOkd+C3nS4zyuq5Wfvdg=
+
+Name: org/eclipse/swt/events/TreeAdapter.java
+SHA1-Digest: RXvjXH8zYddAOioAUsIUmUVGxYc=
+
+Name: org/eclipse/swt/browser/DownloadFactory.java
+SHA1-Digest: Bck9GJMoDooomGK/wWSWbMruEP0=
+
+Name: org/eclipse/swt/custom/PaintObjectEvent.java
+SHA1-Digest: Gt+RlAEh8kCe0BwokUXk7MbyltU=
+
+Name: org/eclipse/swt/events/FocusListener.java
+SHA1-Digest: x/w95NZdrH2tcTnT6Qptu5ppK2U=
+
+Name: org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+SHA1-Digest: n92XRbin1mlGG2vebCWA1NtGL5Y=
+
+Name: org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+SHA1-Digest: lmjVz7cwhhJVMewCBU0+6AzZfGA=
+
+Name: org/eclipse/swt/internal/theme/RangeDrawData.java
+SHA1-Digest: HdP0cyFe7cmluedM++rMDOWw07U=
+
+Name: org/eclipse/swt/internal/C.java
+SHA1-Digest: hjJyryL+m8ody2ot8ev59aEhq78=
+
+Name: atk.c
+SHA1-Digest: m+bMVfyJEJEGEoFRwIWCy1EhLqg=
+
+Name: org/eclipse/swt/widgets/DirectoryDialog.java
+SHA1-Digest: zIzeQiM9pC6NddG7q2IW/muHI1w=
+
+Name: org/eclipse/swt/events/DisposeEvent.java
+SHA1-Digest: geGcw/h5dtBaXDOi/59spgCG5aM=
+
+Name: atk.h
+SHA1-Digest: 8AiTA4qht5Ug6rlmLKR/IvVY9p0=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDocShell.java
+SHA1-Digest: CUm9Dk16CfXXt2pT8MV/jYcmDqc=
+
+Name: org/eclipse/swt/widgets/Dialog.java
+SHA1-Digest: N9jseIeobmKuGZYHOxzm1IiYvjA=
+
+Name: org/eclipse/swt/widgets/Scrollable.java
+SHA1-Digest: Z40OJaFRnGlYgfCMslN0p5Exfso=
+
+Name: org/eclipse/swt/events/TreeEvent.java
+SHA1-Digest: wzGApLZ1tTlKvPWvQqVleIIOJB4=
+
+Name: org/eclipse/swt/dnd/TreeDropTargetEffect.java
+SHA1-Digest: /OsJ67C8uA4Be/0YguYYhyZ6VEM=
+
+Name: org/eclipse/swt/internal/image/PngHuffmanTable.java
+SHA1-Digest: jIamI9WU1yGEwiS0MPJ6T5c0F8k=
+
+Name: org/eclipse/swt/browser/ProgressEvent.java
+SHA1-Digest: FD8CuG3DKqli5657ACIHzlJGzVk=
+
+Name: org/eclipse/swt/widgets/Slider.java
+SHA1-Digest: 5v1N7Rmnt/4B4v7RqB5eLjeP+94=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+SHA1-Digest: arXLjZ4fbvf5GkfRYZ1lYGEKcV4=
+
+Name: xpcom_stats.cpp
+SHA1-Digest: bqsPzAO9ShGIFs6id/Vm84YCQG8=
+
+Name: org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+SHA1-Digest: Nd/wI1NFszMgjx88aj1zNrVohwQ=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+SHA1-Digest: r30WANlohwK4fcinqGLbE6A3CoI=
+
+Name: org/eclipse/swt/internal/cairo/cairo_font_extents_t.java
+SHA1-Digest: D9CX+LwfuxRwk8aVC6ZpmvO0u/k=
+
+Name: org/eclipse/swt/widgets/Link.java
+SHA1-Digest: HJOZdKveZiGO2fy1Z0lVNh7akQE=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk=
+
+Name: org/eclipse/swt/internal/mozilla/nsIRequest.java
+SHA1-Digest: /W87hzGMOXOIuW4sHhjMxSv1ayw=
+
+Name: org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+SHA1-Digest: rwyEtJexic4cLsQj0eaEiGmtpRY=
+
+Name: org/eclipse/swt/internal/gtk/GdkColor.java
+SHA1-Digest: qEYlHqHeFdk4Jti34gyxfDQ3mpA=
+
+Name: org/eclipse/swt/internal/image/JPEGEndOfImage.java
+SHA1-Digest: 8Ng0of2Ey8GsZU/3RpC1yc7NA8w=
+
+Name: org/eclipse/swt/internal/image/JPEGStartOfImage.java
+SHA1-Digest: LF4ENVixsDyesC4sxOiWrfkJDxU=
+
+Name: org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.jav
+ a
+SHA1-Digest: HyjK5kl1XfjgbPLycwnNVJVi7WA=
+
+Name: org/eclipse/swt/internal/CloneableCompatibility.java
+SHA1-Digest: hCSchN5XwwcLk5+09v5LP0d4eHI=
+
+Name: org/eclipse/swt/browser/Mozilla.java
+SHA1-Digest: XRhh9ex76kybakufu9ITAeEOo30=
+
+Name: org/eclipse/swt/widgets/ScrollBar.java
+SHA1-Digest: yRXTPm5ZXJxl2D1gDw5u0QQw98Q=
+
+Name: org/eclipse/swt/events/SelectionEvent.java
+SHA1-Digest: 1pJJ1ewp1vs/IYq6WQXPCLSr/UM=
+
+Name: org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+SHA1-Digest: NEqM6YMm471hz0v2ew5CQu2Tje4=
+
+Name: org/eclipse/swt/accessibility/AccessibleEvent.java
+SHA1-Digest: VYFcVuRuLSPdlBdaaPnefZ3Fcb4=
+
+Name: org/eclipse/swt/custom/StyledTextEvent.java
+SHA1-Digest: 6icF/qgfuLkx30Y1tKJUW3/V9KU=
+
+Name: make_solaris.mak
+SHA1-Digest: e9MaNvBk0btTVyX2VEcR3n0GL5c=
+
+Name: org/eclipse/swt/events/MenuAdapter.java
+SHA1-Digest: q+I9ecNgQGhbP1RvlnedOqbC40k=
+
+Name: org/eclipse/swt/internal/image/PngFileReadState.java
+SHA1-Digest: V+13Asjv0XZIF1L09T3NFksq7Hc=
+
+Name: org/eclipse/swt/graphics/Cursor.java
+SHA1-Digest: vqJPF09QJAOCvs5/WmRvs8UzSIk=
+
+Name: org/eclipse/swt/accessibility/AccessibleObject.java
+SHA1-Digest: eYp/zYl1ocBXUj9MaI/iqWDluDE=
+
+Name: glx_stats.c
+SHA1-Digest: CoUrsKJBYVfJIdAWEzrfxj2qiQY=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+SHA1-Digest: 8WiQbkDNXKj19m3+0gKScx8zUcs=
+
+Name: glx_stats.h
+SHA1-Digest: et06Ff1rAgtsWv66jDEOtGhXguU=
+
+Name: org/eclipse/swt/custom/CTabFolderAdapter.java
+SHA1-Digest: yk0c4sYXAlvGNLCOv8xCbJSZSlI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.
+ java
+SHA1-Digest: VVca3g/yIHRG80UcRzjoLHM++OU=
+
+Name: org/eclipse/swt/internal/gtk/GdkVisual.java
+SHA1-Digest: UymL2bSRcXgeME+oiuHpUuwDS1s=
+
+Name: org/eclipse/swt/graphics/Path.java
+SHA1-Digest: HP7kqpbNPOGhnVIE8NSL+4dpxAc=
+
+Name: os.c
+SHA1-Digest: FLX41Sye0YnD5AZlzfYl0V7sjEs=
+
+Name: org/eclipse/swt/widgets/Composite.java
+SHA1-Digest: BPGbQUaTO00cjPl8VYOSH7OsuVE=
+
+Name: os.h
+SHA1-Digest: OBmWAHJ2w2fL7TzwL/UdYuCZBtI=
+
+Name: org/eclipse/swt/browser/WindowEvent.java
+SHA1-Digest: h56QX1KsCMxPBTMwFEV9O2Ls67U=
+
+Name: org/eclipse/swt/custom/BidiSegmentListener.java
+SHA1-Digest: jA6NHhGINQVhFYxUMEd+/5V5MjE=
+
+Name: org/eclipse/swt/widgets/CoolItem.java
+SHA1-Digest: 1cUACfJmrBvsd6J8sxHO+xRA+1A=
+
+Name: org/eclipse/swt/custom/TableTreeEditor.java
+SHA1-Digest: NQov6olXyjEUdeQr2iptLQ0vpCc=
+
+Name: org/eclipse/swt/widgets/Group.java
+SHA1-Digest: mMVdZr8lxr0Hi4SCCa1JSz3vbTA=
+
+Name: org/eclipse/swt/events/TraverseListener.java
+SHA1-Digest: lTxVd2XZ8Dr5coe12pgiY0c7JnY=
+
+Name: org/eclipse/swt/custom/CTabFolder2Adapter.java
+SHA1-Digest: 2eVfJ+CGIeReeKWt9XM+johcS8E=
+
+Name: org/eclipse/swt/widgets/Button.java
+SHA1-Digest: 3kg2tnQxiaUELDR/rxo7oFzcszM=
+
+Name: atk_custom.c
+SHA1-Digest: TIWNa0HeQxG1SoOv74QxJKRo/3I=
+
+Name: mozilla_exports
+SHA1-Digest: fl2QirG0yoM2lViC4L0lDVrkhPM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+SHA1-Digest: t3xrvYN7SO/scFOn2bZkatJaXcA=
+
+Name: org/eclipse/swt/internal/gtk/GTypeInfo.java
+SHA1-Digest: 9zTRpU5AeJre4tj0d8t0mYPX4vo=
+
+Name: atk_custom.h
+SHA1-Digest: 2osrydsXTHJWGs81QRjqcWDlUEk=
+
+Name: org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+SHA1-Digest: +mWeO60J9B2dDnhYUUdbaVYPxCQ=
+
+Name: org/eclipse/swt/widgets/Table.java
+SHA1-Digest: E30byxCqRujV7KFOu38xHYOqnZA=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+SHA1-Digest: nfE8J96WyD2xt9X7hZJiL+fm2bE=
+
+Name: c_stats.c
+SHA1-Digest: L5+IcncIxuE1k/Mtqkhipx9kx8M=
+
+Name: org/eclipse/swt/widgets/Scale.java
+SHA1-Digest: YxAT5Dd38uZG+ONjScwRe7uC3wY=
+
+Name: org/eclipse/swt/custom/TreeEditor.java
+SHA1-Digest: jNTCIy7AerdvHEKIeR84Q72A5As=
+
+Name: make_solaris_x86.mak
+SHA1-Digest: OzjpYe4zA7a5pqT94UggH8ZFV9A=
+
+Name: org/eclipse/swt/browser/DownloadFactory_1_8.java
+SHA1-Digest: 1XJuq5oUWZtpPb38nDrsvNe+mMA=
+
+Name: org/eclipse/swt/graphics/ImageData.java
+SHA1-Digest: butxWtOP/3qjc0hs1DqPVnZop9E=
+
+Name: c_stats.h
+SHA1-Digest: v2n9SfFbecVkF2oTDw5wFeVPCl4=
+
+Name: org/eclipse/swt/graphics/Color.java
+SHA1-Digest: CZEbH91I+il2ujugudDFUe6IRFc=
+
+Name: org/eclipse/swt/graphics/Drawable.java
+SHA1-Digest: sLrn6WiXYLqC9y4Q9tXWw2qJJlk=
+
+Name: org/eclipse/swt/browser/WindowCreator2.java
+SHA1-Digest: Z7Aw01bpaBfulPfSxVxnFqCCYt4=
+
+Name: org/eclipse/swt/internal/mozilla/nsICookieService.java
+SHA1-Digest: +T56qrIAeNBTf5GNIHzS8gjvooA=
+
+Name: swt_awt.c
+SHA1-Digest: srTF6FaKof3FmiKkCTV+rZ94dpk=
+
+Name: org/eclipse/swt/widgets/ToolBar.java
+SHA1-Digest: M1tyV1s55lrg/LV8Sc5RJ88R2LQ=
+
+Name: org/eclipse/swt/widgets/Spinner.java
+SHA1-Digest: tBsbZu6X6WV8D7WW0nvWJepf/Ys=
+
+Name: org/eclipse/swt/widgets/EventTable.java
+SHA1-Digest: XQeGtOkPYBpQZQl4Cu1FAdv9ZxQ=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventKey.java
+SHA1-Digest: OViH2QHBImMIUafRAWYTVuSzGss=
+
+Name: org/eclipse/swt/browser/LocationAdapter.java
+SHA1-Digest: KJZFIiKVPTWsfbfZmyYijFMDBME=
+
+Name: org/eclipse/swt/internal/image/LZWCodec.java
+SHA1-Digest: rbzBlzIuABXV9kqAARbYA9TOULY=
+
+Name: org/eclipse/swt/custom/MovementEvent.java
+SHA1-Digest: DVQLhnIL3ZB5ee96X2sVa+XDias=
+
+Name: org/eclipse/swt/custom/ViewFormLayout.java
+SHA1-Digest: vLNSznl2wGFL2SR7yKB6jsgEu7c=
+
+Name: org/eclipse/swt/custom/CLabel.java
+SHA1-Digest: ArWS49hSdyEj9Pf8j8NdLuNYoPM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+SHA1-Digest: ePi+nE8PAAlOEDrqaX8iTi0I3vM=
+
+Name: org/eclipse/swt/internal/gtk/GdkGCValues.java
+SHA1-Digest: mgjP4oZRjzEzaCB1Y3AAWUvSTlA=
+
+Name: org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+SHA1-Digest: HSHYBd1TYHtX+6H3ylh/cHW0o9E=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+SHA1-Digest: PdLE4VolPcL9QCLyRT36g0UMFBc=
+
+Name: org/eclipse/swt/events/MenuEvent.java
+SHA1-Digest: lxg+gcJn8vXuJaxuUgT9DeKLvw0=
+
+Name: org/eclipse/swt/widgets/Widget.java
+SHA1-Digest: M/Vs1/JYn9cZvbdxIXHGkJS76QA=
+
+Name: org/eclipse/swt/widgets/Sash.java
+SHA1-Digest: uEcHYOctgzJ/EmSwSZPUu0IwbGQ=
+
+Name: org/eclipse/swt/layout/RowData.java
+SHA1-Digest: s617hoOAm6YpmWXXRr6VAcly1CQ=
+
+Name: org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.jav
+ a
+SHA1-Digest: pcSJP9qoXAAnZwPxZohJ91Ss7Go=
+
+Name: org/eclipse/swt/custom/MovementListener.java
+SHA1-Digest: 8D7NRyxECZXG/PmwcKeVjAMUpb0=
+
+Name: org/eclipse/swt/custom/StyledTextRenderer.java
+SHA1-Digest: XwwoiRrWY4gnENE6lIYDWITzGkc=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+SHA1-Digest: c7fN/3eOMbXyAbI7qeBruNRQUwE=
+
+Name: org/eclipse/swt/internal/gtk/GtkFixed.java
+SHA1-Digest: lJ71A5gZsAYhTUlZBuOicu87smA=
+
+Name: about_files/mpl-v11.txt
+SHA1-Digest: kye+J+SfAeSHDb4yfkmEMHDyA6s=
+
+Name: org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+SHA1-Digest: ow1iiltWQF8+su1/QYkSJbp6E1c=
+
+Name: org/eclipse/swt/widgets/Listener.java
+SHA1-Digest: FXZen6rpuDKpVlgW8QAWzdWm7N4=
+
+Name: org/eclipse/swt/widgets/Item.java
+SHA1-Digest: JQg6V6cvAjpAqW1BKTrjcVF2o34=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+SHA1-Digest: brJdi2ruYJvBWyJJyJc1QCFwLJg=
+
+Name: org/eclipse/swt/browser/External.java
+SHA1-Digest: Gy2lJ0MK9JDnaY3LByav3wcJEPI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+SHA1-Digest: BBOSC/zOP4flvB5XAN04+hAMvRY=
+
+Name: org/eclipse/swt/browser/LocationListener.java
+SHA1-Digest: lMmCVF+74EF9F1G6AcrK+VNS0l8=
+
+Name: xpcominit_stats.cpp
+SHA1-Digest: Fd2H1U+RnQnVBqrpLBKKjxMm7jk=
+
+Name: org/eclipse/swt/custom/CTabFolderListener.java
+SHA1-Digest: yr5XxX7FlECW4UygEgiRxe6aOy0=
+
+Name: org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+SHA1-Digest: niB1TaSWXCn6WsBQOo8vUUe6Aw0=
+
+Name: org/eclipse/swt/widgets/ExpandItem.java
+SHA1-Digest: AOm+FQ6zMvKs2gDh4yLtWuuaO8Q=
+
+Name: org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+SHA1-Digest: o2s6cgn+l6F9IW3zeMRUExbJVBo=
+
+Name: org/eclipse/swt/browser/MozillaDelegate.java
+SHA1-Digest: 4O2Mree1bMedaZX4eh7OYbDRCxE=
+
+Name: org/eclipse/swt/internal/mozilla/nsIObserverService.java
+SHA1-Digest: Idu24b8ZENIVrgg+6tXqOOMt1Js=
+
+Name: org/eclipse/swt/internal/image/LEDataOutputStream.java
+SHA1-Digest: SRl6sfnbmXV4XILfth6kZFn4XCo=
+
+Name: org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+SHA1-Digest: tMJeVd7wAvR8lpxYdXZVU42flM8=
+
+Name: org/eclipse/swt/internal/image/PngTrnsChunk.java
+SHA1-Digest: CWpJYQM/hSIEe4qQUF5Il/m4ShM=
+
+Name: org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+SHA1-Digest: Jhqkn/57CIxNJ9p6l5UMOB0PFNg=
+
+Name: cairo.c
+SHA1-Digest: yJ5XtGeakW9oGSd4DgM871rlme4=
+
+Name: org/eclipse/swt/browser/TitleListener.java
+SHA1-Digest: FcYFzNpVMdj6atQo3AcuuxmD4dM=
+
+Name: xpcom_structs.cpp
+SHA1-Digest: 3bLjF3qSNpjEJ5W6ltDSxp3eTx8=
+
+Name: cairo.h
+SHA1-Digest: C3St/djttHv69wnvNIbfwPyRSXQ=
+
+Name: org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+SHA1-Digest: Qykr8VQozUIXbylhWS1l9H8JrXQ=
+
+Name: xpcom.h
+SHA1-Digest: dNz1W8VuYtv1AEkkHsqvmm6FnsQ=
+
+Name: org/eclipse/swt/awt/SWT_AWT.java
+SHA1-Digest: ml/JIMRSdEBt7XgbHatx319xLmk=
+
+Name: org/eclipse/swt/internal/Lock.java
+SHA1-Digest: yonCicmmhgj5PdkUCL7j1kZ794U=
+
+Name: org/eclipse/swt/internal/image/PngIdatChunk.java
+SHA1-Digest: UwzO3mcFQmZa7wzRYb/4RPLYvUE=
+
+Name: org/eclipse/swt/accessibility/AccessibleControlListener.java
+SHA1-Digest: fg9p3mYB7lCmCN9mFZh/iBqjFo4=
+
+Name: org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+SHA1-Digest: //LNq4jThexMoFmk2wF3H8gW9sk=
+
+Name: org/eclipse/swt/dnd/DNDListener.java
+SHA1-Digest: JnO71PJ2tk1/N/s/BCbGLDD0TMU=
+
+Name: org/eclipse/swt/accessibility/AccessibleTextEvent.java
+SHA1-Digest: T3EAg+GI1MueXHV58LoQkSzlu1g=
+
+Name: org/eclipse/swt/custom/BidiSegmentEvent.java
+SHA1-Digest: my/RpeuZbStgUBNSqZVYeaJ3s1c=
+
+Name: org/eclipse/swt/dnd/ClipboardProxy.java
+SHA1-Digest: uD2Rsu5GhbS4iIWi+NEVuFHYq9s=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+SHA1-Digest: LloGINEtyL87wMA243OtGam3/CA=
+
+Name: org/eclipse/swt/internal/gtk/GtkAdjustment.java
+SHA1-Digest: Ctowb5G6HlLOgU18WZ+tj0Y7E5c=
+
+Name: org/eclipse/swt/dnd/DragSourceAdapter.java
+SHA1-Digest: rMmZmG/qUveSwK0UcR7YPlJuvWk=
+
+Name: cde_structs.c
+SHA1-Digest: UaCWgVmeQOE1CLNNDWu2iB4k2bg=
+
+Name: org/eclipse/swt/internal/mozilla/nsIProperties.java
+SHA1-Digest: 9yA08Y/TZpAIzybeORnX8PnUY+o=
+
+Name: org/eclipse/swt/custom/TextChangingEvent.java
+SHA1-Digest: mXPGoFMcI4QdsMA4zyK3Vt7+JLQ=
+
+Name: cde_structs.h
+SHA1-Digest: kb78SCCLVPkeCw3l82uVri+wxYk=
+
+Name: org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+SHA1-Digest: D3lJdVCKtqaXlgpHyGHwaJF0R20=
+
+Name: org/eclipse/swt/browser/PromptService2Factory.java
+SHA1-Digest: w96xtgjabIoVDnAkVskZVGJoc64=
+
+Name: org/eclipse/swt/browser/VisibilityWindowListener.java
+SHA1-Digest: nvDD9pF+RBTULojap7dHAnHVVqU=
+
+Name: org/eclipse/swt/widgets/IME.java
+SHA1-Digest: 7+NC9oeeIojAWfQvbfOYsuyJsog=
+
+Name: org/eclipse/swt/internal/image/PngPlteChunk.java
+SHA1-Digest: GloK8grKrCpBkL0hVMw0WTsifVA=
+
+Name: org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+SHA1-Digest: kZkGwWHh1GpVt+tKU6vgZHQK6fU=
+
+Name: org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.ja
+ va
+SHA1-Digest: Y1EbdBDeavElLEFBI12aKS5ixNA=
+
+Name: org/eclipse/swt/internal/mozilla/nsISupports.java
+SHA1-Digest: GKEW6XwM+B1yzGddHn5kJf3QlhI=
+
+Name: org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+SHA1-Digest: BrgM1xCQVueySHrf3MMgo+U7uHg=
+
+Name: org/eclipse/swt/browser/FilePicker.java
+SHA1-Digest: zzygRsLsbnbxgvHSmC7yUZyUL9U=
+
+Name: org/eclipse/swt/custom/LineBackgroundListener.java
+SHA1-Digest: is+ijtgq1jINABs/ORNEiYs9Jdo=
+
+Name: org/eclipse/swt/internal/mozilla/nsILocalFile.java
+SHA1-Digest: 12EIkbiZbo+AfS+RCGMam83B5fk=
+
+Name: org/eclipse/swt/internal/Converter.java
+SHA1-Digest: W83bXrjWLViibJuyq7kyuBV50vg=
+
+Name: org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+SHA1-Digest: ENGFm3nBCkTfMqGTAv6MZPX3cLc=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.jav
+ a
+SHA1-Digest: K1uYuUzuYtj9gil3pzLjAFWOX4c=
+
+Name: org/eclipse/swt/graphics/Rectangle.java
+SHA1-Digest: R9IcwYfpipXeEzyqYM32ei516AM=
+
+Name: org/eclipse/swt/custom/StyledTextPrintOptions.java
+SHA1-Digest: AK1Pnwn1i8J7BQezMFp089eTESQ=
+
+Name: org/eclipse/swt/widgets/RunnableLock.java
+SHA1-Digest: ULWUpmBrJhOVDcn4mWxXgH59zms=
+
+Name: org/eclipse/swt/events/HelpListener.java
+SHA1-Digest: XekP0Y/xvjFRqDRDoZlP3aHFp9Q=
+
+Name: org/eclipse/swt/internal/gtk/GtkTargetPair.java
+SHA1-Digest: 5h7svrrTuIBQltMO7993QAoQX5U=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+SHA1-Digest: Kez/DIi68mzsXlI5T2QvePVItss=
+
+Name: os_stats.c
+SHA1-Digest: g7EvdFPY1Zaw3S6T3I84+t6Rdp4=
+
+Name: org/eclipse/swt/custom/CTabFolderLayout.java
+SHA1-Digest: 82dPiKs9wTatiLlrYg5BC1uA/aQ=
+
+Name: os_stats.h
+SHA1-Digest: vTsBYwSmQMVro4bRhgSp1IZ4/fs=
+
+Name: org/eclipse/swt/browser/InputStream.java
+SHA1-Digest: z7Ez503bTUna/Z0C95lL6XOxon0=
+
+Name: org/eclipse/swt/widgets/ToolTip.java
+SHA1-Digest: b5ALgM1/dUrjI4BO80ncYxm2Xqo=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventButton.java
+SHA1-Digest: aXBX7cOFHm9w7qIRG4eVotpPNTw=
+
+Name: org/eclipse/swt/browser/Browser.java
+SHA1-Digest: oEgi1P4kfwLzJ7thfP8sLZGAJuw=
+
+Name: org/eclipse/swt/printing/PrintDialog.java
+SHA1-Digest: s3UE78fAQ/aZFJThF385874Z3mA=
+
+Name: org/eclipse/swt/custom/CTabFolder.java
+SHA1-Digest: qixmNz5SSdwSCyWRYtJED4FS+nw=
+
+Name: org/eclipse/swt/widgets/TypedListener.java
+SHA1-Digest: qQynoNboDo5Rd6W7CoLId4ueuPI=
+
+Name: swt_xpcom.rc
+SHA1-Digest: 48q5Ffn0yIfdJLUz4HDdn4QT6+g=
+
+Name: org/eclipse/swt/internal/gtk/GtkSelectionData.java
+SHA1-Digest: OQIOk3DdmuVvbZXU4q4QBu8tW+U=
+
+Name: org/eclipse/swt/internal/image/PngIendChunk.java
+SHA1-Digest: /ZuFlzc9KEO+8GFz8A+mh4Wy82E=
+
+Name: org/eclipse/swt/events/MouseTrackAdapter.java
+SHA1-Digest: nCbmAmuA0PKYeDN2/62aGQECMIA=
+
+Name: org/eclipse/swt/internal/gtk/GObjectClass.java
+SHA1-Digest: p2fSLUjea2X/rtHvuMXevjcNoB8=
+
+Name: org/eclipse/swt/widgets/Label.java
+SHA1-Digest: aoUnYPZbzuiWrevtf0aNAIEpPIA=
+
+Name: org/eclipse/swt/internal/gtk/PangoLogAttr.java
+SHA1-Digest: wf33HX5QU9dBGtpazH/nLCjGk/I=
+
+Name: fragment.properties
+SHA1-Digest: tTs+0x9Um04jO2kmTi0nEG/kSCE=
+
+Name: org/eclipse/swt/internal/image/JPEGFrameHeader.java
+SHA1-Digest: QfJkwdEQ3YltAgbsz5+E+jie6qg=
+
+Name: org/eclipse/swt/internal/SWTEventListener.java
+SHA1-Digest: zKxTSoawaG3ZIVaXzoIsXn1civA=
+
+Name: org/eclipse/swt/custom/SashFormData.java
+SHA1-Digest: ueperLd8KMbUjFTAzBF7B1WJ8JE=
+
+Name: org/eclipse/swt/internal/image/TIFFFileFormat.java
+SHA1-Digest: wMoojXxtvxN9or0bQBWr6Fmfzro=
+
+Name: org/eclipse/swt/internal/image/PngChunkReader.java
+SHA1-Digest: SllWT5nJRTJCFBo+H+u2C6QIsOc=
+
+Name: org/eclipse/swt/graphics/Transform.java
+SHA1-Digest: GdUcp1XJKIsYtSOYs64svOw8pa0=
+
+Name: org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java
+SHA1-Digest: SnjoW5xTGAYOKLNxvF7qIwvpSos=
+
+Name: nsIScriptContext.h
+SHA1-Digest: PiYDTDGmasetJ8pB5cFuZenTxlU=
+
+Name: org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+SHA1-Digest: 7rQdghVmKDBHKzWhzqgsgwGCO+Q=
+
+Name: org/eclipse/swt/custom/SashForm.java
+SHA1-Digest: 0za8KI3F99zpkgTp8O4voZFUG7I=
+
+Name: org/eclipse/swt/events/ModifyListener.java
+SHA1-Digest: J2lz6ozdpTdfS/0VI0VeG+ra7GY=
+
+Name: org/eclipse/swt/internal/theme/ScaleDrawData.java
+SHA1-Digest: SNkUJV/iK/2sSewDkuHJ8lC8cDQ=
+
+Name: org/eclipse/swt/internal/gtk/GdkEventAny.java
+SHA1-Digest: hibms2ig05NuPxMVmQTZq63iJcc=
+
+Name: org/eclipse/swt/events/DisposeListener.java
+SHA1-Digest: HlHn+w6DXyR9MYc9MMSbiCcFy48=
+
+Name: org/eclipse/swt/custom/VerifyKeyListener.java
+SHA1-Digest: 0YQk2kMl+CTu3mOwOMo/G2MtlDU=
+
+Name: org/eclipse/swt/internal/gtk/PangoAttribute.java
+SHA1-Digest: 5DqLiC14evm9anu/lyHIxwcHl+o=
+
+Name: org/eclipse/swt/widgets/Event.java
+SHA1-Digest: H8wq7+5DFE6YzVOJG5WsnRSMwZc=
+
+Name: org/eclipse/swt/dnd/DragSourceEffect.java
+SHA1-Digest: JTqse/BaF1qRQ+BlWKuIrdmwCXs=
+
+Name: org/eclipse/swt/internal/mozilla/nsIInputStream.java
+SHA1-Digest: BQHWpbg6Qtwg0ope4eVCezGxCvE=
+
+Name: org/eclipse/swt/internal/gtk/GtkFileSelection.java
+SHA1-Digest: YEJZV3Oe9usyJH+03mwNYD3PRY0=
+
+Name: org/eclipse/swt/internal/theme/ToolBarDrawData.java
+SHA1-Digest: fAEr0QxCVsR/QzXlG9m/8FRZCR0=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+SHA1-Digest: F4pO2HySSk5VwwJxlQKnJRR0Av0=
+
+Name: org/eclipse/swt/internal/gtk/GdkImage.java
+SHA1-Digest: v0GGRcv7x6tzTcSGwqfVqaGcVg8=
+
+Name: org/eclipse/swt/events/ModifyEvent.java
+SHA1-Digest: qH2c8MbjDM/AyWqK2TCOicYzHFQ=
+
+Name: org/eclipse/swt/accessibility/AccessibleControlAdapter.java
+SHA1-Digest: 4aI12QNwOj5G5jOMwnsFD08Ua0M=
+
+Name: org/eclipse/swt/custom/ExtendedModifyEvent.java
+SHA1-Digest: toba+Aid8Xy7JqQSz86L7G7zBNU=
+
+Name: org/eclipse/swt/browser/ProgressListener.java
+SHA1-Digest: eeaSiaax5zZFaRpb5b+KUY79J7M=
+
+Name: org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+SHA1-Digest: xnBbJzEg7gaobzRIfqvvCVIIeP8=
+
+Name: org/eclipse/swt/widgets/CoolBar.java
+SHA1-Digest: G+E4QIhA76f2Ywn6wet5+H0/X0I=
+
+Name: org/eclipse/swt/browser/SimpleEnumerator.java
+SHA1-Digest: JOM5VxKv4UWDA0hW2sRpAe7FuN4=
+
+Name: org/eclipse/swt/internal/gtk/GtkAllocation.java
+SHA1-Digest: tgUqxVj6c7Yuv9tLtW9tIjqpsnE=
+
+Name: org/eclipse/swt/widgets/FontDialog.java
+SHA1-Digest: 276inheG2AkqAUbGDtArIuFMVf4=
+
+Name: org/eclipse/swt/graphics/Device.java
+SHA1-Digest: 1Ev5GnuDe2cShp3WttUfY1AKvRc=
+
+Name: org/eclipse/swt/program/Program.java
+SHA1-Digest: W1+GcNyrCMuD3SJDyhw5Tmejbic=
+
+Name: org/eclipse/swt/widgets/TreeColumn.java
+SHA1-Digest: jv/Bl/+8JN0xBAcbMYOgfEH+5DI=
+
+Name: xpcominit_structs.cpp
+SHA1-Digest: f7+R8i8Yh+CfRbMWifIj8ksHT7o=
+
+Name: org/eclipse/swt/dnd/TextTransfer.java
+SHA1-Digest: 3kyuNfvORPMqMYd182WzCjOVy0c=
+
+Name: xpcominit.h
+SHA1-Digest: rZsVxG2umlwG539//IEoQTN09bk=
+
+Name: org/eclipse/swt/events/MouseListener.java
+SHA1-Digest: ylcjrU0+XQngoprKhasUCx4+p94=
+
+Name: org/eclipse/swt/events/MenuDetectEvent.java
+SHA1-Digest: z5NhnQY9SDlUPWQLQYHp0VlYUO0=
+
+Name: org/eclipse/swt/internal/image/WinBMPFileFormat.java
+SHA1-Digest: Cos1NyS97l+jLQDvOliMNNTrvoU=
+
+Name: org/eclipse/swt/internal/theme/TabItemDrawData.java
+SHA1-Digest: mpNDtkaK0DEy90oeKwPEvDlGjQM=
+
+Name: org/eclipse/swt/dnd/FileTransfer.java
+SHA1-Digest: tqirqI9v/TFvgMciL548QXabX0o=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDownload.java
+SHA1-Digest: F/xe0zSEn+WT63VbUMBk/u3BR+o=
+
+Name: org/eclipse/swt/graphics/FontData.java
+SHA1-Digest: uf20biEXyD/DYKFoVB6VPYFuXiA=
+
+Name: org/eclipse/swt/internal/image/PngIhdrChunk.java
+SHA1-Digest: EZ7SBpCRmVAnMnf5+sLlvl0nzAw=
+
+Name: org/eclipse/swt/dnd/DragSourceListener.java
+SHA1-Digest: 6lJuFoSLk+G4JA8Oayi6VTGt+/M=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDataType.java
+SHA1-Digest: fa5z2UmzHZXT58gd22csyn94k7E=
+
+Name: org/eclipse/swt/dnd/DNDEvent.java
+SHA1-Digest: j5vKJQCT5VV4Zg6YiSk1YAUNHq4=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+SHA1-Digest: BA1Tfw41oOydNOXYNmW8qvpQxx8=
+
+Name: org/eclipse/swt/internal/theme/ButtonDrawData.java
+SHA1-Digest: gXMErSIOc3JEJH3BfKyF9pRDGTY=
+
+Name: org/eclipse/swt/custom/PaintObjectListener.java
+SHA1-Digest: oUZL3JJ+ThjMbTegug+yEcMpEF0=
+
+Name: org/eclipse/swt/browser/StatusTextEvent.java
+SHA1-Digest: K6zPQpmBwD3VqNC7/gTZLq14vrM=
+
+Name: org/eclipse/swt/internal/cairo/Cairo.java
+SHA1-Digest: JiBUQWZzFfmfK/ORQKoLTdiS9F0=
+
+Name: org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+SHA1-Digest: yQ41SIye/Pbxe9LyWj2yc+k3d0Q=
+
+Name: org/eclipse/swt/dnd/TransferData.java
+SHA1-Digest: T3knU3Aiu99sXMSUKhFZD027hos=
+
+Name: org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+SHA1-Digest: xvgZ50cjmCu9TpAwU/icpQJ8KoQ=
+
+Name: org/eclipse/swt/custom/ExtendedModifyListener.java
+SHA1-Digest: vml4IoKIEFMPO0PLgL1ztt9EAiw=
+
Index: META-INF/ECLIPSEF.RSA
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: META-INF/ECLIPSEF.RSA
===================================================================
--- META-INF/ECLIPSEF.RSA	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ META-INF/ECLIPSEF.RSA	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)

Property changes on: META-INF/ECLIPSEF.RSA
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: makefile
===================================================================
--- makefile	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ makefile	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,61 @@
+TOP	= ../../../../..
+TOP := $(shell cd $(TOP); pwd)
+PROJECT = thirdparty/swt/$(V_A)
+A_V = $(SWTARCH)/$(SWTVERSION)
+V_A = $(SWTVERSION)/$(SWTARCH)
+TARGET = $(TOP)/$(PROJECT)/lib
+
+SWTVERSION=3.8
+SWTARCH=linux-gtk
+
+all: lib
+
+SWT_DIR=$(TOP)/$(PROJECT)/csrc
+
+include $(SWT_DIR)/make_common.mak
+
+SWT_VERSION=$(maj_ver)$(min_ver)
+
+WS_PREFIX = gtk
+
+QFSWT_LIB = $(TARGET)/libqfswt-$(WS_PREFIX)-$(SWT_VERSION).so
+
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKLIBS = -L/opt/gnome/lib \
+	-lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib -lXtst
+
+QFSWT_OBJECTS = qf_os.o qf_structs.o swt.o os.o os_structs.o os_custom.o os_stats.o
+
+CFLAGS = -O -Wall \
+		-DSWT_VERSION=$(SWT_VERSION) \
+		$(NATIVE_STATS) \
+		-DLINUX -DGTK \
+		-I$(JDK_HOME_13)/include \
+		-I$(JDK_HOME_13)/include/linux \
+		-fpic \
+		${SWT_PTR_CFLAGS} \
+		-m32
+LIBS = -shared -fpic -s
+
+lib: $(QFSWT_LIB)
+
+$(QFSWT_LIB): $(QFSWT_OBJECTS)
+	gcc -m32 $(LIBS) $(GTKLIBS) -o $(QFSWT_LIB) $(QFSWT_OBJECTS)
+
+qf_os.o: qf_os.c
+	$(CC) $(CFLAGS) $(GTKCFLAGS) -c qf_os.c -o $@
+qf_structs.o: qf_structs.c qf_structs.h
+	$(CC) $(CFLAGS) $(GTKCFLAGS) -c qf_structs.c -o $@
+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
+
+clean:
+	rm -f *.o
Index: qf_structs.c
===================================================================
--- qf_structs.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ qf_structs.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,17 @@
+/*******************************************************************************
+* Copyright (c) 2005, 2006 QFS GmbH. All rights reserved.
+* The contents of this file are made available under the terms
+* of the GNU Lesser General Public License (LGPL) Version 2.1 that
+* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+* available at http://www.gnu.org/licenses/lgpl.html.  If the version
+* of the LGPL at http://www.gnu.org is different to the version of
+* the LGPL accompanying this distribution and there is any conflict
+* between the two license versions, the terms of the LGPL accompanying
+* this distribution shall govern.
+*
+* Contributors:
+ *     QFS GmbH - Accessibility/Testing hooks
+*******************************************************************************/
+#include "swt.h"
+#include "qf_structs.h"
+
Index: qf_structs.h
===================================================================
--- qf_structs.h	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ qf_structs.h	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+* Copyright (c) 2005, 2006 QFS GmbH. All rights reserved.
+* The contents of this file are made available under the terms
+* of the GNU Lesser General Public License (LGPL) Version 2.1 that
+* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+* available at http://www.gnu.org/licenses/lgpl.html.  If the version
+* of the LGPL at http://www.gnu.org is different to the version of
+* the LGPL accompanying this distribution and there is any conflict
+* between the two license versions, the terms of the LGPL accompanying
+* this distribution shall govern.
+*
+* Contributors:
+ *     QFS GmbH - Accessibility/Testing hooks
+*******************************************************************************/
+#include "os_structs.h"
+#include "os_stats.h"
+
+#ifndef NO_XMotionEvent
+void cacheXMotionEventFields(JNIEnv *env, jobject lpObject);
+XMotionEvent *getXMotionEventFields(JNIEnv *env, jobject lpObject, XMotionEvent *lpStruct);
+void setXMotionEventFields(JNIEnv *env, jobject lpObject, XMotionEvent *lpStruct);
+#define XMotionEvent_sizeof() sizeof(XMotionEvent)
+#else
+#define cacheXMotionEventFields(a,b)
+#define getXMotionEventFields(a,b,c) NULL
+#define setXMotionEventFields(a,b,c)
+#define XMotionEvent_sizeof() 0
+#endif
+
+#ifndef NO_XKeyEvent
+void cacheXKeyEventFields(JNIEnv *env, jobject lpObject);
+XKeyEvent *getXKeyEventFields(JNIEnv *env, jobject lpObject, XKeyEvent *lpStruct);
+void setXKeyEventFields(JNIEnv *env, jobject lpObject, XKeyEvent *lpStruct);
+#define XKeyEvent_sizeof() sizeof(XKeyEvent)
+#else
+#define cacheXKeyEventFields(a,b)
+#define getXKeyEventFields(a,b,c) NULL
+#define setXKeyEventFields(a,b,c)
+#define XKeyEvent_sizeof() 0
+#endif
+
Index: qf_os.c
===================================================================
--- qf_os.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 0)
+++ qf_os.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -0,0 +1,276 @@
+/*******************************************************************************
+* Copyright (c) 2005, 2006 QFS GmbH. All rights reserved.
+* The contents of this file are made available under the terms
+* of the GNU Lesser General Public License (LGPL) Version 2.1 that
+* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+* available at http://www.gnu.org/licenses/lgpl.html.  If the version
+* of the LGPL at http://www.gnu.org is different to the version of
+* the LGPL accompanying this distribution and there is any conflict
+* between the two license versions, the terms of the LGPL accompanying
+* this distribution shall govern.
+*
+* Contributors:
+ *     QFS GmbH - Accessibility/Testing hooks
+*******************************************************************************/
+#include "swt.h"
+#include "qf_structs.h"
+
+#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
+
+/* {{{ XClientMessageEvent */
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XClientMessageEvent_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XClientMessageEvent_2II)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+{
+	XClientMessageEvent _arg0, *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XClientMessageEvent_2II_FUNC);
+	if (arg0) lparg0 = &_arg0;
+	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+	if (arg0) setXClientMessageEventFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XClientMessageEvent_2II_FUNC);
+}
+#endif
+
+/* }}} */
+
+/* {{{ GdkEventCrossing */
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventCrossing_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventCrossing_2I)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+        GdkEventCrossing _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventCrossing_2I_FUNC);
+	if (arg1) lparg1 = getGdkEventCrossingFields(env, arg1, &_arg1);
+	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventCrossing_2I_FUNC);
+}
+#endif
+
+/* }}} */
+/* {{{ GdkEventKey */
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+        GdkEventKey _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I_FUNC);
+	if (arg1) lparg1 = getGdkEventKeyFields(env, arg1, &_arg1);
+	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventKey_2I_FUNC);
+}
+#endif
+
+/* }}} */
+/* {{{ GdkEventFocus */
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventFocus_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventFocus_2I)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+        GdkEventFocus _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventFocus_2I_FUNC);
+	if (arg1) lparg1 = getGdkEventFocusFields(env, arg1, &_arg1);
+	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventFocus_2I_FUNC);
+}
+#endif
+
+/* }}} */
+/* {{{ GdkEventAny */
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventAny_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventAny_2I)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+        GdkEventAny _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventAny_2I_FUNC);
+	if (arg1) lparg1 = getGdkEventAnyFields(env, arg1, &_arg1);
+	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventAny_2I_FUNC);
+}
+#endif
+
+/* }}} */
+
+/* {{{ Misc */
+
+#ifndef NO_GDK_1WINDOW_1XID
+JNIEXPORT jint JNICALL OS_NATIVE(GDK_1WINDOW_1XID)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	OS_NATIVE_ENTER(env, that, GDK_1WINDOW_1XID_FUNC);
+	rc = (jint)GDK_WINDOW_XID((GdkWindow *) arg0);
+	OS_NATIVE_EXIT(env, that, GDK_1WINDOW_1XID_FUNC);
+	return rc;
+}
+#endif
+
+
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1menu_1item_1activate)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, gtk_1menu_1item_1activate);
+	gtk_menu_item_activate((GtkMenuItem *) arg0);
+	OS_NATIVE_EXIT(env, that, gtk_1menu_1item_1activate);
+}
+
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1item_1select)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, gtk_1item_1select);
+	gtk_item_select((GtkItem *) arg0);
+	OS_NATIVE_EXIT(env, that, gtk_1item_1select);
+}
+
+JNIEXPORT jint JNICALL OS_NATIVE(gdk_1x11_1get_1server_1time)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, gdk_1x11_1get_1server_1time);
+	jint ret = gdk_x11_get_server_time((GdkWindow *) arg0);
+	OS_NATIVE_EXIT(env, that, gtk_item_select);
+	return ret;
+}
+
+#ifndef NO_gdk_1window_1get_1size
+JNIEXPORT void JNICALL OS_NATIVE(gdk_1window_1get_1size)
+	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, gdk_1window_1get_1size_FUNC);
+	if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+	gdk_window_get_size((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
+	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, gdk_1window_1get_1size_FUNC);
+}
+#endif
+
+#ifndef NO_gtk_1dialog_1response
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1dialog_1response)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, gtk_1dialog_1response_FUNC);
+	gtk_dialog_response((GtkDialog *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, gtk_1dialog_1response_FUNC);
+}
+#endif
+
+#ifndef NO_gdk_1window_1peek_1children
+JNIEXPORT jint JNICALL OS_NATIVE(gdk_1window_1peek_1children)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	OS_NATIVE_ENTER(env, that, gdk_1window_1peek_1children_FUNC);
+	rc = (jint)gdk_window_peek_children((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, gdk_1window_1peek_1children_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1menu_1popup_1fake_1xgrab
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup_1fake_1xgrab)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_1fake_1xgrab_FUNC);
+        GtkMenu *menu = (GtkMenu*) arg0;
+
+        GtkWidget *widget;
+        GtkWidget *xgrab_shell;
+        GtkWidget *parent;
+        GtkMenuShell *menu_shell;
+
+        g_return_if_fail (GTK_IS_MENU (menu));
+
+        widget = GTK_WIDGET (menu);
+        menu_shell = GTK_MENU_SHELL (menu);
+
+        menu_shell->parent_menu_shell = NULL;
+
+        /* Find the last viewable ancestor, and fake an X grab on it */
+        parent = GTK_WIDGET (menu);
+        xgrab_shell = NULL;
+        while (parent) {
+            gboolean viewable = TRUE;
+            GtkWidget *tmp = parent;
+
+            while (tmp) {
+                if (!GTK_WIDGET_MAPPED (tmp)) {
+                    viewable = FALSE;
+                    break;
+                }
+                tmp = tmp->parent;
+            }
+
+            if (viewable) {
+                xgrab_shell = parent;
+            }
+
+            parent = GTK_MENU_SHELL (parent)->parent_menu_shell;
+        }
+        if (xgrab_shell == NULL) {
+            xgrab_shell = widget;
+        }
+	GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
+
+        OS_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_1trick_1xgrab_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1menu_1item_1activate_1item
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1activate_1item)
+    (JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1activate_1item_FUNC);
+        GtkMenuItem *menu_item = (GtkMenuItem*) arg0;
+
+        g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
+        GTK_MENU_ITEM_GET_CLASS (menu_item)->activate_item(menu_item);
+        OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1activate_1item_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1menu_1shell_1activate_1item
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1activate_1item)
+    (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1activate_1item_FUNC);
+        GtkMenuShell *menu_shell = (GtkMenuShell*) arg0;
+        GtkMenuItem *menu_item = (GtkMenuItem*) arg1;
+
+        g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
+        g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
+        gtk_menu_shell_activate_item(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(menu_item), arg2);
+        OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1activate_1item_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1menu_1shell_1deselect
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deselect)
+    (JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deselect_FUNC);
+        GtkMenuShell *menu_shell = (GtkMenuShell*) arg0;
+
+        g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
+        gtk_menu_shell_deselect(menu_shell);
+        OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1deselect_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1idle_1add_1full
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add_1full)
+    (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1idle_1add_1full_FUNC);
+        return g_idle_add_full(arg0, (GSourceFunc) arg1, (gpointer) arg2, (GDestroyNotify) arg3);
+        OS_NATIVE_EXIT(env, that, _1g_1idle_1add_1full_FUNC);
+}
+#endif
+
+/* }}} */
Index: os_custom.c
===================================================================
--- os_custom.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ os_custom.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -219,4 +219,4 @@
 		r++;
 	}
 	return r;
-}
+}
\ No newline at end of file
Index: swt_awt.c
===================================================================
--- swt_awt.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ swt_awt.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -1,13 +1,13 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 #include "swt.h"
 #include "jawt_md.h"
Index: callback.c
===================================================================
--- callback.c	(.../vendor/swt/linux-gtk/3.8/csrc)	(revision 23809)
+++ callback.c	(.../trunk/thirdparty/swt/3.8/linux-gtk/csrc)	(revision 23809)
@@ -1073,9 +1073,9 @@
 				code[j++] = ((i >> 16) & 0xFF);
 				code[j++] = ((i >> 24) & 0xFF);
 			} else {
-				//PUSH i - 2 bytes
-				code[j++] = 0x6a;
-				code[j++] = i;
+			//PUSH i - 2 bytes
+			code[j++] = 0x6a;
+			code[j++] = i;
 			}
 
 			//MOV EAX callback - 1 + sizeof(jintLong) bytes
@@ -1247,7 +1247,7 @@
 	}
 	va_end(vl);
 	ATOMIC_DEC(callbackEntryCount);
-
+	
 done:
 	/* If an exception has occurred in Java, return the error result. */
 	if ((ex = (*env)->ExceptionOccurred(env))) {
