summaryrefslogtreecommitdiffstats
path: root/bundles
diff options
context:
space:
mode:
authorSteve Northover <steve>2005-04-29 13:15:42 +0000
committerSteve Northover <steve>2005-04-29 13:15:42 +0000
commitf4fbaa8951a60c9cd930352a1efdcfde298e9db9 (patch)
tree6d76c8ff0a25586774e39d7eefb46d1e1dd89dd6 /bundles
parent251573b429c7dd5879fb4172e3933c43addd3b8a (diff)
downloadeclipse.platform.swt-f4fbaa8951a60c9cd930352a1efdcfde298e9db9.tar.gz
eclipse.platform.swt-f4fbaa8951a60c9cd930352a1efdcfde298e9db9.tar.xz
eclipse.platform.swt-f4fbaa8951a60c9cd930352a1efdcfde298e9db9.zip
use CCS_VERT to get fix tall horizontal wrapping separators
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java1
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 2d4973289b..fe7b5951fc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -268,6 +268,7 @@ public class OS extends Platform {
public static final int CCM_SETVERSION = 0x2007;
public static final int CCS_NODIVIDER = 0x40;
public static final int CCS_NORESIZE = 0x4;
+ public static final int CCS_VERT = 0x80;
public static final int CC_ANYCOLOR = 0x100;
public static final int CC_ENABLEHOOK = 0x10;
public static final int CC_RGBINIT = 0x1;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
index a22fe17f42..10c9b33646 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -103,9 +103,14 @@ public ToolBar (Composite parent, int style) {
* clear these bits to avoid scroll bars and then reset
* the bits using the original style supplied by the
* programmer.
+ *
+ * NOTE: The CCS_VERT style cannot be applied when the
+ * widget is created because of this conflict.
*/
if ((style & SWT.VERTICAL) != 0) {
this.style |= SWT.VERTICAL;
+ int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
+ OS.SetWindowLong (handle, OS.GWL_STYLE, bits | OS.CCS_VERT);
} else {
this.style |= SWT.HORIZONTAL;
}