Mercurial > projects > dwt-win

diff dwt/widgets/TreeItem.d @ 237:e2affbeb686d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Making tango.sys.win32.Types and dwt.internal.win32.WINTYPES to match common declaration. Make ansi charactars of type ubyte.
author Frank Benoit <benoit@tionex.de>
date Thu, 19 Jun 2008 03:25:36 +0200
parents c749c13479ef
children ecb80b2a89e1
line wrap: on
line diff
--- a/dwt/widgets/TreeItem.d	Sun Jun 08 15:12:40 2008 +0200
+++ b/dwt/widgets/TreeItem.d	Thu Jun 19 03:25:36 2008 +0200
@@ -254,7 +254,7 @@
         tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
         tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
         tvItem.state = 1 << 12;
-        tvItem.hItem = handle;
+        tvItem.hItem = cast(HTREEITEM)handle;
         OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, &tvItem);
     }
     background = foreground = -1;
@@ -440,7 +440,7 @@
     if ((parent.style & DWT.VIRTUAL) is 0 && !cached && !parent.painted) {
         TVITEM tvItem;
         tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
-        tvItem.hItem = handle;
+        tvItem.hItem = cast(HTREEITEM)handle;
         tvItem.pszText = OS.LPSTR_TEXTCALLBACK;
         parent.ignoreCustomDraw = true;
         OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, &tvItem);
@@ -456,7 +456,7 @@
     RECT* rect = new RECT();
     if (firstColumn) {
         bool full = columnCount is 0 && getText && getImage && fullText && fullImage;
-        if (!OS.TreeView_GetItemRect (hwnd, handle, rect, !full)) {
+        if (!OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)handle, rect, !full)) {
             return new RECT();
         }
         if (getImage && !fullImage) {
@@ -492,7 +492,7 @@
         if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, cast(int) headerRect) is 0) {
             return new RECT();
         }
-        if (!OS.TreeView_GetItemRect (hwnd, handle, rect, false)) {
+        if (!OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)handle, rect, false)) {
             return new RECT();
         }
         rect.left = headerRect.left;
@@ -576,7 +576,7 @@
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
     tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
-    tvItem.hItem = handle;
+    tvItem.hItem = cast(HTREEITEM)handle;
     int result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, &tvItem);
     return (result !is 0) && (((tvItem.state >> 12) & 1) is 0);
 }
@@ -720,7 +720,7 @@
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
     tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
-    tvItem.hItem = handle;
+    tvItem.hItem = cast(HTREEITEM)handle;
     int result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, &tvItem);
     return (result !is 0) && ((tvItem.state >> 12) > 2);
 }
@@ -994,7 +994,7 @@
         }
     }
     RECT rect;
-    if (OS.TreeView_GetItemRect (hwnd, handle, &rect, !full)) {
+    if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)handle, &rect, !full)) {
         OS.InvalidateRect (hwnd, &rect, true);
     }
 }
@@ -1046,7 +1046,7 @@
     auto hwnd = parent.handle;
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM;
-    tvItem.hItem = cast(HANDLE) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, cast(int)handle);
+    tvItem.hItem = cast(HTREEITEM) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, cast(int)handle);
     while (tvItem.hItem !is null) {
         OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, cast(int)&tvItem);
         TreeItem item = tvItem.lParam !is -1 ? parent.items [tvItem.lParam] : null;
@@ -1056,7 +1056,7 @@
             parent.releaseItem (tvItem.hItem, &tvItem, false);
             parent.destroyItem (null, tvItem.hItem);
         }
-        tvItem.hItem = cast(HANDLE) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, cast(int)handle);
+        tvItem.hItem = cast(HTREEITEM) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, cast(int)handle);
     }
 }
 
@@ -1155,7 +1155,7 @@
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
     tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
-    tvItem.hItem = handle;
+    tvItem.hItem = cast(HTREEITEM)handle;
     OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, &tvItem);
     int state = tvItem.state >> 12;
     if (checked) {
@@ -1177,7 +1177,7 @@
     if ((parent.style & DWT.VIRTUAL) !is 0) {
         if (parent.currentItem is this && OS.IsWindowVisible (hwnd)) {
             RECT rect;
-            if (OS.TreeView_GetItemRect (hwnd, handle, &rect, false)) {
+            if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)handle, &rect, false)) {
                 OS.InvalidateRect (hwnd, &rect, true);
             }
         }
@@ -1256,7 +1256,7 @@
             int index = 0;
             while (hItem !is null && (noAnimate || hItem !is handle) && index < count) {
                 RECT rect;
-                if (OS.TreeView_GetItemRect (hwnd, hItem, &rect, true)) {
+                if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)hItem, &rect, true)) {
                     rects [index++] = rect;
                 }
                 hItem = cast(HANDLE) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, cast(int) &hItem);
@@ -1306,7 +1306,7 @@
         bool collapsed = false;
         if (!expanded) {
             RECT rect;
-            while (hTopItem !is null && !OS.TreeView_GetItemRect (hwnd, hTopItem, &rect, false)) {
+            while (hTopItem !is null && !OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)hTopItem, &rect, false)) {
                 hTopItem = cast(HANDLE) OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hTopItem);
                 collapsed = true;
             }
@@ -1337,7 +1337,7 @@
                     int index = 0;
                     while (hItem !is null && index < count) {
                         RECT rect;
-                        if (OS.TreeView_GetItemRect (hwnd, hItem, &rect, true)) {
+                        if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)hItem, &rect, true)) {
                             if (!OS.EqualRect (&rect, & rects [index])) {
                                 break;
                             }
@@ -1367,7 +1367,7 @@
                 }
                 if (handle is hBottomItem) {
                     RECT rect;
-                    if (OS.TreeView_GetItemRect (hwnd, hBottomItem, &rect, false)) {
+                    if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)hBottomItem, &rect, false)) {
                         OS.InvalidateRect (hwnd, &rect, true);
                     }
                 }
@@ -1435,7 +1435,7 @@
     auto hwnd = parent.handle;
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
-    tvItem.hItem = handle;
+    tvItem.hItem = cast(HTREEITEM)handle;
     tvItem.pszText = OS.LPSTR_TEXTCALLBACK;
     OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, &tvItem);
 }
@@ -1490,7 +1490,7 @@
         auto hwnd = parent.handle;
         TVITEM tvItem;
         tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
-        tvItem.hItem = handle;
+        tvItem.hItem = cast(HTREEITEM)handle;
         tvItem.pszText = OS.LPSTR_TEXTCALLBACK;
         OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, &tvItem);
     } else {
@@ -1595,7 +1595,7 @@
     TVITEM tvItem;
     tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
     tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
-    tvItem.hItem = handle;
+    tvItem.hItem = cast(HTREEITEM)handle;
     OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, &tvItem);
     int state = tvItem.state >> 12;
     if (grayed) {
@@ -1617,7 +1617,7 @@
     if ((parent.style & DWT.VIRTUAL) !is 0) {
         if (parent.currentItem is this && OS.IsWindowVisible (hwnd)) {
             RECT rect;
-            if (OS.TreeView_GetItemRect (hwnd, handle, &rect, false)) {
+            if (OS.TreeView_GetItemRect (hwnd, cast(HTREEITEM)handle, &rect, false)) {
                 OS.InvalidateRect (hwnd, &rect, true);
             }
         }
@@ -1703,7 +1703,7 @@
         auto hwnd = parent.handle;
         TVITEM tvItem;
         tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_IMAGE | OS.TVIF_SELECTEDIMAGE;
-        tvItem.hItem = handle;
+        tvItem.hItem = cast(HTREEITEM)handle;
         tvItem.iImage = tvItem.iSelectedImage = OS.I_IMAGECALLBACK;
         /*
         * Bug in Windows.  When I_IMAGECALLBACK is used with TVM_SETITEM
@@ -1810,7 +1810,7 @@
         auto hwnd = parent.handle;
         TVITEM tvItem;
         tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
-        tvItem.hItem = handle;
+        tvItem.hItem = cast(HTREEITEM)handle;
         tvItem.pszText = OS.LPSTR_TEXTCALLBACK;
         OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, &tvItem);
     } else {