Changeset 295 for trunk/src/comctl32/listview.c

Timestamp:

Jul 12, 1999, 5:58:51 PM (26 years ago)

Author:

cbratschi

Message:

wine-990704 updates, TBCUSTOMIZE implemented

File:

• trunk/src/comctl32/listview.c (modified) (10 diffs)

trunk/src/comctl32/listview.c

@@ -3392 +3392 @@
               if (dispInfo.item.mask & LVIF_DI_SETITEM)
               {
-                Str_SetPtrA(&lpItem->pszText, dispInfo.item.pszText);
+                if (lpSubItem)
+                   Str_SetPtrA(&lpSubItem->pszText, dispInfo.item.pszText);
               }
               lpLVItem->pszText = dispInfo.item.pszText;
@@ -3398 +3399 @@
             else if (lpLVItem->mask & LVIF_TEXT)
             {
-              lpLVItem->pszText = lpItem->pszText;
+              lpLVItem->pszText = lpSubItem->pszText;
             }
           }
@@ -3989 +3990 @@
         lvFindInfo.vkDirection = VK_UP;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = LISTVIEW_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -4012 +4013 @@
         lvFindInfo.vkDirection = VK_DOWN;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = LISTVIEW_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -4036 +4037 @@
         lvFindInfo.vkDirection = VK_LEFT;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = LISTVIEW_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -4060 +4061 @@
         lvFindInfo.vkDirection = VK_RIGHT;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = LISTVIEW_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -4667 +4668 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   BOOL bResult = FALSE;
-  HDITEMA hdi;
+  HDITEMA hdi, hdiget;
 
   if ((lpColumn != NULL) && (nColumn >= 0) &&
@@ -4679 +4680 @@
       /* format member is valid */
       hdi.mask |= HDI_FORMAT;
+
+      /* get current format first */
+      hdiget.mask = HDI_FORMAT;
+      if (Header_GetItemA(infoPtr->hwndHeader, nColumn, &hdiget))
+              /* preserve HDF_STRING if present */
+              hdi.fmt = hdiget.fmt & HDF_STRING;
 
       /* set text alignment (leftmost column must be left-aligned) */
@@ -5244 +5251 @@
 
   /* create header */
-
   infoPtr->hwndHeader = CreateWindowA(WC_HEADERA, (LPCSTR)NULL,
                                       WS_CHILD | HDS_HORZ | HDS_BUTTONS,
@@ -5623 +5629 @@
 
   case VK_LEFT:
-    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TOLEFT);
+    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TOLEFT);
     break;
 
   case VK_UP:
-    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
+    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
     break;
 
   case VK_RIGHT:
-    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
+    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
     break;
 
   case VK_DOWN:
-    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_BELOW);
+    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_BELOW);
     break;