diff options
| author | Grant Gayed | 2011-01-10 16:20:04 +0000 |
|---|---|---|
| committer | Grant Gayed | 2011-01-10 16:20:04 +0000 |
| commit | 4caf1852dd3088cebe6e7a8da005244cbde54252 (patch) | |
| tree | 3d29d3a5c9d1b49f44547e54c34947ca8802b305 /bundles/org.eclipse.swt/Eclipse SWT Browser | |
| parent | 957daab4fff642ef4988915d2b86fa448d804063 (diff) | |
| download | eclipse.platform.swt-4caf1852dd3088cebe6e7a8da005244cbde54252.tar.gz eclipse.platform.swt-4caf1852dd3088cebe6e7a8da005244cbde54252.tar.xz eclipse.platform.swt-4caf1852dd3088cebe6e7a8da005244cbde54252.zip | |
handle SWT.WEBKIT style bit
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
4 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/BrowserFactory.java index c10a714ca3..5fcc0b4739 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/BrowserFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/forms/org/eclipse/swt/browser/BrowserFactory.java @@ -15,7 +15,7 @@ import org.eclipse.swt.SWT; class BrowserFactory { WebBrowser createWebBrowser (int style) { - if ((style & SWT.MOZILLA) != 0) return null; + if ((style & (SWT.MOZILLA | SWT.WEBKIT)) != 0) return null; return new IE (); } 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 36983ab66f..5ce4cfbec4 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 @@ -15,7 +15,7 @@ import org.eclipse.swt.SWT; class BrowserFactory { WebBrowser createWebBrowser (int style) { - if ((style & SWT.MOZILLA) != 0 || !WebKit.isInstalled ()) { + if ((style & SWT.MOZILLA) != 0 || (!WebKit.isInstalled () && (style & SWT.WEBKIT) == 0) { return new Mozilla (); } return new WebKit (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/BrowserFactory.java index 356593522b..664587c2fe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/BrowserFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/BrowserFactory.java @@ -15,7 +15,7 @@ import org.eclipse.swt.SWT; class BrowserFactory { WebBrowser createWebBrowser (int style) { - if ((style & SWT.MOZILLA) != 0) return null; + if ((style & (SWT.MOZILLA | SWT.WEBKIT)) != 0) return null; return new Voyager (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/BrowserFactory.java index c10a714ca3..5fcc0b4739 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/BrowserFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/BrowserFactory.java @@ -15,7 +15,7 @@ import org.eclipse.swt.SWT; class BrowserFactory { WebBrowser createWebBrowser (int style) { - if ((style & SWT.MOZILLA) != 0) return null; + if ((style & (SWT.MOZILLA | SWT.WEBKIT)) != 0) return null; return new IE (); } |