Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java53
1 files changed, 35 insertions, 18 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index b92d9ad6cb..16a13846c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -4605,7 +4605,7 @@ void setCheckboxImageList () {
OS.FillRect (memDC, rect, hBrush);
OS.DeleteObject (hBrush);
long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ());
- TEXTMETRIC tm = new TEXTMETRIC ();
+ TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
OS.GetTextMetrics (hDC, tm);
OS.SelectObject (hDC, oldFont);
int itemWidth = Math.min (tm.tmHeight, width);
@@ -5757,7 +5757,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /
switch (hdr.code) {
case OS.TTN_SHOW:
case OS.TTN_POP:
- case OS.TTN_GETDISPINFO:
+ case OS.TTN_GETDISPINFOA:
+ case OS.TTN_GETDISPINFOW:
return OS.SendMessage (handle, msg, wParam, lParam);
}
break;
@@ -7223,7 +7224,8 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
@Override
LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
- case OS.TVN_GETDISPINFO: {
+ case OS.TVN_GETDISPINFOA:
+ case OS.TVN_GETDISPINFOW: {
NMTVDISPINFO lptvdi = new NMTVDISPINFO ();
OS.MoveMemory (lptvdi, lParam, NMTVDISPINFO.sizeof);
if ((style & SWT.VIRTUAL) != 0) {
@@ -7409,7 +7411,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
* changing on all but the item that is supposed to be
* selected.
*/
- case OS.TVN_ITEMCHANGING: {
+ case OS.TVN_ITEMCHANGINGA:
+ case OS.TVN_ITEMCHANGINGW: {
if ((style & SWT.MULTI) != 0) {
if (hSelect != 0) {
NMTVITEMCHANGE pnm = new NMTVITEMCHANGE ();
@@ -7420,7 +7423,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.TVN_SELCHANGING: {
+ case OS.TVN_SELCHANGINGA:
+ case OS.TVN_SELCHANGINGW: {
if ((style & SWT.MULTI) != 0) {
if (lockSelection) {
/* Save the old selection state for both items */
@@ -7438,7 +7442,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.TVN_SELCHANGED: {
+ case OS.TVN_SELCHANGEDA:
+ case OS.TVN_SELCHANGEDW: {
NMTREEVIEW treeView = null;
if ((style & SWT.MULTI) != 0) {
if (lockSelection) {
@@ -7481,7 +7486,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
updateScrollBar ();
break;
}
- case OS.TVN_ITEMEXPANDING: {
+ case OS.TVN_ITEMEXPANDINGA:
+ case OS.TVN_ITEMEXPANDINGW: {
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
boolean runExpanded = false;
if ((style & SWT.VIRTUAL) != 0) style &= ~SWT.DOUBLE_BUFFERED;
@@ -7547,7 +7553,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (!runExpanded) break;
//FALL THROUGH
}
- case OS.TVN_ITEMEXPANDED: {
+ case OS.TVN_ITEMEXPANDEDA:
+ case OS.TVN_ITEMEXPANDEDW: {
if ((style & SWT.VIRTUAL) != 0) style |= SWT.DOUBLE_BUFFERED;
if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) style |= SWT.DOUBLE_BUFFERED;
if (findImageControl () != null && getDrawing () /*&& OS.IsWindowVisible (handle)*/) {
@@ -7588,10 +7595,12 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
updateScrollBar ();
break;
}
- case OS.TVN_BEGINDRAG:
+ case OS.TVN_BEGINDRAGA:
+ case OS.TVN_BEGINDRAGW:
if (OS.GetKeyState (OS.VK_LBUTTON) >= 0) break;
//FALL THROUGH
- case OS.TVN_BEGINRDRAG: {
+ case OS.TVN_BEGINRDRAGA:
+ case OS.TVN_BEGINRDRAGW: {
dragStarted = true;
NMTREEVIEW treeView = new NMTREEVIEW ();
OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof);
@@ -7625,8 +7634,10 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
* both.
*/
switch (hdr.code) {
- case OS.HDN_BEGINTRACK:
- case OS.HDN_DIVIDERDBLCLICK: {
+ case OS.HDN_BEGINTRACKW:
+ case OS.HDN_BEGINTRACKA:
+ case OS.HDN_DIVIDERDBLCLICKW:
+ case OS.HDN_DIVIDERDBLCLICKA: {
NMHEADER phdn = new NMHEADER ();
OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
TreeColumn column = columns [phdn.iItem];
@@ -7634,8 +7645,10 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
return LRESULT.ONE;
}
ignoreColumnMove = true;
- if (hdr.code == OS.HDN_DIVIDERDBLCLICK) {
- if (column != null) column.pack ();
+ switch (hdr.code) {
+ case OS.HDN_DIVIDERDBLCLICKW:
+ case OS.HDN_DIVIDERDBLCLICKA:
+ if (column != null) column.pack ();
}
break;
}
@@ -7841,7 +7854,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.HDN_ITEMCHANGING: {
+ case OS.HDN_ITEMCHANGINGW:
+ case OS.HDN_ITEMCHANGINGA: {
NMHEADER phdn = new NMHEADER ();
OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
if (phdn.pitem != 0) {
@@ -7879,7 +7893,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.HDN_ITEMCHANGED: {
+ case OS.HDN_ITEMCHANGEDW:
+ case OS.HDN_ITEMCHANGEDA: {
NMHEADER phdn = new NMHEADER ();
OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
if (phdn.pitem != 0) {
@@ -7914,7 +7929,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.HDN_ITEMCLICK: {
+ case OS.HDN_ITEMCLICKW:
+ case OS.HDN_ITEMCLICKA: {
NMHEADER phdn = new NMHEADER ();
OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
TreeColumn column = columns [phdn.iItem];
@@ -7923,7 +7939,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
}
break;
}
- case OS.HDN_ITEMDBLCLICK: {
+ case OS.HDN_ITEMDBLCLICKW:
+ case OS.HDN_ITEMDBLCLICKA: {
NMHEADER phdn = new NMHEADER ();
OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
TreeColumn column = columns [phdn.iItem];

Back to the top