diff options
| author | Eric Williams | 2019-02-27 18:42:45 +0000 |
|---|---|---|
| committer | Eric Williams | 2019-03-11 12:51:19 +0000 |
| commit | b5fb9da32d06cd10c4d1a76aaac00439682396ef (patch) | |
| tree | 4da361276ec7be7d5be798e2cbaf4b42598edd2f | |
| parent | 38233cc8b4b9945e7affab239ee2d77242e77c5f (diff) | |
| download | eclipse.platform.swt-b5fb9da32d06cd10c4d1a76aaac00439682396ef.tar.gz eclipse.platform.swt-b5fb9da32d06cd10c4d1a76aaac00439682396ef.tar.xz eclipse.platform.swt-b5fb9da32d06cd10c4d1a76aaac00439682396ef.zip | |
Bug 543908: [GTK4] Get ControlExample to launch and run on GTK4
Disable Browser loading on GTK4.
Change-Id: I9ebbb35dd3fe6402e4732ad7fb9e123b9fb3b4c6
Signed-off-by: Eric Williams <ericwill@redhat.com>
3 files changed, 8 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java index dc20229953..d344a70817 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java @@ -104,17 +104,18 @@ public Browser (Composite parent, int style) { } dispose (); - String errMsg = " because no underlying browser available.\n"; + String errMsg = " because there is no underlying browser available.\n"; switch (SWT.getPlatform()) { case "gtk": - errMsg = errMsg + " Please ensure Webkit with its Gtk 3.x bindings installed. Webkit2 API level preferred.\n"; + errMsg = errMsg + "Please ensure that WebKit with its GTK 3.x bindings is installed (WebKit2 API level is preferred)." + + " Additionally, please note that GTK4 does not currently have Browser support.\n"; break; case "cocoa": - errMsg = errMsg + " SWT failed to load webkit library.\n"; + errMsg = errMsg + "SWT failed to load the WebKit library.\n"; break; case "win32": - errMsg = errMsg + " SWT uses either IE or Webkit. Either SWT.WEBKIT flag is passed and Webkit library was not " - + "loaded properly by SWT or SWT failed to load IE.\n"; + errMsg = errMsg + "SWT uses either IE or WebKit. Either the SWT.WEBKIT flag is passed and the WebKit library was not " + + "loaded properly by SWT, or SWT failed to load IE.\n"; break; default: break; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java index c48367c1dd..f9a1891dbb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java @@ -19,6 +19,7 @@ class BrowserFactory { WebBrowser createWebBrowser (int style) { if (OS.IsWin32) return null; + if (GTK.GTK4) return null; boolean webkitInstalled = WebKit.IsInstalled (); if (!webkitInstalled) return null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 5cb1b17313..be699439d2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -698,6 +698,7 @@ static Browser FindBrowser (long /*int*/ webView) { } static boolean IsInstalled () { + if (GTK.GTK4) return false; if (!WebKitGTK.LibraryLoaded) return false; // TODO webkit_check_version() should take care of the following, but for some // reason this symbol is missing from the latest build. If it is present in |