*** empty log message ***

12 files changed, 940 insertions, 63 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
index 2b597b3d20..d09770f0b6 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
@@ -1220,6 +1220,9 @@ OS_GCHandle_Dump=flags=no_gen
 OS_GCHandle_Free=flags=no_gen
 OS_GCHandle_Free_0=
 
+OS_GCHandle_ToHandle=flags=no_gen
+OS_GCHandle_ToHandle_0=
+
 OS_GeometryCollection_Add=flags=cpp
 OS_GeometryCollection_Add_0=cast=(GeometryCollection^),flags=gcobject
 OS_GeometryCollection_Add_1=cast=Geometry^,flags=gcobject
@@ -1436,6 +1439,10 @@ OS_HeapFree_0=cast=(HANDLE)
 OS_HeapFree_1=
 OS_HeapFree_2=cast=(LPVOID)
 
+OS_HtmlDocument_InvokeScript=flags=cpp gcobject
+OS_HtmlDocument_InvokeScript_0=cast=(System::Windows::Forms::HtmlDocument^),flags=gcobject
+OS_HtmlDocument_InvokeScript_1=cast=String^,flags=gcobject
+
 OS_HwndSource_Handle=flags=gcobject getter
 OS_HwndSource_Handle_0=cast=(HwndSource^),flags=gcobject
 
@@ -3291,6 +3298,90 @@ OS_Visual_PointToScreen=flags=struct cpp gcobject
 OS_Visual_PointToScreen_0=cast=Visual^,flags=gcobject
 OS_Visual_PointToScreen_1=cast=(Point),flags=gcobject
 
+OS_WebBrowserDocumentCompletedEventArgs_Url=flags=gcobject getter
+OS_WebBrowserDocumentCompletedEventArgs_Url_0=cast=(System::Windows::Forms::WebBrowserDocumentCompletedEventArgs^),flags=gcobject
+
+OS_WebBrowserNavigatedEventArgs_Url=flags=gcobject getter
+OS_WebBrowserNavigatedEventArgs_Url_0=cast=(System::Windows::Forms::WebBrowserNavigatedEventArgs^),flags=gcobject
+
+OS_WebBrowserNavigatingEventArgs_Url=flags=gcobject getter
+OS_WebBrowserNavigatingEventArgs_Url_0=cast=(System::Windows::Forms::WebBrowserNavigatingEventArgs^),flags=gcobject
+
+OS_WebBrowserProgressChangedEventArgs_CurrentProgress=flags=getter
+OS_WebBrowserProgressChangedEventArgs_CurrentProgress_0=cast=(System::Windows::Forms::WebBrowserProgressChangedEventArgs^),flags=gcobject
+
+OS_WebBrowserProgressChangedEventArgs_MaximumProgress=flags=getter
+OS_WebBrowserProgressChangedEventArgs_MaximumProgress_0=cast=(System::Windows::Forms::WebBrowserProgressChangedEventArgs^),flags=gcobject
+
+OS_WebBrowser_CanGoBack=flags=getter
+OS_WebBrowser_CanGoBack_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_CanGoForward=flags=getter
+OS_WebBrowser_CanGoForward_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_Document=flags=gcobject getter
+OS_WebBrowser_Document_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_DocumentCompleted=flags=adder
+OS_WebBrowser_DocumentCompleted_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_DocumentCompleted_1=cast=(System::Windows::Forms::WebBrowserDocumentCompletedEventHandler^),flags=gcobject
+
+OS_WebBrowser_DocumentText=flags=setter
+OS_WebBrowser_DocumentText_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_DocumentText_1=cast=String^,flags=gcobject
+
+OS_WebBrowser_DocumentTitle=flags=gcobject getter
+OS_WebBrowser_DocumentTitle_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_DocumentTitleChanged=flags=adder
+OS_WebBrowser_DocumentTitleChanged_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_DocumentTitleChanged_1=cast=EventHandler^,flags=gcobject
+
+OS_WebBrowser_GoBack=flags=cpp
+OS_WebBrowser_GoBack_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_GoForward=flags=cpp
+OS_WebBrowser_GoForward_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_Navigate=flags=cpp
+OS_WebBrowser_Navigate_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_Navigate_1=cast=String^,flags=gcobject
+
+OS_WebBrowser_Navigated=flags=adder
+OS_WebBrowser_Navigated_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_Navigated_1=cast=(System::Windows::Forms::WebBrowserNavigatedEventHandler^),flags=gcobject
+
+OS_WebBrowser_Navigating=flags=adder
+OS_WebBrowser_Navigating_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_Navigating_1=cast=(System::Windows::Forms::WebBrowserNavigatingEventHandler^),flags=gcobject
+
+OS_WebBrowser_ProgressChanged=flags=adder
+OS_WebBrowser_ProgressChanged_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_ProgressChanged_1=cast=(System::Windows::Forms::WebBrowserProgressChangedEventHandler^),flags=gcobject
+
+OS_WebBrowser_ReadyState=flags=getter
+OS_WebBrowser_ReadyState_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_Refresh=flags=cpp
+OS_WebBrowser_Refresh_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_ScriptErrorsSuppressed=flags=setter
+OS_WebBrowser_ScriptErrorsSuppressed_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_ScriptErrorsSuppressed_1=
+
+OS_WebBrowser_StatusText=flags=gcobject getter
+OS_WebBrowser_StatusText_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_StatusTextChanged=flags=adder
+OS_WebBrowser_StatusTextChanged_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+OS_WebBrowser_StatusTextChanged_1=cast=EventHandler^,flags=gcobject
+
+OS_WebBrowser_Stop=flags=cpp
+OS_WebBrowser_Stop_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
+OS_WebBrowser_Url=flags=gcobject getter
+OS_WebBrowser_Url_0=cast=(System::Windows::Forms::WebBrowser^),flags=gcobject
+
 OS_WindowCollection_Count=flags=getter
 OS_WindowCollection_Count_0=cast=(WindowCollection^),flags=gcobject
 
@@ -3390,6 +3481,10 @@ OS_Window_WindowStyle=flags=setter
 OS_Window_WindowStyle_0=cast=(Window^),flags=gcobject
 OS_Window_WindowStyle_1=cast=WindowStyle
 
+OS_WindowsFormsHost_Child=flags=setter
+OS_WindowsFormsHost_Child_0=cast=(System::Windows::Forms::Integration::WindowsFormsHost^),flags=gcobject
+OS_WindowsFormsHost_Child_1=cast=(System::Windows::Forms::Control^),flags=gcobject
+
 OS_WriteableBitmap_WritePixels=flags=cpp
 OS_WriteableBitmap_WritePixels_0=cast=WriteableBitmap^,flags=gcobject
 OS_WriteableBitmap_WritePixels_1=cast=Int32Rect,flags=gcobject
@@ -3944,8 +4039,28 @@ OS_gcnew_Uri_1=cast=UriKind
 
 OS_gcnew_UserControl=flags=gcnew
 
+OS_gcnew_WebBrowser=accessor=System::Windows::Forms::WebBrowser,flags=gcnew
+
+OS_gcnew_WebBrowserDocumentCompletedEventHandler=flags=no_gen
+OS_gcnew_WebBrowserDocumentCompletedEventHandler_0=
+OS_gcnew_WebBrowserDocumentCompletedEventHandler_1=
+
+OS_gcnew_WebBrowserNavigatedEventHandler=flags=no_gen
+OS_gcnew_WebBrowserNavigatedEventHandler_0=
+OS_gcnew_WebBrowserNavigatedEventHandler_1=
+
+OS_gcnew_WebBrowserNavigatingEventHandler=flags=no_gen
+OS_gcnew_WebBrowserNavigatingEventHandler_0=
+OS_gcnew_WebBrowserNavigatingEventHandler_1=
+
+OS_gcnew_WebBrowserProgressChangedEventHandler=flags=no_gen
+OS_gcnew_WebBrowserProgressChangedEventHandler_0=
+OS_gcnew_WebBrowserProgressChangedEventHandler_1=
+
 OS_gcnew_Window=flags=gcnew
 
+OS_gcnew_WindowsFormsHost=accessor=System::Windows::Forms::Integration::WindowsFormsHost,flags=gcnew
+
 OS_gcnew_1WriteableBitmap__I=flags=gcnew
 OS_gcnew_1WriteableBitmap__I_0=cast=BitmapSource^,flags=gcobject
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/IE.java
new file mode 100644
index 0000000000..bc94ce80b0
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/IE.java
@@ -0,0 +1,271 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 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.*;
+import org.eclipse.swt.internal.wpf.*;
+import org.eclipse.swt.widgets.*;
+
+class IE extends WebBrowser {
+	
+	int webBrowser, host, jniRef;
+
+	boolean ignoreDispose;
+
+	static {
+		NativeClearSessions = new Runnable() {
+			public void run() {
+//				OS.InternetSetOption (0, OS.INTERNET_OPTION_END_BROWSER_SESSION, 0, 0);
+			}
+		};
+	}
+
+public void create(Composite parent, int style) {
+	host = OS.gcnew_WindowsFormsHost();
+	if (host == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+	webBrowser = OS.gcnew_WebBrowser();
+	if (webBrowser == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+	OS.WindowsFormsHost_Child(host, webBrowser);
+	jniRef = OS.NewGlobalRef(this);
+	if (jniRef == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+	OS.WebBrowser_ScriptErrorsSuppressed(webBrowser, true);
+	int handler = OS.gcnew_WebBrowserNavigatingEventHandler(jniRef, "HandleNavigating");
+	OS.WebBrowser_Navigating(webBrowser, handler);
+	OS.GCHandle_Free(handler);
+	handler = OS.gcnew_WebBrowserProgressChangedEventHandler(jniRef, "HandleProgressChanged");
+	OS.WebBrowser_ProgressChanged(webBrowser, handler);
+	OS.GCHandle_Free(handler);
+	handler = OS.gcnew_EventHandler(jniRef, "HandleStatusTextChanged");
+	OS.WebBrowser_StatusTextChanged(webBrowser, handler);
+	OS.GCHandle_Free(handler);
+	handler = OS.gcnew_EventHandler(jniRef, "HandleDocumentTitleChanged");
+	OS.WebBrowser_DocumentTitleChanged(webBrowser, handler);
+	OS.GCHandle_Free(handler);
+	handler = OS.gcnew_WebBrowserDocumentCompletedEventHandler(jniRef, "HandleDocumentCompleted");
+	OS.WebBrowser_DocumentCompleted(webBrowser, handler);
+	OS.GCHandle_Free(handler);
+
+	int parentHandle = browser.handle;
+	int children = OS.Panel_Children(parentHandle);
+	OS.UIElementCollection_Insert(children, 0, host);
+	OS.GCHandle_Free(children);
+	OS.FrameworkElement_Width(host, OS.FrameworkElement_Width(parentHandle));
+	OS.FrameworkElement_Height(host, OS.FrameworkElement_Height(parentHandle));
+	
+	Listener listener = new Listener() {
+		public void handleEvent(Event event) {
+			switch (event.type) {
+				case SWT.Dispose: {
+					if (ignoreDispose) {
+						ignoreDispose = false;
+						break;
+					}
+					ignoreDispose = true;
+					browser.notifyListeners (event.type, event);
+					event.type = SWT.NONE;
+					OS.GCHandle_Free(host);
+					OS.GCHandle_Free(webBrowser);
+					OS.DeleteGlobalRef(jniRef);
+					host = webBrowser = jniRef = 0;
+					break;
+				}
+				case SWT.Resize: {
+					OS.FrameworkElement_Width(host, OS.FrameworkElement_Width(browser.handle));
+					OS.FrameworkElement_Height(host, OS.FrameworkElement_Height(browser.handle));
+					break;
+				}
+			}
+		}
+	};
+	browser.addListener(SWT.Resize, listener);
+	browser.addListener(SWT.Dispose, listener);
+}
+
+public boolean back() {
+	return OS.WebBrowser_GoBack(webBrowser);
+}
+
+public boolean execute(String script) {
+//	int document = OS.WebBrowser_Document(frame);
+//	int length = script.length ();
+//	char [] buffer = new char [length + 1];
+//	script.getChars (0, length, buffer, 0);
+//	int str = OS.gcnew_String (buffer);
+//	int result = OS.HtmlDocument_InvokeScript(document, str);
+//	OS.GCHandle_Free(result);
+//	OS.GCHandle_Free(str);
+//	OS.GCHandle_Free(document);
+	return true;
+}
+
+public boolean forward() {
+	return OS.WebBrowser_GoForward(webBrowser);
+}
+
+public String getUrl() {
+	int uri = OS.WebBrowser_Url(webBrowser);
+	String url = getUriString (uri);
+	if (uri != 0) OS.GCHandle_Free(uri);
+	return url;
+}
+
+String getUriString(int uri) {
+	if (uri == 0) return null;
+	int str = OS.Object_ToString(uri);
+	int charArray = OS.String_ToCharArray(str);
+	char[] chars = new char[OS.String_Length(str)];
+	OS.memcpy(chars, charArray, chars.length * 2);
+	OS.GCHandle_Free(charArray);
+	String url = new String(chars);
+	OS.GCHandle_Free(str);
+	return url;
+}
+
+void HandleDocumentCompleted(int sender, int e) {
+	if (webBrowser == 0) return;
+	int uri = OS.WebBrowserDocumentCompletedEventArgs_Url(e);
+	String url = getUriString (uri);
+	if (uri != 0) OS.GCHandle_Free(uri);
+	LocationEvent newEvent = new LocationEvent(browser);
+	newEvent.display = browser.getDisplay();
+	newEvent.widget = browser;
+	newEvent.location = url;
+	newEvent.doit = true;
+	for (int i = 0; i < locationListeners.length; i++) {
+		locationListeners[i].changing(newEvent);
+	}
+	if (browser.isDisposed()) return;
+	ProgressEvent progressEvent = new ProgressEvent(browser);
+	progressEvent.display = browser.getDisplay();
+	progressEvent.widget = browser;
+	for (int i = 0; i < progressListeners.length; i++) {
+		progressListeners[i].completed(progressEvent);
+	}
+}
+
+void HandleDocumentTitleChanged(int sender, int e) {
+	if (webBrowser == 0) return;
+	int str = OS.WebBrowser_DocumentTitle(webBrowser);
+	String title = "";
+	if (str != 0) {
+		int charArray = OS.String_ToCharArray(str);
+		char[] chars = new char[OS.String_Length(str)];
+		OS.memcpy(chars, charArray, chars.length * 2);
+		OS.GCHandle_Free(charArray);
+		OS.GCHandle_Free(str);
+		title = new String(chars);
+	}
+	TitleEvent newEvent = new TitleEvent(browser);
+	newEvent.display = browser.getDisplay();
+	newEvent.widget = browser;
+	newEvent.title = title;
+	for (int i = 0; i < titleListeners.length; i++) {
+		titleListeners[i].changed(newEvent);
+	}
+}
+
+void HandleNavigating(int sender, int e) {
+	if (webBrowser == 0) return;
+	int uri = OS.WebBrowserNavigatingEventArgs_Url(e);
+	String url = getUriString (uri);
+	if (uri != 0) OS.GCHandle_Free(uri);
+	LocationEvent newEvent = new LocationEvent(browser);
+	newEvent.display = browser.getDisplay();
+	newEvent.widget = browser;
+	newEvent.location = url;
+	newEvent.doit = true;
+	for (int i = 0; i < locationListeners.length; i++) {
+		locationListeners[i].changing(newEvent);
+	}
+}
+
+void HandleProgressChanged(int sender, int e) {
+	if (webBrowser == 0) return;
+	long nProgress = OS.WebBrowserProgressChangedEventArgs_CurrentProgress(e);
+	long nProgressMax = OS.WebBrowserProgressChangedEventArgs_MaximumProgress(e);
+	if (nProgress != -1) {
+		ProgressEvent newEvent = new ProgressEvent(browser);
+		newEvent.display = browser.getDisplay();
+		newEvent.widget = browser;
+		newEvent.current = (int)nProgress;
+		newEvent.total = (int)nProgressMax;
+		for (int i = 0; i < progressListeners.length; i++) {
+			progressListeners[i].changed(newEvent);
+		}
+	}
+}
+
+void HandleStatusTextChanged(int sender, int e) {
+	if (webBrowser == 0) return;
+	int str = OS.WebBrowser_StatusText(webBrowser);
+	String text = "";
+	if (str != 0) {
+		int charArray = OS.String_ToCharArray(str);
+		char[] chars = new char[OS.String_Length(str)];
+		OS.memcpy(chars, charArray, chars.length * 2);
+		OS.GCHandle_Free(charArray);
+		OS.GCHandle_Free(str);
+		text = new String(chars);
+	}
+	StatusTextEvent newEvent = new StatusTextEvent(browser);
+	newEvent.display = browser.getDisplay();
+	newEvent.widget = browser;
+	newEvent.text = text;
+	for (int i = 0; i < statusTextListeners.length; i++) {
+		statusTextListeners[i].changed(newEvent);
+	}
+}
+
+public boolean isBackEnabled() {
+	return OS.WebBrowser_CanGoBack(webBrowser);
+}
+
+public boolean isForwardEnabled() {
+	return OS.WebBrowser_CanGoForward(webBrowser);
+}
+
+public void refresh() {
+	OS.WebBrowser_Refresh(webBrowser);
+}
+
+public boolean setText(String html) {
+	int state = OS.WebBrowser_ReadyState(webBrowser);
+	if (!(state == OS.WebBrowserReadyState_Uninitialized || state == OS.WebBrowserReadyState_Complete)) {
+		OS.WebBrowser_Stop(webBrowser);
+	}
+	int length = html.length ();
+	char [] buffer = new char [length + 1];
+	html.getChars (0, length, buffer, 0);
+	int str = OS.gcnew_String (buffer);
+	if (str == 0) SWT.error (SWT.ERROR_NO_HANDLES);
+	OS.WebBrowser_DocumentText(webBrowser, str);
+	OS.GCHandle_Free(str);
+	return true;
+}
+
+public boolean setUrl(String url) {
+	int state = OS.WebBrowser_ReadyState(webBrowser);
+	if (!(state == OS.WebBrowserReadyState_Uninitialized || state == OS.WebBrowserReadyState_Complete)) {
+		OS.WebBrowser_Stop(webBrowser);
+	}
+	int length = url.length ();
+	char [] buffer = new char [length + 1];
+	url.getChars (0, length, buffer, 0);
+	int str = OS.gcnew_String (buffer);
+	OS.WebBrowser_Navigate(webBrowser, str);
+	OS.GCHandle_Free(str);
+	return true;
+}
+
+public void stop() {
+	OS.WebBrowser_Stop(webBrowser);
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
index 247a9d8410..072e6522c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
@@ -33,7 +33,7 @@ TRYCATCH = -DTRYCATCH
 WPF_HOME = C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.0
 DOTNET_HOME = C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727
 CFLAGS = -c -W2 -D_WIN32_DCOM -O2 -DVISTA -DSWT_VERSION=$(SWT_VERSION) -DNO_getenv $(NATIVE_STATS) $(TRYCATCH) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I.
-CPPFLAGS = -clr /FU"$(WPF_HOME)\PresentationCore.dll" /FU"$(WPF_HOME)\PresentationFramework.dll" /FU$(DOTNET_HOME)\System.Data.dll /FU$(DOTNET_HOME)\System.dll /FU$(DOTNET_HOME)\System.Xml.dll /FU"$(WPF_HOME)\UIAutomationProvider.dll" /FU"$(WPF_HOME)\UIAutomationTypes.dll" /FU"$(WPF_HOME)\WindowsBase.dll" /FU$(DOTNET_HOME)\System.Drawing.dll /FU$(DOTNET_HOME)\System.Windows.Forms.dll 
+CPPFLAGS = -clr /FU"$(WPF_HOME)\PresentationCore.dll" /FU"$(WPF_HOME)\PresentationFramework.dll" /FU$(DOTNET_HOME)\System.Data.dll /FU$(DOTNET_HOME)\System.dll /FU$(DOTNET_HOME)\System.Xml.dll /FU"$(WPF_HOME)\UIAutomationProvider.dll" /FU"$(WPF_HOME)\UIAutomationTypes.dll" /FU"$(WPF_HOME)\WindowsBase.dll" /FU$(DOTNET_HOME)\System.Drawing.dll /FU$(DOTNET_HOME)\System.Windows.Forms.dll  /FU"$(WPF_HOME)\WindowsFormsIntegration.dll"
 LFLAGS = -DLL -NODEFAULTLIB:"LIBCMT.LIB" -CLRTHREADATTRIBUTE:STA user32.lib gdi32.lib shell32.lib
 COMLFLAGS = -DLL ole32.lib
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
index ecdcaf8379..64142bbbf3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
@@ -5220,6 +5220,19 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree)
 }
 #endif
 
+#ifndef NO_HtmlDocument_1InvokeScript
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(HtmlDocument_1InvokeScript)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL OS_NATIVE(HtmlDocument_1InvokeScript)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HtmlDocument_1InvokeScript_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::HtmlDocument^)TO_OBJECT(arg0))->InvokeScript((String^)TO_OBJECT(arg1)));
+	OS_NATIVE_EXIT(env, that, HtmlDocument_1InvokeScript_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_HwndSource_1Handle
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(HwndSource_1Handle)(JNIEnv *env, jclass that, jint arg0);
 JNIEXPORT jint JNICALL OS_NATIVE(HwndSource_1Handle)
@@ -11975,6 +11988,309 @@ JNIEXPORT jint JNICALL OS_NATIVE(Visual_1PointToScreen)
 }
 #endif
 
+#ifndef NO_WebBrowserDocumentCompletedEventArgs_1Url
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserDocumentCompletedEventArgs_1Url)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserDocumentCompletedEventArgs_1Url)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowserDocumentCompletedEventArgs_1Url_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowserDocumentCompletedEventArgs^)TO_OBJECT(arg0))->Url);
+	OS_NATIVE_EXIT(env, that, WebBrowserDocumentCompletedEventArgs_1Url_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowserNavigatedEventArgs_1Url
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserNavigatedEventArgs_1Url)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserNavigatedEventArgs_1Url)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowserNavigatedEventArgs_1Url_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowserNavigatedEventArgs^)TO_OBJECT(arg0))->Url);
+	OS_NATIVE_EXIT(env, that, WebBrowserNavigatedEventArgs_1Url_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowserNavigatingEventArgs_1Url
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserNavigatingEventArgs_1Url)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowserNavigatingEventArgs_1Url)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowserNavigatingEventArgs_1Url_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowserNavigatingEventArgs^)TO_OBJECT(arg0))->Url);
+	OS_NATIVE_EXIT(env, that, WebBrowserNavigatingEventArgs_1Url_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowserProgressChangedEventArgs_1CurrentProgress
+extern "C" JNIEXPORT jlong JNICALL OS_NATIVE(WebBrowserProgressChangedEventArgs_1CurrentProgress)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jlong JNICALL OS_NATIVE(WebBrowserProgressChangedEventArgs_1CurrentProgress)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowserProgressChangedEventArgs_1CurrentProgress_FUNC);
+	rc = (jlong)((System::Windows::Forms::WebBrowserProgressChangedEventArgs^)TO_OBJECT(arg0))->CurrentProgress;
+	OS_NATIVE_EXIT(env, that, WebBrowserProgressChangedEventArgs_1CurrentProgress_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowserProgressChangedEventArgs_1MaximumProgress
+extern "C" JNIEXPORT jlong JNICALL OS_NATIVE(WebBrowserProgressChangedEventArgs_1MaximumProgress)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jlong JNICALL OS_NATIVE(WebBrowserProgressChangedEventArgs_1MaximumProgress)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowserProgressChangedEventArgs_1MaximumProgress_FUNC);
+	rc = (jlong)((System::Windows::Forms::WebBrowserProgressChangedEventArgs^)TO_OBJECT(arg0))->MaximumProgress;
+	OS_NATIVE_EXIT(env, that, WebBrowserProgressChangedEventArgs_1MaximumProgress_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1CanGoBack
+extern "C" JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1CanGoBack)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1CanGoBack)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1CanGoBack_FUNC);
+	rc = (jboolean)((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->CanGoBack;
+	OS_NATIVE_EXIT(env, that, WebBrowser_1CanGoBack_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1CanGoForward
+extern "C" JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1CanGoForward)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1CanGoForward)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1CanGoForward_FUNC);
+	rc = (jboolean)((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->CanGoForward;
+	OS_NATIVE_EXIT(env, that, WebBrowser_1CanGoForward_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1Document
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1Document)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1Document)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Document_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Document);
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Document_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1DocumentCompleted
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentCompleted)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentCompleted)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1DocumentCompleted_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->DocumentCompleted += ((System::Windows::Forms::WebBrowserDocumentCompletedEventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1DocumentCompleted_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1DocumentText
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentText)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentText)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1DocumentText_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->DocumentText = ((String^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1DocumentText_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1DocumentTitle
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1DocumentTitle)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1DocumentTitle)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1DocumentTitle_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->DocumentTitle);
+	OS_NATIVE_EXIT(env, that, WebBrowser_1DocumentTitle_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1DocumentTitleChanged
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentTitleChanged)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1DocumentTitleChanged)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1DocumentTitleChanged_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->DocumentTitleChanged += ((EventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1DocumentTitleChanged_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1GoBack
+extern "C" JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1GoBack)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1GoBack)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1GoBack_FUNC);
+	rc = (jboolean)((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->GoBack();
+	OS_NATIVE_EXIT(env, that, WebBrowser_1GoBack_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1GoForward
+extern "C" JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1GoForward)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jboolean JNICALL OS_NATIVE(WebBrowser_1GoForward)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1GoForward_FUNC);
+	rc = (jboolean)((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->GoForward();
+	OS_NATIVE_EXIT(env, that, WebBrowser_1GoForward_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1Navigate
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigate)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigate)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Navigate_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Navigate((String^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Navigate_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1Navigated
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigated)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigated)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Navigated_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Navigated += ((System::Windows::Forms::WebBrowserNavigatedEventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Navigated_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1Navigating
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigating)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Navigating)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Navigating_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Navigating += ((System::Windows::Forms::WebBrowserNavigatingEventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Navigating_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1ProgressChanged
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1ProgressChanged)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1ProgressChanged)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1ProgressChanged_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->ProgressChanged += ((System::Windows::Forms::WebBrowserProgressChangedEventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1ProgressChanged_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1ReadyState
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1ReadyState)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1ReadyState)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1ReadyState_FUNC);
+	rc = (jint)((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->ReadyState;
+	OS_NATIVE_EXIT(env, that, WebBrowser_1ReadyState_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1Refresh
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Refresh)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Refresh)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Refresh_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Refresh();
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Refresh_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1ScriptErrorsSuppressed
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1ScriptErrorsSuppressed)(JNIEnv *env, jclass that, jint arg0, jboolean arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1ScriptErrorsSuppressed)
+	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1ScriptErrorsSuppressed_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->ScriptErrorsSuppressed = (arg1);
+	OS_NATIVE_EXIT(env, that, WebBrowser_1ScriptErrorsSuppressed_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1StatusText
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1StatusText)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1StatusText)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1StatusText_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->StatusText);
+	OS_NATIVE_EXIT(env, that, WebBrowser_1StatusText_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WebBrowser_1StatusTextChanged
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1StatusTextChanged)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1StatusTextChanged)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1StatusTextChanged_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->StatusTextChanged += ((EventHandler^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WebBrowser_1StatusTextChanged_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1Stop
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Stop)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT void JNICALL OS_NATIVE(WebBrowser_1Stop)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Stop_FUNC);
+	((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Stop();
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Stop_FUNC);
+}
+#endif
+
+#ifndef NO_WebBrowser_1Url
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1Url)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(WebBrowser_1Url)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WebBrowser_1Url_FUNC);
+	rc = (jint)TO_HANDLE(((System::Windows::Forms::WebBrowser^)TO_OBJECT(arg0))->Url);
+	OS_NATIVE_EXIT(env, that, WebBrowser_1Url_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_WindowCollection_1Count
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(WindowCollection_1Count)(JNIEnv *env, jclass that, jint arg0);
 JNIEXPORT jint JNICALL OS_NATIVE(WindowCollection_1Count)
@@ -12301,6 +12617,17 @@ JNIEXPORT void JNICALL OS_NATIVE(Window_1WindowStyle)
 }
 #endif
 
+#ifndef NO_WindowsFormsHost_1Child
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(WindowsFormsHost_1Child)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(WindowsFormsHost_1Child)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, WindowsFormsHost_1Child_FUNC);
+	((System::Windows::Forms::Integration::WindowsFormsHost^)TO_OBJECT(arg0))->Child = ((System::Windows::Forms::Control^)TO_OBJECT(arg1));
+	OS_NATIVE_EXIT(env, that, WindowsFormsHost_1Child_FUNC);
+}
+#endif
+
 #ifndef NO_WriteableBitmap_1WritePixels
 extern "C" JNIEXPORT void JNICALL OS_NATIVE(WriteableBitmap_1WritePixels)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4);
 JNIEXPORT void JNICALL OS_NATIVE(WriteableBitmap_1WritePixels)
@@ -14092,6 +14419,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1UserControl)
 }
 #endif
 
+#ifndef NO_gcnew_1WebBrowser
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WebBrowser)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WebBrowser)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, gcnew_1WebBrowser_FUNC);
+	rc = (jint)TO_HANDLE(gcnew System::Windows::Forms::WebBrowser());
+	OS_NATIVE_EXIT(env, that, gcnew_1WebBrowser_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_gcnew_1Window
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1Window)(JNIEnv *env, jclass that);
 JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1Window)
@@ -14105,6 +14445,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1Window)
 }
 #endif
 
+#ifndef NO_gcnew_1WindowsFormsHost
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WindowsFormsHost)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WindowsFormsHost)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, gcnew_1WindowsFormsHost_FUNC);
+	rc = (jint)TO_HANDLE(gcnew System::Windows::Forms::Integration::WindowsFormsHost());
+	OS_NATIVE_EXIT(env, that, gcnew_1WindowsFormsHost_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_gcnew_1WriteableBitmap__I
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WriteableBitmap__I)(JNIEnv *env, jclass that, jint arg0);
 JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1WriteableBitmap__I)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.h
index c176b319b9..f908d4d70c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.h
@@ -48,7 +48,7 @@ struct _jmethodID {
 };
 }
 
-#define GCHANDLE_TABLE
+//#define GCHANDLE_TABLE
 
 #ifdef GCHANDLE_TABLE
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_custom.cpp
index 265ae5a31c..2f03a49fe3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_custom.cpp
@@ -842,7 +842,7 @@ public:
 		EventHandler (sender, e);
 	}
 
-	void RoutedPropertyChangedEventHandler  (Object^ sender, RoutedPropertyChangedEventArgs<Object^>^ e) {
+	void RoutedPropertyChangedEventHandlerObject  (Object^ sender, RoutedPropertyChangedEventArgs<Object^>^ e) {
 		EventHandler (sender, e);
 	}
 
@@ -905,11 +905,27 @@ public:
 	void GiveFeedbackEventHandler (Object^ sender, GiveFeedbackEventArgs^ e) {
 		EventHandler (sender, e);	
 	}
-		
+
 	void QueryContinueDragEventHandler (Object^ sender, QueryContinueDragEventArgs^ e) {
 		EventHandler (sender, e);	
 	}
 		
+	void WebBrowserNavigatingEventHandler (Object^ sender, System::Windows::Forms::WebBrowserNavigatingEventArgs^ e) {
+		EventHandler (sender, e);	
+	}
+
+	void WebBrowserNavigatedEventHandler (Object^ sender, System::Windows::Forms::WebBrowserNavigatedEventArgs^ e) {
+		EventHandler (sender, e);	
+	}
+	
+	void WebBrowserProgressChangedEventHandler (Object^ sender, System::Windows::Forms::WebBrowserProgressChangedEventArgs^ e) {
+		EventHandler (sender, e);	
+	}	
+	
+	void WebBrowserDocumentCompletedEventHandler (Object^ sender, System::Windows::Forms::WebBrowserDocumentCompletedEventArgs^ e) {
+		EventHandler (sender, e);	
+	}
+
 	void NoArgsDelegate() {	
 		jobject object = cookie->object;
 		if (object == NULL || mid == NULL) return; 	
@@ -934,132 +950,127 @@ public:
 	}
 };
 
-#define HANDLER_CONSTRUCTOR(name) extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1##name##) (JNIEnv *env, jclass that, jint arg0, jstring arg1); \
+#define HANDLER_CONSTRUCTOR(name, type, signature) extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1##name##) (JNIEnv *env, jclass that, jint arg0, jstring arg1); \
 JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1##name##) (JNIEnv *env, jclass that, jint arg0, jstring arg1) { \
 	jint rc = 0; \
 	OS_NATIVE_ENTER(env, that, gcnew_1##name##_FUNC); \
-	rc = (jint)TO_HANDLE(gcnew name (gcnew SWTHandler(env, arg0, arg1, "(II)V"), &SWTHandler::##name##)); \
+	rc = (jint)TO_HANDLE(gcnew type (gcnew SWTHandler(env, arg0, arg1, signature), &SWTHandler::##name##)); \
 	OS_NATIVE_EXIT(env, that, gcnew_1##name##_FUNC); \
 	return rc; \
 } \
 
 #ifndef NO_gcnew_1EventHandler
-HANDLER_CONSTRUCTOR (EventHandler)
+HANDLER_CONSTRUCTOR (EventHandler, EventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1CancelEventHandler
-HANDLER_CONSTRUCTOR (CancelEventHandler)
+HANDLER_CONSTRUCTOR (CancelEventHandler, CancelEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1ExecutedRoutedEventHandler
-HANDLER_CONSTRUCTOR (ExecutedRoutedEventHandler)
+HANDLER_CONSTRUCTOR (ExecutedRoutedEventHandler, ExecutedRoutedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1DispatcherHookEventHandler
-HANDLER_CONSTRUCTOR (DispatcherHookEventHandler)
+HANDLER_CONSTRUCTOR (DispatcherHookEventHandler, DispatcherHookEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1SizeChangedEventHandler
-HANDLER_CONSTRUCTOR (SizeChangedEventHandler)
+HANDLER_CONSTRUCTOR (SizeChangedEventHandler, SizeChangedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1ScrollEventHandler
-HANDLER_CONSTRUCTOR (ScrollEventHandler)
+HANDLER_CONSTRUCTOR (ScrollEventHandler, ScrollEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1SelectionChangedEventHandler
-HANDLER_CONSTRUCTOR (SelectionChangedEventHandler)
+HANDLER_CONSTRUCTOR (SelectionChangedEventHandler, SelectionChangedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1KeyEventHandler
-HANDLER_CONSTRUCTOR (KeyEventHandler)
+HANDLER_CONSTRUCTOR (KeyEventHandler, KeyEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1MouseEventHandler
-HANDLER_CONSTRUCTOR (MouseEventHandler)
+HANDLER_CONSTRUCTOR (MouseEventHandler, MouseEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1MouseButtonEventHandler
-HANDLER_CONSTRUCTOR (MouseButtonEventHandler)
+HANDLER_CONSTRUCTOR (MouseButtonEventHandler, MouseButtonEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1MouseWheelEventHandler
-HANDLER_CONSTRUCTOR (MouseWheelEventHandler)
+HANDLER_CONSTRUCTOR (MouseWheelEventHandler, MouseWheelEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1TextCompositionEventHandler
-HANDLER_CONSTRUCTOR (TextCompositionEventHandler)
+HANDLER_CONSTRUCTOR (TextCompositionEventHandler, TextCompositionEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1TextChangedEventHandler
-HANDLER_CONSTRUCTOR (TextChangedEventHandler)
+HANDLER_CONSTRUCTOR (TextChangedEventHandler, TextChangedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1KeyboardFocusChangedEventHandler
-HANDLER_CONSTRUCTOR (KeyboardFocusChangedEventHandler)
+HANDLER_CONSTRUCTOR (KeyboardFocusChangedEventHandler, KeyboardFocusChangedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1ContextMenuEventHandler
-HANDLER_CONSTRUCTOR (ContextMenuEventHandler)
+HANDLER_CONSTRUCTOR (ContextMenuEventHandler, ContextMenuEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1RoutedEventHandler
-HANDLER_CONSTRUCTOR (RoutedEventHandler)
+HANDLER_CONSTRUCTOR (RoutedEventHandler, RoutedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1DragEventHandler
-HANDLER_CONSTRUCTOR (DragEventHandler)
+HANDLER_CONSTRUCTOR (DragEventHandler, DragEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1GiveFeedbackEventHandler
-HANDLER_CONSTRUCTOR (GiveFeedbackEventHandler)
+HANDLER_CONSTRUCTOR (GiveFeedbackEventHandler, GiveFeedbackEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1QueryContinueDragEventHandler
-HANDLER_CONSTRUCTOR (QueryContinueDragEventHandler)
-#endif
-
-// special cases
-#ifndef NO_gcnew_1TimerHandler
-extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1TimerHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1);
-JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1TimerHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1) {
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, gcnew_1TimerHandler_FUNC);
-	rc = (jint)TO_HANDLE(gcnew EventHandler (gcnew SWTHandler(env, arg0, arg1, "(II)V"), &SWTHandler::TimerHandler));
-	OS_NATIVE_EXIT(env, that, gcnew_1TimerHandler_FUNC);
-	return rc;
-}
+HANDLER_CONSTRUCTOR (QueryContinueDragEventHandler, QueryContinueDragEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1RoutedPropertyChangedEventHandlerObject
-extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1RoutedPropertyChangedEventHandlerObject) (JNIEnv *env, jclass that, jint arg0, jstring arg1);
-JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1RoutedPropertyChangedEventHandlerObject) (JNIEnv *env, jclass that, jint arg0, jstring arg1) {
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, gcnew_1RoutedPropertyChangedEventHandlerObject_FUNC);
-	rc = (jint)TO_HANDLE(gcnew RoutedPropertyChangedEventHandler<Object^>(gcnew SWTHandler(env, arg0, arg1, "(II)V"), &SWTHandler::RoutedPropertyChangedEventHandler));
-	OS_NATIVE_EXIT(env, that, gcnew_1RoutedPropertyChangedEventHandlerObject_FUNC);
-	return rc;
-}
+HANDLER_CONSTRUCTOR (RoutedPropertyChangedEventHandlerObject, RoutedPropertyChangedEventHandler<Object^>, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1RoutedPropertyChangedEventHandler
-extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1RoutedPropertyChangedEventHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1);
-JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1RoutedPropertyChangedEventHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1) {
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, gcnew_1RoutedPropertyChangedEventHandler_FUNC);
-	rc = (jint)TO_HANDLE(gcnew RoutedPropertyChangedEventHandler<double>(gcnew SWTHandler(env, arg0, arg1, "(II)V"), &SWTHandler::RoutedPropertyChangedEventHandler));
-	OS_NATIVE_EXIT(env, that, gcnew_1RoutedPropertyChangedEventHandler_FUNC);
-	return rc;
-}
+HANDLER_CONSTRUCTOR (RoutedPropertyChangedEventHandler, RoutedPropertyChangedEventHandler<double>, "(II)V")
+#endif
+
+#ifndef NO_gcnew_1WebBrowserNavigatingEventHandler
+HANDLER_CONSTRUCTOR (WebBrowserNavigatingEventHandler, System::Windows::Forms::WebBrowserNavigatingEventHandler, "(II)V")
+#endif
+
+#ifndef NO_gcnew_1WebBrowserNavigatedEventHandler
+HANDLER_CONSTRUCTOR (WebBrowserNavigatedEventHandler, System::Windows::Forms::WebBrowserNavigatedEventHandler, "(II)V")
+#endif
+
+#ifndef NO_gcnew_1WebBrowserProgressChangedEventHandler
+HANDLER_CONSTRUCTOR (WebBrowserProgressChangedEventHandler, System::Windows::Forms::WebBrowserProgressChangedEventHandler, "(II)V")
+#endif
+
+#ifndef NO_gcnew_1WebBrowserDocumentCompletedEventHandler
+HANDLER_CONSTRUCTOR (WebBrowserDocumentCompletedEventHandler, System::Windows::Forms::WebBrowserDocumentCompletedEventHandler, "(II)V")
 #endif
 
 #ifndef NO_gcnew_1NoArgsDelegate
-extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1NoArgsDelegate) (JNIEnv *env, jclass that, jint arg0, jstring arg1);
-JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1NoArgsDelegate) (JNIEnv *env, jclass that, jint arg0, jstring arg1) {
+HANDLER_CONSTRUCTOR (NoArgsDelegate, NoArgsDelegate, "()V")
+#endif
+
+// special cases
+#ifndef NO_gcnew_1TimerHandler
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1TimerHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1);
+JNIEXPORT jint JNICALL OS_NATIVE(gcnew_1TimerHandler) (JNIEnv *env, jclass that, jint arg0, jstring arg1) {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, gcnew_1NoArgsDelegate_FUNC);
-	rc = (jint)TO_HANDLE(gcnew NoArgsDelegate(gcnew SWTHandler(env, arg0, arg1, "()V"), &SWTHandler::NoArgsDelegate));
-	OS_NATIVE_EXIT(env, that, gcnew_1NoArgsDelegate_FUNC);
+	OS_NATIVE_ENTER(env, that, gcnew_1TimerHandler_FUNC);
+	rc = (jint)TO_HANDLE(gcnew EventHandler (gcnew SWTHandler(env, arg0, arg1, "(II)V"), &SWTHandler::TimerHandler));
+	OS_NATIVE_EXIT(env, that, gcnew_1TimerHandler_FUNC);
 	return rc;
 }
 #endif
@@ -1277,6 +1288,23 @@ JNIEXPORT jint JNICALL OS_NATIVE(GCHandle_1Alloc) (JNIEnv *env, jclass that, jin
 }
 #endif
 
+#ifndef NO_GCHandle_1ToHandle
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(GCHandle_1ToHandle) (JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(GCHandle_1ToHandle) (JNIEnv *env, jclass that, jint arg0) {
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GCHandle_1ToHandle_FUNC);
+#ifdef GCHANDLE_TABLE	
+	rc = arg0; 
+#else
+	GCHandle gc = GCHandle::FromIntPtr((IntPtr)arg0);
+	rc = TO_HANDLE (gc.Target);
+	gc.Free();
+#endif
+	OS_NATIVE_EXIT(env, that, GCHandle_1ToHandle_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Bitmap_1GetHicon
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Bitmap_1GetHicon)(JNIEnv *env, jclass that, jint arg0);
 JNIEXPORT jint JNICALL OS_NATIVE(Bitmap_1GetHicon)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
index fc3b7e755f..6c5d3f0e4f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1184;
-int OS_nativeFunctionCallCount[1184];
+int OS_nativeFunctionCount = 1218;
+int OS_nativeFunctionCallCount[1218];
 char * OS_nativeFunctionNames[] = {
 	"AccessText_1AccessKey",
 	"AccessText_1Text",
@@ -379,6 +379,7 @@ char * OS_nativeFunctionNames[] = {
 	"GCHandle_1Alloc",
 	"GCHandle_1Dump",
 	"GCHandle_1Free",
+	"GCHandle_1ToHandle",
 	"GeometryCollection_1Add",
 	"GeometryCollection_1Clear",
 	"GeometryCollection_1Count",
@@ -441,6 +442,7 @@ char * OS_nativeFunctionNames[] = {
 	"HeaderedItemsControl_1Header__II",
 	"HeapAlloc",
 	"HeapFree",
+	"HtmlDocument_1InvokeScript",
 	"HwndSource_1Handle",
 	"Hyperlink_1Click",
 	"ICollection_1Count",
@@ -999,6 +1001,31 @@ char * OS_nativeFunctionNames[] = {
 	"Visual_1IsDescendantOf",
 	"Visual_1PointFromScreen",
 	"Visual_1PointToScreen",
+	"WebBrowserDocumentCompletedEventArgs_1Url",
+	"WebBrowserNavigatedEventArgs_1Url",
+	"WebBrowserNavigatingEventArgs_1Url",
+	"WebBrowserProgressChangedEventArgs_1CurrentProgress",
+	"WebBrowserProgressChangedEventArgs_1MaximumProgress",
+	"WebBrowser_1CanGoBack",
+	"WebBrowser_1CanGoForward",
+	"WebBrowser_1Document",
+	"WebBrowser_1DocumentCompleted",
+	"WebBrowser_1DocumentText",
+	"WebBrowser_1DocumentTitle",
+	"WebBrowser_1DocumentTitleChanged",
+	"WebBrowser_1GoBack",
+	"WebBrowser_1GoForward",
+	"WebBrowser_1Navigate",
+	"WebBrowser_1Navigated",
+	"WebBrowser_1Navigating",
+	"WebBrowser_1ProgressChanged",
+	"WebBrowser_1ReadyState",
+	"WebBrowser_1Refresh",
+	"WebBrowser_1ScriptErrorsSuppressed",
+	"WebBrowser_1StatusText",
+	"WebBrowser_1StatusTextChanged",
+	"WebBrowser_1Stop",
+	"WebBrowser_1Url",
 	"WindowCollection_1Count",
 	"WindowCollection_1Current",
 	"WindowCollection_1GetEnumerator",
@@ -1027,6 +1054,7 @@ char * OS_nativeFunctionNames[] = {
 	"Window_1WindowState__I",
 	"Window_1WindowState__II",
 	"Window_1WindowStyle",
+	"WindowsFormsHost_1Child",
 	"WriteableBitmap_1WritePixels",
 	"XamlReader_1Load",
 	"XmlReader_1Create",
@@ -1197,7 +1225,13 @@ char * OS_nativeFunctionNames[] = {
 	"gcnew_1Typeface",
 	"gcnew_1Uri",
 	"gcnew_1UserControl",
+	"gcnew_1WebBrowser",
+	"gcnew_1WebBrowserDocumentCompletedEventHandler",
+	"gcnew_1WebBrowserNavigatedEventHandler",
+	"gcnew_1WebBrowserNavigatingEventHandler",
+	"gcnew_1WebBrowserProgressChangedEventHandler",
 	"gcnew_1Window",
+	"gcnew_1WindowsFormsHost",
 	"gcnew_1WriteableBitmap__I",
 	"gcnew_1WriteableBitmap__IIDDII",
 	"memcpy",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
index e9586e97e7..2bd42e373c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
@@ -387,6 +387,7 @@ typedef enum {
 	GCHandle_1Alloc_FUNC,
 	GCHandle_1Dump_FUNC,
 	GCHandle_1Free_FUNC,
+	GCHandle_1ToHandle_FUNC,
 	GeometryCollection_1Add_FUNC,
 	GeometryCollection_1Clear_FUNC,
 	GeometryCollection_1Count_FUNC,
@@ -449,6 +450,7 @@ typedef enum {
 	HeaderedItemsControl_1Header__II_FUNC,
 	HeapAlloc_FUNC,
 	HeapFree_FUNC,
+	HtmlDocument_1InvokeScript_FUNC,
 	HwndSource_1Handle_FUNC,
 	Hyperlink_1Click_FUNC,
 	ICollection_1Count_FUNC,
@@ -1007,6 +1009,31 @@ typedef enum {
 	Visual_1IsDescendantOf_FUNC,
 	Visual_1PointFromScreen_FUNC,
 	Visual_1PointToScreen_FUNC,
+	WebBrowserDocumentCompletedEventArgs_1Url_FUNC,
+	WebBrowserNavigatedEventArgs_1Url_FUNC,
+	WebBrowserNavigatingEventArgs_1Url_FUNC,
+	WebBrowserProgressChangedEventArgs_1CurrentProgress_FUNC,
+	WebBrowserProgressChangedEventArgs_1MaximumProgress_FUNC,
+	WebBrowser_1CanGoBack_FUNC,
+	WebBrowser_1CanGoForward_FUNC,
+	WebBrowser_1Document_FUNC,
+	WebBrowser_1DocumentCompleted_FUNC,
+	WebBrowser_1DocumentText_FUNC,
+	WebBrowser_1DocumentTitle_FUNC,
+	WebBrowser_1DocumentTitleChanged_FUNC,
+	WebBrowser_1GoBack_FUNC,
+	WebBrowser_1GoForward_FUNC,
+	WebBrowser_1Navigate_FUNC,
+	WebBrowser_1Navigated_FUNC,
+	WebBrowser_1Navigating_FUNC,
+	WebBrowser_1ProgressChanged_FUNC,
+	WebBrowser_1ReadyState_FUNC,
+	WebBrowser_1Refresh_FUNC,
+	WebBrowser_1ScriptErrorsSuppressed_FUNC,
+	WebBrowser_1StatusText_FUNC,
+	WebBrowser_1StatusTextChanged_FUNC,
+	WebBrowser_1Stop_FUNC,
+	WebBrowser_1Url_FUNC,
 	WindowCollection_1Count_FUNC,
 	WindowCollection_1Current_FUNC,
 	WindowCollection_1GetEnumerator_FUNC,
@@ -1035,6 +1062,7 @@ typedef enum {
 	Window_1WindowState__I_FUNC,
 	Window_1WindowState__II_FUNC,
 	Window_1WindowStyle_FUNC,
+	WindowsFormsHost_1Child_FUNC,
 	WriteableBitmap_1WritePixels_FUNC,
 	XamlReader_1Load_FUNC,
 	XmlReader_1Create_FUNC,
@@ -1205,7 +1233,13 @@ typedef enum {
 	gcnew_1Typeface_FUNC,
 	gcnew_1Uri_FUNC,
 	gcnew_1UserControl_FUNC,
+	gcnew_1WebBrowser_FUNC,
+	gcnew_1WebBrowserDocumentCompletedEventHandler_FUNC,
+	gcnew_1WebBrowserNavigatedEventHandler_FUNC,
+	gcnew_1WebBrowserNavigatingEventHandler_FUNC,
+	gcnew_1WebBrowserProgressChangedEventHandler_FUNC,
 	gcnew_1Window_FUNC,
+	gcnew_1WindowsFormsHost_FUNC,
 	gcnew_1WriteableBitmap__I_FUNC,
 	gcnew_1WriteableBitmap__IIDDII_FUNC,
 	memcpy_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
index 4a163dcf14..20646cd80e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
@@ -276,6 +276,13 @@ public class OS extends C {
 	public static final int WindowStyle_ThreeDBorderWindow = 2;
 	public static final int WindowStyle_ToolWindow = 3;
 	
+
+	public static final int WebBrowserReadyState_Uninitialized = 0;
+	public static final int WebBrowserReadyState_Loading = 1;
+	public static final int WebBrowserReadyState_Loaded = 2;
+	public static final int WebBrowserReadyState_Interactive = 3;
+	public static final int WebBrowserReadyState_Complete = 4;
+	
 	public static final int Dock_Top = 1;
 	public static final int Dock_Bottom = 3;
 
@@ -424,6 +431,10 @@ public static final native int gcnew_NoArgsDelegate(int jniRef, String string);
 public static final native int gcnew_GiveFeedbackEventHandler(int jniRef, String string);
 public static final native int gcnew_QueryContinueDragEventHandler(int jniRef, String string);
 public static final native int gcnew_DragEventHandler(int jniRef, String string);
+public static final native int gcnew_WebBrowserNavigatingEventHandler(int jniRef, String string);
+public static final native int gcnew_WebBrowserNavigatedEventHandler(int jniRef, String string);
+public static final native int gcnew_WebBrowserProgressChangedEventHandler(int jniRef, String string);
+public static final native int gcnew_WebBrowserDocumentCompletedEventHandler(int jniRef, String string);
 
 /** JNI natives */
 public static final native int NewGlobalRef(Object object);
@@ -833,10 +844,12 @@ public static final native void GridViewRowPresenterBase_Columns(int sender, int
 public static final native int GCHandle_Alloc(int sender);
 public static final native void GCHandle_Free(int sender);
 public static final native void GCHandle_Dump();
+public static final native int GCHandle_ToHandle(int gchandle);
 public static final native int HeaderedContentControl_Header(int sender);
 public static final native void HeaderedContentControl_Header(int sender, int header);
 public static final native int HeaderedItemsControl_Header(int sender);
-public static final native void HeaderedItemsControl_Header(int sender, int value);
+public static final native void HeaderedItemsControl_Header(int sender, int value);  
+public static final native int HtmlDocument_InvokeScript(int sender, int string);
 public static final native int HwndSource_Handle(int sender);
 public static final native void Hyperlink_Click(int sender, int handler);
 public static final native int ICollection_Count(int sender);
@@ -1383,6 +1396,31 @@ public static final native int Visual_PointFromScreen(int sender, int point);
 public static final native int VisualTreeHelper_GetChild(int sender, int value);
 public static final native int VisualTreeHelper_GetChildrenCount(int sender);
 public static final native int VisualTreeHelper_GetParent(int sender);
+public static final native boolean WebBrowser_CanGoBack(int sender);
+public static final native boolean WebBrowser_CanGoForward(int sender);
+public static final native int WebBrowser_Document(int sender);
+public static final native void WebBrowser_DocumentText(int sender, int string);
+public static final native int WebBrowser_DocumentTitle(int sender);
+public static final native void WebBrowser_DocumentCompleted(int sender, int handler);
+public static final native boolean WebBrowser_GoBack(int sender);
+public static final native boolean WebBrowser_GoForward(int sender);
+public static final native void WebBrowser_Navigating(int sender, int handler);
+public static final native void WebBrowser_Navigated(int sender, int handler);
+public static final native void WebBrowser_Navigate(int sender, int urlString);
+public static final native void WebBrowser_ProgressChanged(int sender, int handler);
+public static final native void WebBrowser_DocumentTitleChanged(int sender, int handler);
+public static final native int WebBrowser_StatusText(int sender);
+public static final native void WebBrowser_StatusTextChanged(int sender, int handler);
+public static final native int WebBrowser_ReadyState(int sender);
+public static final native void WebBrowser_Refresh(int sender);
+public static final native void WebBrowser_Stop(int sender);
+public static final native void WebBrowser_ScriptErrorsSuppressed(int sender, boolean value);
+public static final native int WebBrowser_Url(int sender);
+public static final native int WebBrowserNavigatingEventArgs_Url(int sender);
+public static final native int WebBrowserNavigatedEventArgs_Url(int sender);
+public static final native int WebBrowserDocumentCompletedEventArgs_Url(int sender);
+public static final native long WebBrowserProgressChangedEventArgs_CurrentProgress(int sender);
+public static final native long WebBrowserProgressChangedEventArgs_MaximumProgress(int sender);
 public static final native int WindowCollection_Count(int sender);
 public static final native int WindowCollection_Current(int sender);
 public static final native int WindowCollection_GetEnumerator(int sender);
@@ -1411,6 +1449,7 @@ public static final native void Window_ShowInTaskbar(int sender, boolean value);
 public static final native void Window_ResizeMode(int sender, int value);
 public static final native int Window_Title(int sender);
 public static final native void Window_Title(int sender, int string);
+public static final native void WindowsFormsHost_Child(int sender, int child);
 public static final native void WriteableBitmap_WritePixels(int sender, int sourceRect, byte[] buffer, int bufferSize, int stride);
 
 public static final native int gcnew_AccessText();
@@ -1555,6 +1594,8 @@ public static final native int gcnew_TreeViewItem();
 public static final native int gcnew_Typeface(int fontFamily, int style, int weight, int stretch);
 public static final native int gcnew_UserControl();
 public static final native int gcnew_Uri(int str, int type);
+public static final native int gcnew_WebBrowser();
+public static final native int gcnew_WindowsFormsHost();
 public static final native int gcnew_Window();
 public static final native int gcnew_WriteableBitmap (int source);
 public static final native int gcnew_WriteableBitmap (int pixelWidth, int pixelHeight, double dpiX, double dpiY, int pixelFormat, int palette);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ExpandBar.java
index 4d614d72e1..8b87752dc1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ExpandBar.java
@@ -129,7 +129,7 @@ protected void checkSubclass () {
 
 static int checkStyle (int style) {
 	style &= ~SWT.H_SCROLL;
-	return style | SWT.NO_BACKGROUND;
+	return style;
 }
 
 public Point computeSize (int wHint, int hHint, boolean changed) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ScrollBar.java
index 23ef05ba10..5f9dd8bcea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/ScrollBar.java
@@ -475,7 +475,7 @@ public void removeSelectionListener (SelectionListener listener) {
  */
 public void setEnabled (boolean enabled) {
 	checkWidget();
-	OS.UIElement_IsEnabled (topHandle (), enabled);
+	OS.UIElement_IsEnabled (handle, enabled);
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Shell.java
index 692889843c..1548100499 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Shell.java
@@ -361,6 +361,7 @@ public static Shell wpf_new (Display display, int handle) {
 }
 
 public static Shell internal_new (Display display, int handle) {
+	handle = OS.GCHandle_ToHandle (handle);
 	return new Shell (display, null, SWT.NO_TRIM, handle, false);
 }