diff options
| author | Grant Gayed | 2011-01-10 16:27:49 +0000 |
|---|---|---|
| committer | Grant Gayed | 2011-01-10 16:27:49 +0000 |
| commit | 83fe95c428d2d89300a34d85df15e8b1f8311dd7 (patch) | |
| tree | 9fe62c488459542676fa08d563c793bb22340376 /bundles/org.eclipse.swt/Eclipse SWT Browser | |
| parent | 4caf1852dd3088cebe6e7a8da005244cbde54252 (diff) | |
| download | eclipse.platform.swt-83fe95c428d2d89300a34d85df15e8b1f8311dd7.tar.gz eclipse.platform.swt-83fe95c428d2d89300a34d85df15e8b1f8311dd7.tar.xz eclipse.platform.swt-83fe95c428d2d89300a34d85df15e8b1f8311dd7.zip | |
handle SWT.WEBKIT style bit
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java | 8 |
1 files changed, 7 insertions, 1 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 8578a038a5..3c413fd8a8 100755 --- 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 @@ -23,11 +23,14 @@ import org.eclipse.swt.widgets.*; * </p> * <dl> * <dt><b>Styles:</b></dt> - * <dd>MOZILLA</dd> + * <dd>MOZILLA, WEBKIT</dd> * <dt><b>Events:</b></dt> * <dd>CloseWindowListener, LocationListener, OpenWindowListener, ProgressListener, StatusTextListener, TitleListener, VisibilityWindowListener</dd> * </dl> * <p> + * Note: At most one of the styles MOZILLA and WEBKIT may be specified. + * </p> + * <p> * IMPORTANT: This class is <em>not</em> intended to be subclassed. * </p> * @@ -119,6 +122,9 @@ static Composite checkParent (Composite parent) { } static int checkStyle(int style) { + if ((style & (SWT.MOZILLA | SWT.WEBKIT)) == (SWT.MOZILLA | SWT.WEBKIT)) { + style &= ~SWT.WEBKIT; + } String platform = SWT.getPlatform (); if ((style & SWT.MOZILLA) != 0) { if ("carbon".equals (platform)) return style | SWT.EMBEDDED; //$NON-NLS-1$ |