Attachment 9616 Details for Bug 58868 – Patch to implement SWT.MULTI on Win32

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to implement SWT.MULTI on Win32

org.eclipse.swt.patch.txt (text/plain), 3.90 KB, created by Ed Burnette

on 2004-04-16 17:33:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Burnette

Created: 2004-04-16 17:33:18 EDT

Size: 3.90 KB

patch

obsolete

>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java,v
>retrieving revision 1.44
>diff -u -r1.44 TabFolder.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java 24 Mar 2004 16:14:06 -0000 1.44
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java 16 Apr 2004 21:20:45 -0000
>@@ -31,12 +31,14 @@
> * 
> * <dl>
> * <dt>Styles:</dt>
>- * <dd>TOP, BOTTOM</dd>
>+ * <dd>TOP, BOTTOM, SINGLE, MULTI</dd>
> * <dt>Events:</dt>
> * <dd>Selection</dd>
> * </dl>
> * 
> * Note: Only one of the styles TOP and BOTTOM may be specified.
>+ * Only one of the styles SINGLE and MULTI may be specified.
>+ * MULTI (multi-line tabs) is not supported on all platforms so it is just considered a hint.
> * 
> * IMPORTANT: This class is not intended to be subclassed.
> * 
>@@ -160,6 +162,7 @@
> 
> static int checkStyle (int style) {
> style = checkBits (style, SWT.TOP, SWT.BOTTOM, 0, 0, 0, 0);
>+ style = checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
> /*
> * Even though it is legal to create this widget
> * with scroll bars, they serve no useful purpose
>@@ -656,6 +659,7 @@
> int bits = super.widgetStyle () | OS.WS_CLIPCHILDREN;
> if ((style & SWT.NO_FOCUS) != 0) bits |= OS.TCS_FOCUSNEVER;
> if ((style & SWT.BOTTOM) != 0) bits |= OS.TCS_BOTTOM;
>+ if ((style & SWT.MULTI) != 0) bits |= OS.TCS_MULTILINE;
> return bits | OS.TCS_TABS | OS.TCS_TOOLTIPS;
> }
> 
>@@ -782,7 +786,7 @@
> return result;
> }
> int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
>- if ((bits & OS.TCS_MULTILINE) != 0) {
>+ if ((bits & (OS.TCS_MULTILINE | OS.TCS_VERTICAL)) != 0) {
> OS.InvalidateRect (handle, null, true);
> return result;
> }
>Index: Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java,v
>retrieving revision 1.141
>diff -u -r1.141 OS.java
>--- Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java 8 Apr 2004 21:14:48 -0000 1.141
>+++ Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java 16 Apr 2004 21:20:55 -0000
>@@ -1070,11 +1070,26 @@
> public static final int TCM_SETITEM = IsUnicode ? 0x133d : 0x1306;
> public static final int TCN_SELCHANGE = 0xfffffdd9;
> public static final int TCN_SELCHANGING = 0xfffffdd8;
>- public static final int TCS_BOTTOM = 0x0002;
>- public static final int TCS_FOCUSNEVER = 0x8000;
>- public static final int TCS_MULTILINE = 0x200;
>+ public static final int TCS_SCROLLOPPOSITE = 0x1; // assumes multiline tab
>+ public static final int TCS_BOTTOM = 0x2;
>+ public static final int TCS_RIGHT = 0x2;
>+ public static final int TCS_MULTISELECT = 0x4; // allow multi-select in button mode
>+ public static final int TCS_FLATBUTTONS = 0x8;
>+ public static final int TCS_FORCEICONLEFT = 0x10;
>+ public static final int TCS_FORCELABELLEFT = 0x20;
>+ public static final int TCS_HOTTRACK = 0x40;
>+ public static final int TCS_VERTICAL = 0x80;
> public static final int TCS_TABS = 0x0;
>+ public static final int TCS_BUTTONS = 0x100;
>+ public static final int TCS_SINGLELINE = 0x0;
>+ public static final int TCS_MULTILINE = 0x200;
>+ public static final int TCS_RIGHTJUSTIFY = 0x0;
>+ public static final int TCS_FIXEDWIDTH = 0x400;
>+ public static final int TCS_RAGGEDRIGHT = 0x800;
>+ public static final int TCS_FOCUSONBUTTONDOWN = 0x1000;
>+ public static final int TCS_OWNERDRAWFIXED = 0x2000;
> public static final int TCS_TOOLTIPS = 0x4000;
>+ public static final int TCS_FOCUSNEVER = 0x8000;
> public static final int TME_HOVER = 0x1;
> public static final int TME_LEAVE = 0x2;
> public static final int TME_QUERY = 0x40000000;

Actions: View | Diff

Attachments on bug 58868: 9610 | 9612 | 9613 | 9616 | 9617