diff options
author | Steve Northover <steve> | 2008-03-29 00:27:56 +0000 |
---|---|---|
committer | Steve Northover <steve> | 2008-03-29 00:27:56 +0000 |
commit | 5a9a9e5f9295043ec5974d96cdb97d66f5ec5cf0 (patch) | |
tree | 983cd05744d9cf02ad6b3252735e06208bc7814e /bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt | |
parent | cf63b6ae35c54a787c2798af375e222493b32435 (diff) | |
download | eclipse.platform.swt-5a9a9e5f9295043ec5974d96cdb97d66f5ec5cf0.tar.gz eclipse.platform.swt-5a9a9e5f9295043ec5974d96cdb97d66f5ec5cf0.tar.xz eclipse.platform.swt-5a9a9e5f9295043ec5974d96cdb97d66f5ec5cf0.zip |
more SWT.NO_SCROLL
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Table.java | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Tree.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Table.java index 477479d9f3..6f8d11f61f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Table.java @@ -189,6 +189,10 @@ static int checkStyle (int style) { if ((style & SWT.NO_SCROLL) == 0) { style |= SWT.H_SCROLL | SWT.V_SCROLL; } + } else { + if ((style & SWT.NO_SCROLL) != 0) { + style &= ~(SWT.H_SCROLL | SWT.V_SCROLL); + } } /* WPF is always FULL_SELECTION */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Tree.java index 71f43af3eb..3d64c14992 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/Tree.java @@ -185,6 +185,10 @@ static int checkStyle (int style) { if ((style & SWT.NO_SCROLL) == 0) { style |= SWT.H_SCROLL | SWT.V_SCROLL; } + } else { + if ((style & SWT.NO_SCROLL) != 0) { + style &= ~(SWT.H_SCROLL | SWT.V_SCROLL); + } } /* WPF is always FULL_SELECTION */ |