Changeset 4006 for trunk/src/comctl32/treeview.cpp

Timestamp:

Aug 13, 2000, 7:12:40 PM (25 years ago)

Author:

cbratschi

Message:

Corel WINE 20000807 changes

File:

• trunk/src/comctl32/treeview.cpp (modified) (58 diffs)

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.16 2000-08-08 17:05:02 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.17 2000-08-13 17:12:40 cbratschi Exp $ */
 /* Treeview control
  *
@@ -10 +10 @@
  * Note that TREEVIEW_INFO * and HTREEITEM are the same thing.
  *
+ * Note2: All items always! have valid (allocated) pszText field.
+ *      If item's text == LPSTR_TEXTCALLBACKA/W we allocate buffer
+ *      of size TEXT_CALLBACK_SIZE in DoSetItem.
+ *      We use callbackMask to keep track of fields to be updated.
+ *
  *
  * Status: complete (many things untested)
@@ -17 +22 @@
 /*
  Most identical with:
- - Corel 20000212 level
+ - Corel 20000807 level
  - (WINE 991212 level)
 */
@@ -71 +76 @@
 #define MINIMUM_INDENT 19
 
-#define IDT_CHECK        401 //CB: remove later
-
 #define CALLBACK_MASK_ALL (TVIF_TEXT|TVIF_CHILDREN|TVIF_IMAGE|TVIF_SELECTEDIMAGE)
 
-#define STATEIMAGEINDEX(x) (((x) >> 12) & 0x0f)
+#define STATEIMAGEINDEX(x)   (((x) >> 12) & 0x0f)
 #define OVERLAYIMAGEINDEX(x) (((x) >> 8) & 0x0f)
+#define ISVISIBLE(x)         ((x)->displayed)
+#define INCLIENT(x)          ((x)->inclient)
 
 typedef VOID (*TREEVIEW_ItemEnumFunc)(TREEVIEW_INFO *, TREEVIEW_ITEM *,LPVOID);
@@ -87 +92 @@
 static VOID    TREEVIEW_HideInfoTip(TREEVIEW_INFO *infoPtr);
 static LRESULT TREEVIEW_DoSelectItem(TREEVIEW_INFO *, INT, HTREEITEM, INT);
-static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *, HTREEITEM);
+static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *,HTREEITEM,BOOL);
 static LRESULT TREEVIEW_RButtonUp(TREEVIEW_INFO *, LPPOINT);
 static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel);
-static VOID    TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr, BOOL);
 static VOID    TREEVIEW_CheckInfoTip(TREEVIEW_INFO *infoPtr);
 static VOID    TREEVIEW_ISearch(TREEVIEW_INFO *infoPtr,CHAR ch);
@@ -168 +172 @@
     if (item->pszText == LPSTR_TEXTCALLBACKW) return (WCHAR*)L"<callback>";
     if (item->pszText == NULL) return (WCHAR*)L"<null>";
-    /* It would be nice to check item->callbackMask & TVIF_TEXT here,
-     * and indicate that this is a callback string, but there is nowhere
-     * to put that indication. (Or we could be clever, and put it before
-     * pszText, but that is just too hacky.) */
+
     return item->pszText;
 }
@@ -197 +198 @@
 TREEVIEW_GetLastListItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem)
 {
-    /*
-     * Get this item's last sibling
-     */
-    while (wineItem->nextSibling)
-        wineItem = wineItem->nextSibling;
-
-    /*
-     * If the last sibling has expanded children, restart.
-     */
-    if ((wineItem->state & TVIS_EXPANDED) && wineItem->firstChild != NULL)
-    {
-        return TREEVIEW_GetLastListItem(infoPtr, wineItem->firstChild);
-    }
+    if (!wineItem)
+       return NULL;
+
+    while (wineItem->lastChild)
+    {
+       if (wineItem->state & TVIS_EXPANDED)
+          wineItem = wineItem->lastChild;
+       else
+          break;
+    }
+
+    if (wineItem == infoPtr->root)
+        return NULL;
 
     return wineItem;
@@ -223 +224 @@
     if (tvItem->prevSibling)
     {
-        /*
-         * This item has a prevSibling, get the last item.  Since
-         * GetLastListItem first looks at siblings, we must feed it with the
-         * first child.
-         */
+        /* This item has a prevSibling, get the last item in the sibling's tree. */
         TREEVIEW_ITEM *upItem = tvItem->prevSibling;
 
-        if ((upItem->state & TVIS_EXPANDED) && upItem->firstChild != NULL)
-            return TREEVIEW_GetLastListItem(infoPtr, upItem->firstChild);
+        if ((upItem->state & TVIS_EXPANDED) && upItem->lastChild != NULL)
+            return TREEVIEW_GetLastListItem(infoPtr, upItem->lastChild);
         else
             return upItem;
@@ -237 +234 @@
     else
     {
-        /*
-         * this item does not have a prevSibling, get the parent
-         */
+        /* this item does not have a prevSibling, get the parent */
         return (tvItem->parent != infoPtr->root) ? tvItem->parent : NULL;
     }
@@ -252 +247 @@
 TREEVIEW_GetNextListItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *tvItem)
 {
-    assert(infoPtr != NULL);
     assert(tvItem != NULL);
 
@@ -445 +439 @@
 
 /* FIXME: need to find out when the flags in uItemState need to be set */
+
 static BOOL
 TREEVIEW_SendCustomDrawItemNotify(TREEVIEW_INFO *infoPtr,HDC hdc,TREEVIEW_ITEM *wineItem,UINT uItemDrawState)
@@ -457 +452 @@
   dwItemSpec = (DWORD)wineItem;
   uItemState = 0;
-  if (wineItem == infoPtr->selectedItem)
+  if (wineItem->state & TVIS_SELECTED)
   {
     uItemState |= CDIS_SELECTED;
     if (GetFocus() == infoPtr->hwnd) uItemState |= CDIS_FOCUS;
   }
-  if (wineItem == infoPtr->focusItem)
+  if (wineItem == infoPtr->selectedItem)
     uItemState |= CDIS_FOCUS;
   if (wineItem == infoPtr->hotItem)
@@ -487 +482 @@
 
 static void
-TREEVIEW_GetDispInfo(TREEVIEW_INFO *infoPtr,TREEVIEW_ITEM *wineItem,NMTVDISPINFOW* info,UINT mask)
-{
-  info->item.mask = mask;
-  info->item.hItem = wineItem;
-  info->item.state = wineItem->state;
-  info->item.stateMask = 0;
-  info->item.lParam = wineItem->lParam;
-
-  sendNotify(infoPtr->hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&info->hdr);
-}
-
-static void
 TREEVIEW_UpdateDispInfo(TREEVIEW_INFO *infoPtr,TREEVIEW_ITEM *wineItem,UINT mask)
 {
@@ -507 +490 @@
   if (mask == 0) return;
 
-  if ((mask & TVIF_TEXT) /*&& (wineItem->cchTextMax < TEXT_CALLBACK_SIZE)*/)
-  {
-    wineItem->pszText = (WCHAR*)COMCTL32_ReAlloc(wineItem->pszText,TEXT_CALLBACK_SIZE*sizeof(WCHAR));
-    wineItem->cchTextMax = TEXT_CALLBACK_SIZE;
-  }
+  /* 'state' always contains valid value, as well as 'lParam'.
+   * All other parameters are uninitialized.
+   */
 
   callback.item.pszText         = wineItem->pszText;
   callback.item.cchTextMax      = wineItem->cchTextMax;
+  callback.item.mask            = mask;
+  callback.item.hItem           = wineItem;
+  callback.item.state           = wineItem->state;
+  callback.item.lParam = wineItem->lParam;
+
+  /*
+  callback.item.stateMask       = 0;
   callback.item.iImage          = wineItem->iImage;
   callback.item.iSelectedImage  = wineItem->iSelectedImage;
   callback.item.cChildren       = wineItem->cChildren;
-
-  TREEVIEW_GetDispInfo(infoPtr,wineItem,&callback,mask);
+  */
+
+  sendNotify(infoPtr->hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&callback.hdr);
 
   /* It may have changed due to a call to SetItem. */
@@ -543 +532 @@
       newText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
       lstrcpyAtoW(newText,(LPSTR)callback.item.pszText);
-      COMCTL32_Free(wineItem->pszText);
+      if (wineItem->pszText) COMCTL32_Free(wineItem->pszText);
       wineItem->pszText = newText;
       wineItem->cchTextMax = len;
@@ -595 +584 @@
 {
     HDC hdc;
-    HFONT hOldFont;
+    HFONT hOldFont = 0;
     RECT rect;
 
@@ -869 +858 @@
         newItem->prevSibling = sibling->prevSibling;
         sibling->prevSibling = newItem;
-    }
+    } else newItem->prevSibling = NULL;
 
     newItem->nextSibling = sibling;
 
     if (parent->firstChild == sibling)
-    {
-        newItem->nextSibling = parent->firstChild;
         parent->firstChild = newItem;
-    }
 
     if (parent->lastChild == NULL)
@@ -903 +889 @@
         newItem->nextSibling = sibling->nextSibling;
         sibling->nextSibling = newItem;
-    }
+    } else newItem->nextSibling = NULL;
 
     newItem->prevSibling = sibling;
 
     if (parent->lastChild == sibling)
-    {
-        newItem->prevSibling = parent->lastChild;
         parent->lastChild = newItem;
-    }
 
     if (parent->firstChild == NULL)
@@ -1015 +998 @@
     wineItem->iSelectedImage = tvItem->iSelectedImage;
 
-    if (wineItem->iImage == I_IMAGECALLBACK)
+    if (wineItem->iSelectedImage == I_IMAGECALLBACK)
       callbackSet |= TVIF_SELECTEDIMAGE;
     else
@@ -1059 +1042 @@
   INT x;
   TREEVIEW_ITEM *newItem, *parentItem;
+  BOOL bTextUpdated = FALSE;
 
   if (!ptdi) return NULL;
@@ -1131 +1115 @@
     aChild = parentItem->firstChild;
 
+    bTextUpdated = TRUE;
     TREEVIEW_UpdateDispInfo(infoPtr, newItem, TVIF_TEXT);
 
@@ -1150 +1135 @@
       {
         previousChild = aChild;
-        aChild = (aChild->nextSibling == 0)     /* This will help us to exit   */
-                  ? NULL        /* if there is no more sibling */
+
+         /* This will help us to exit if there is no more sibling */
+        aChild = (aChild->nextSibling == 0)
+                  ? NULL
                   : aChild->nextSibling;
 
@@ -1254 +1241 @@
 TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem)
 {
-    TREEVIEW_ITEM *newFirstVisible;
-
     //TRACE("%p, (%s)\n", wineItem, TREEVIEW_ItemName(wineItem));
 
@@ -1295 +1280 @@
     TREEVIEW_ITEM *oldSelection = infoPtr->selectedItem;
     TREEVIEW_ITEM *newSelection = NULL;
+    TREEVIEW_ITEM *newFirstVisible = NULL;
+    TREEVIEW_ITEM *parent, *prev = NULL;
+    BOOL visible = FALSE;
 
     if (lParam == (LPARAM)TVI_ROOT)
     {
+        parent = infoPtr->root;
         newSelection = NULL;
+        visible = TRUE;
         TREEVIEW_RemoveTree(infoPtr);
     }
@@ -1309 +1299 @@
 
         //TRACE("%p (%s)\n", wineItem, TREEVIEW_ItemName(wineItem));
+        parent = wineItem->parent;
+
+        if (ISVISIBLE(wineItem))
+        {
+            prev = TREEVIEW_GetPrevListItem(infoPtr, wineItem);
+            visible = TRUE;
+        }
 
         if (infoPtr->selectedItem != NULL
@@ -1320 +1317 @@
         }
 
+        if (infoPtr->firstVisible == wineItem)
+        {
+            if (wineItem->nextSibling)
+               newFirstVisible = wineItem->nextSibling;
+            else if (wineItem->prevSibling)
+               newFirstVisible = wineItem->prevSibling;
+            else if (wineItem->parent != infoPtr->root)
+               newFirstVisible = wineItem->parent;
+        }
+        else
+            newFirstVisible = infoPtr->firstVisible;
+
         TREEVIEW_RemoveItem(infoPtr, wineItem);
     }
 
     /* Don't change if somebody else already has. */
-    if (oldSelection == infoPtr->selectedItem
-        && TREEVIEW_ValidItem(infoPtr, newSelection))
-    {
+    if (oldSelection == infoPtr->selectedItem)
+    {
+      if (TREEVIEW_ValidItem(infoPtr, newSelection))
         TREEVIEW_DoSelectItem(infoPtr, TVGN_CARET, newSelection, TVC_UNKNOWN);
-    }
+      else
+        infoPtr->selectedItem = 0;
+    }
+
+    /* Validate insertMark dropItem.
+     * hotItem ??? - used for comparision only.
+     */
+    if (!TREEVIEW_ValidItem(infoPtr, infoPtr->insertMarkItem))
+        infoPtr->insertMarkItem = 0;
+
+    if (!TREEVIEW_ValidItem(infoPtr, infoPtr->dropItem))
+        infoPtr->dropItem = 0;
+
+    if (!TREEVIEW_ValidItem(infoPtr, newFirstVisible))
+        newFirstVisible = infoPtr->root->firstChild;
 
     TREEVIEW_VerifyTree(infoPtr);
 
-    TREEVIEW_QueueRefresh(infoPtr);
+    if (visible)
+      TREEVIEW_QueueRefresh(infoPtr);
+    else if (INCLIENT(parent) && !TREEVIEW_HasChildren(infoPtr,parent))
+      TREEVIEW_RefreshItem(infoPtr,parent,TVIF_CHILDREN);
 
     return TRUE;
@@ -1420 +1446 @@
     HIMAGELIST himlNew = (HIMAGELIST)lParam;
     HIMAGELIST himlOld = 0;
+    int oldWidth  = infoPtr->normalImageWidth;
+    int oldHeight = infoPtr->normalImageHeight;
 
     switch (wParam)
@@ -1454 +1482 @@
     }
 
-    infoPtr->uInternalStatus |= TV_CALCALL;
+    if ((oldWidth != infoPtr->normalImageWidth) || (oldHeight != infoPtr->normalImageHeight))
+      infoPtr->uInternalStatus |= TV_CALCALL;
     TREEVIEW_QueueRefresh(infoPtr);
 
@@ -1526 +1555 @@
 TREEVIEW_SetFont(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
+  UINT uHeight = infoPtr->uItemHeight;
+
   infoPtr->hFont = wParam ? (HFONT)wParam : GetStockObject(SYSTEM_FONT);
 
@@ -1532 +1563 @@
 
   if (!infoPtr->bHeightSet)
-      infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr);
+    infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr);
 
   SendMessageA(infoPtr->hwndToolTip,WM_SETFONT,infoPtr->hFont,1);
-  infoPtr->uInternalStatus |= TV_CALCALL;
-  TREEVIEW_CalcItems(infoPtr);
+
+  if (uHeight != infoPtr->uItemHeight)
+  {
+    infoPtr->uInternalStatus |= TV_CALCALL;
+    TREEVIEW_CalcItems(infoPtr);
+  }
 
   if (lParam)
@@ -1646 +1681 @@
 {
     TREEVIEW_ITEM *wineItem;
-    const HTREEITEM *pItem = (HTREEITEM *)lParam;
+    const HTREEITEM *pItem = (HTREEITEM*)lParam;
     LPRECT lpRect = (LPRECT)lParam;
 
@@ -1652 +1687 @@
      * validate parameters
      */
-    if ((pItem == NULL) || (lpRect == NULL))
+    if (pItem == NULL)
         return FALSE;
 
@@ -1821 +1856 @@
         retval = infoPtr->dropItem;
         break;
+
+      case TVGN_LASTVISIBLE:
+        retval = TREEVIEW_GetLastListItem(infoPtr,infoPtr->root);
+        break;
     }
 
@@ -1848 +1887 @@
       case TVGN_CHILD:
         retval = wineItem->firstChild;
-        break;
-
-      case TVGN_LASTVISIBLE:
-        retval = TREEVIEW_GetLastListItem(infoPtr, wineItem);
         break;
 
@@ -1981 +2016 @@
             LONG plussize = (rectsize + 1) * 3 / 4;
 
-            HPEN hNewPen = CreatePen(PS_SOLID, 0, infoPtr->clrLine);
-            HPEN hOldPen = SelectObject(hdc, hNewPen);
+            HPEN hNewPen  = CreatePen(PS_SOLID, 0, infoPtr->clrLine);
+            HPEN hOldPen  = SelectObject(hdc, hNewPen);
+            HBRUSH hbr    = CreateSolidBrush(infoPtr->clrBk);
+            HBRUSH hbrOld = SelectObject(hdc, hbr);
 
             Rectangle(hdc, centerx - rectsize, centery - rectsize,
                       centerx + rectsize + 1, centery + rectsize + 1);
+
+            SelectObject(hdc, hbrOld);
+            DeleteObject(hbr);
 
             SelectObject(hdc, hOldPen);
@@ -2071 +2111 @@
         if (infoPtr->himlState && imageIndex)
         {
-            ImageList_Draw(infoPtr->himlState, imageIndex - 1, hdc,
+            ImageList_Draw(infoPtr->himlState, imageIndex, hdc,
                            wineItem->stateOffset,
                            centery - infoPtr->stateImageHeight / 2,
@@ -2169 +2209 @@
 
             /* Draw the box arround the selected item */
-            if ((wineItem->state & TVIS_SELECTED) && inFocus)
+            if ((wineItem == infoPtr->selectedItem) && inFocus)
             {
                 HPEN hNewPen = CreatePen(PS_DOT, 0,
@@ -2483 +2523 @@
     if (pSort)
     {
-        pfnCompare = TREEVIEW_CallBackCompare;
+        pfnCompare = (PFNDPACOMPARE)TREEVIEW_CallBackCompare;
         lpCompare = (LPARAM)pSort;
     }
     else
     {
-        pfnCompare = TREEVIEW_SortOnName;
+        pfnCompare = (PFNDPACOMPARE)TREEVIEW_SortOnName;
         lpCompare = (LPARAM)infoPtr;
     }
@@ -2651 +2691 @@
         infoPtr->selectedItem = wineItem;
 
-        TREEVIEW_EnsureVisible(infoPtr, wineItem);
+        TREEVIEW_EnsureVisible(infoPtr,wineItem,TRUE);
     }
 
@@ -2689 +2729 @@
         }
 
+        TREEVIEW_SendExpanded(infoPtr, wineItem, TVE_EXPAND);
+
         wineItem->state |= TVIS_EXPANDEDONCE;
-
-        TREEVIEW_SendExpanded(infoPtr, wineItem, TVE_EXPAND);
-
-        //TRACE("  TVN_ITEMEXPANDED sent...\n");
     }
     else
@@ -2813 +2851 @@
     TREEVIEW_ITEM *wineItem;
     RECT rect;
-    UINT status, x, y;
+    UINT status;
+    LONG x, y;
 
     if (!lpht) return 0;
@@ -3045 +3084 @@
   /* Make shure that edit item is selected */
 
-  TREEVIEW_DoSelectItem ( infoPtr, TVGN_CARET, hItem, TVC_UNKNOWN);
+  TREEVIEW_DoSelectItem(infoPtr,TVGN_CARET,hItem,TVC_UNKNOWN);
+  TREEVIEW_EnsureVisible(infoPtr,hItem,TRUE);
 
   TREEVIEW_UpdateDispInfo(infoPtr, editItem, TVIF_TEXT);
@@ -3279 +3319 @@
             if (msg.message == WM_MOUSEMOVE)
             {
-                pt.x = (INT)LOWORD(msg.lParam);
-                pt.y = (INT)HIWORD(msg.lParam);
+                pt.x = (LONG)(INT16)LOWORD(msg.lParam);
+                pt.y = (LONG)(INT16)HIWORD(msg.lParam);
                 if (PtInRect(&r, pt))
                     continue;
@@ -3314 +3354 @@
   TV_HITTESTINFO hit;
 
-  hit.pt.x = (INT)LOWORD(lParam);
-  hit.pt.y = (INT)HIWORD(lParam);
+  hit.pt.x = (LONG)(INT16)LOWORD(lParam);
+  hit.pt.y = (LONG)(INT16)HIWORD(lParam);
+
   SetFocus (infoPtr->hwnd);
 
@@ -3357 +3398 @@
       case TVHT_ONITEMLABEL:
       case TVHT_ONITEMICON:
-      case TVHT_ONITEMSTATEICON:
       case TVHT_ONITEMBUTTON:
         TREEVIEW_Toggle(infoPtr, wineItem, TRUE);
+        break;
+
+      case TVHT_ONITEMSTATEICON:
+        if (infoPtr->dwStyle & TVS_CHECKBOXES)
+          TREEVIEW_ToggleItemState(infoPtr, wineItem);
+        else
+          TREEVIEW_Toggle(infoPtr, wineItem, TRUE);
         break;
     }
@@ -3384 +3431 @@
   }
 
-  ht.pt.x = (INT)LOWORD(lParam);
-  ht.pt.y = (INT)HIWORD(lParam);
+  ht.pt.x = (LONG)(INT16)LOWORD(lParam);
+  ht.pt.y = (LONG)(INT16)HIWORD(lParam);
 
   TREEVIEW_HitTest(infoPtr,&ht,FALSE);
@@ -3454 +3501 @@
    }
 
-   ht.pt.x = (INT)LOWORD(lParam);
-   ht.pt.y = (INT)HIWORD(lParam);
+   ht.pt.x = (LONG)(INT16)LOWORD(lParam);
+   ht.pt.y = (LONG)(INT16)HIWORD(lParam);
 
    TREEVIEW_HitTest(infoPtr,&ht,FALSE);
@@ -3589 +3636 @@
                                       prevSelect,
                                       newSelect))
-        return FALSE;       /* FIXME: OK? */
+        return FALSE;
 
       if (prevSelect)
@@ -3617 +3664 @@
 
       TREEVIEW_UnqueueRefresh(infoPtr,TRUE,TRUE);
-      TREEVIEW_EnsureVisible(infoPtr,infoPtr->selectedItem);
+      TREEVIEW_EnsureVisible(infoPtr,infoPtr->selectedItem,FALSE);
       if (infoPtr->dwStyle & TVS_FULLROWSELECT)
       {
@@ -3775 +3822 @@
 /* Scrolling ************************************************************/
 
-static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr,HTREEITEM item)
+static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr,HTREEITEM item,BOOL bHScroll)
 {
   RECT rect;
-  INT scrollY;
+  INT scrollY = 0,scrollX = 0;
 
   if (!item) return FALSE;
@@ -3807 +3854 @@
     mod = scrollY % infoPtr->uItemHeight;
     if (mod) scrollY += infoPtr->uItemHeight-mod;
-  } else return FALSE;
-
-  if (scrollY != 0)
+  }
+
+  if (bHScroll)
+  {
+    if (!item->calculated) TREEVIEW_CalcItem(infoPtr,item,0);
+
+    if (item->textOffset < rect.left)
+      scrollX = item->textOffset-rect.left;
+    else if (item->textOffset+item->textWidth > rect.right)
+    {
+      scrollX = item->textOffset+item->textWidth-rect.right;
+      if (scrollX > item->textOffset-rect.left) scrollX = item->textOffset-rect.left;
+    }
+  }
+
+  if ((scrollY != 0) || (scrollX != 0))
   {
     infoPtr->lefttop.y += scrollY;
+    infoPtr->lefttop.x += scrollX;
     TREEVIEW_CalcItems(infoPtr);
-    ScrollWindowEx(infoPtr->hwnd,0,-scrollY,NULL,NULL,0,NULL,SW_INVALIDATE | SW_SCROLLCHILDREN | (infoPtr->uScrollTime << 16));
+    ScrollWindowEx(infoPtr->hwnd,-scrollX,-scrollY,NULL,NULL,0,NULL,SW_INVALIDATE | SW_SCROLLCHILDREN | (infoPtr->uScrollTime << 16));
 
     return TRUE;
@@ -4073 +4134 @@
   if (infoPtr->dwStyle & TVS_CHECKBOXES)
   {
-    HBITMAP hbmLoad;
+    RECT rc;
+    HBITMAP hbm, hbmOld;
+    HDC hdc;
     int nIndex;
 
-    infoPtr->himlState = ImageList_Create (16, 16,ILC_COLOR | ILC_MASK, 15, 1);
-
-    //MSDN docu says: uses DrawFrameControl but never believe what they write
-    hbmLoad = LoadBitmapA (COMCTL32_hModule, MAKEINTRESOURCEA(IDT_CHECK));
-    nIndex = ImageList_AddMasked (infoPtr->himlState, hbmLoad, CLR_DEFAULT);
-    DeleteObject (hbmLoad);
+    infoPtr->himlState = ImageList_Create(16,16,ILC_COLOR | ILC_MASK,3,0);
+
+    hdc = CreateCompatibleDC(0);
+    hbm = CreateCompatibleBitmap(hdc, 48, 16);
+    hbmOld = SelectObject(hdc, hbm);
+
+    rc.left  = 0;   rc.top    = 0;
+    rc.right = 48;  rc.bottom = 16;
+    FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1));
+
+    rc.left  = 18;   rc.top    = 2;
+    rc.right = 30;   rc.bottom = 14;
+    DrawFrameControl(hdc, &rc, DFC_BUTTON,
+                     DFCS_BUTTONCHECK|DFCS_FLAT);
+
+    rc.left  = 34;   rc.right  = 46;
+    DrawFrameControl(hdc, &rc, DFC_BUTTON,
+                     DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED);
+
+    nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,
+                                 GetSysColor(COLOR_WINDOW));
+    //TRACE("chckbox index %d\n", nIndex);
+    SelectObject(hdc, hbmOld);
+    DeleteObject(hbm);
+    DeleteDC(hdc);
 
     infoPtr->stateImageWidth = 16;
@@ -4197 +4279 @@
 
     case VK_END:
-        newSelection = TREEVIEW_GetLastListItem(infoPtr,
-                                                infoPtr->root->lastChild);
+        newSelection = TREEVIEW_GetLastListItem(infoPtr,infoPtr->root);
         break;
 
@@ -4271 +4352 @@
     if (TREEVIEW_DoSelectItem(infoPtr,TVGN_CARET,newSelection,TVC_BYKEYBOARD))
     {
-      TREEVIEW_EnsureVisible(infoPtr, newSelection);
+      TREEVIEW_EnsureVisible(infoPtr,newSelection,FALSE);
     }
   }
@@ -4293 +4374 @@
 
 static LRESULT
-TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
-{
-  //TRACE("(%x %lx)\n", wParam, lParam);
-
+TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr,WPARAM wParam,LPARAM lParam)
+{
   if (wParam == GWL_STYLE)
-    infoPtr->dwStyle = ((LPSTYLESTRUCT)lParam)->styleNew;
+  {
+    DWORD dwNewStyle = ((LPSTYLESTRUCT)lParam)->styleNew;
+
+    /* we have to take special care about tooltips */
+    if ((infoPtr->dwStyle ^ dwNewStyle) & TVS_NOTOOLTIPS)
+    {
+      if (infoPtr->dwStyle & TVS_NOTOOLTIPS)
+      {
+        infoPtr->hwndToolTip = createToolTip(infoPtr->hwnd,TTF_TRACK | TTF_ABSOLUTE | TTF_TRANSPARENT,TRUE);
+        SendMessageA(infoPtr->hwndToolTip,WM_SETFONT,infoPtr->hFont,0);
+      } else
+      {
+        DestroyWindow(infoPtr->hwndToolTip);
+        infoPtr->hwndToolTip = 0;
+      }
+    }
+
+    infoPtr->dwStyle = dwNewStyle;
+  }
 
   if (infoPtr->hwndEdit) SetFocus(infoPtr->hwnd);
@@ -4714 +4811 @@
   {
     TREEVIEW_SelectItem(infoPtr,(WPARAM)TVGN_CARET,(LPARAM)nearest);
-    TREEVIEW_EnsureVisible(infoPtr,nearest);
+    TREEVIEW_EnsureVisible(infoPtr,nearest,FALSE);
     infoPtr->dwISearchTime = GetTickCount();
 
@@ -4729 +4826 @@
     infoPtr->uISearchLen = len;
     TREEVIEW_SelectItem(infoPtr,(WPARAM)TVGN_CARET,(LPARAM)item);
-    TREEVIEW_EnsureVisible(infoPtr,item);
+    TREEVIEW_EnsureVisible(infoPtr,item,FALSE);
     infoPtr->dwISearchTime = GetTickCount();
   } else
@@ -4855 +4952 @@
 
         case TVM_ENSUREVISIBLE:
-          return TREEVIEW_EnsureVisible(infoPtr,(HTREEITEM)lParam);
+          return TREEVIEW_EnsureVisible(infoPtr,(HTREEITEM)lParam,TRUE);
 
         case TVM_SORTCHILDRENCB: