Changeset 3420 for trunk/src/comctl32/listview.cpp

Timestamp:

Apr 18, 2000, 6:04:55 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/comctl32/listview.cpp (modified) (29 diffs)

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.16 2000-04-17 17:04:12 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.17 2000-04-18 16:02:37 cbratschi Exp $*/
 /*
  * Listview control
@@ -182 +182 @@
     if (nLast > nBottom) nLast = nBottom;
 
-    Header_GetItemRect(infoPtr->hwndHeader,0,&rcHeader);
+    HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)0,(LPARAM)&rcHeader);
     rcHeader.left += REPORT_MARGINX;
     rcHeader.right = max(rcHeader.left,rcHeader.right-REPORT_MARGINX);
@@ -374 +374 @@
     INT nNumOfItems = GETITEMCOUNT(infoPtr);
 
-    infoPtr->maxScroll.x = nNumOfItems / nCountPerColumn;
+    infoPtr->maxScroll.x = nNumOfItems/nCountPerColumn;
     if (nNumOfItems % nCountPerColumn)
       infoPtr->maxScroll.x++;
 
-    infoPtr->lefttop.x = LISTVIEW_GetTopIndex(hwnd) / nCountPerColumn;
+    infoPtr->lefttop.x = LISTVIEW_GetTopIndex(hwnd)/nCountPerColumn;
     infoPtr->scrollPage.x = nCountPerRow;
     infoPtr->scrollStep.x = infoPtr->nItemWidth;
@@ -668 +668 @@
   {
     /* calculate width of header */
-    nHeaderItemCount = Header_GetItemCount(infoPtr->hwndHeader);
+    nHeaderItemCount = HEADER_GetItemCount(infoPtr->hwndHeader);
     for (i = 0; i < nHeaderItemCount; i++)
     {
-      if (Header_GetItemRect(infoPtr->hwndHeader, i, &rcHeaderItem))
+      if (HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)i,(LPARAM)&rcHeaderItem))
       {
         nItemWidth += (rcHeaderItem.right - rcHeaderItem.left);
@@ -749 +749 @@
   {
     /* calculate width of header */
-    nHeaderItemCount = Header_GetItemCount(infoPtr->hwndHeader);
+    nHeaderItemCount = HEADER_GetItemCount(infoPtr->hwndHeader);
     for (i = 0; i < nHeaderItemCount; i++)
     {
-      if (Header_GetItemRect(infoPtr->hwndHeader, i, &rcHeaderItem) != 0)
+      if (HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)i,(LPARAM)&rcHeaderItem) != 0)
       {
         nItemWidth += (rcHeaderItem.right - rcHeaderItem.left);
@@ -1134 +1134 @@
 
     nItem = nTop+(pt.y/infoPtr->nItemHeight)+
-            ((INT)(pt.x-infoPtr->lefttop.x*infoPtr->scrollStep.x)/infoPtr->nItemWidth)*nCountPerColumn;
+            ((INT)(pt.x/infoPtr->nItemWidth))*nCountPerColumn;
     if (nItem >= GETITEMCOUNT(infoPtr)) return -1;
 
@@ -1895 +1895 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   INT nDrawPosY = infoPtr->rcList.top;
-  INT nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
+  INT nColumnCount = HEADER_GetItemCount(infoPtr->hwndHeader);
   RECT rcItem,*rcHeader;
   INT  j,nItem,nLast,xOffset = infoPtr->lefttop.x*infoPtr->scrollStep.x;
@@ -1920 +1920 @@
   for (j = 0;j < nColumnCount;j++)
   {
-    Header_GetItemRect(infoPtr->hwndHeader,j,&rcHeader[j]);
+    HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)j,(LPARAM)&rcHeader[j]);
     rcHeader[j].left += REPORT_MARGINX;
     rcHeader[j].right = max(rcHeader[j].left,rcHeader[j].right-REPORT_MARGINX);
@@ -2499 +2499 @@
   BOOL bResult = FALSE;
 
-  if (Header_DeleteItem(infoPtr->hwndHeader, nColumn))
+  if (HEADER_DeleteItem(infoPtr->hwndHeader, nColumn))
   {
     bResult = LISTVIEW_RemoveColumn(infoPtr->hdpaItems, nColumn);
@@ -3313 +3313 @@
     }
 
-    if (unicode)
-      bResult = Header_GetItemW(infoPtr->hwndHeader,nItem,&hdi);
-    else
-      bResult = Header_GetItemA(infoPtr->hwndHeader,nItem,(HDITEMW*)&hdi);
+    bResult = HEADER_GetItem(infoPtr->hwndHeader,(WPARAM)nItem,(LPARAM)&hdi,unicode);
     if (bResult)
     {
@@ -3366 +3363 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  return Header_GetOrderArray(infoPtr->hwndHeader,iCount,lpiArray);
+  return HEADER_GetOrderArray(infoPtr->hwndHeader,(WPARAM)iCount,(LPARAM)lpiArray);
 }
 
@@ -3395 +3392 @@
     ZeroMemory(&hdi,sizeof(HDITEMW));
     hdi.mask = HDI_WIDTH;
-    if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi))
+    if (HEADER_GetItem(infoPtr->hwndHeader,(WPARAM)nColumn,(LPARAM)&hdi,TRUE))
     {
       return hdi.cxy;
@@ -3568 +3565 @@
       {
         LISTVIEW_ITEMDATA *lpItemData = LISTVIEW_GetItemData(lpItem->hdpaSubItems,lpLVItem->iSubItem);
+
+        //add subitem if not present
+        if (!lpItemData && (lpLVItem->iSubItem > 0) && (lpLVItem->iSubItem < HEADER_GetItemCount(infoPtr->hwndHeader)))
+        {
+          INT nPosition;
+
+          lpItemData = (LISTVIEW_ITEMDATA*)COMCTL32_Alloc(sizeof(LISTVIEW_ITEMDATA));
+          ZeroMemory(lpItemData,sizeof(LISTVIEW_ITEMDATA));
+          lpItemData->pszText = LPSTR_TEXTCALLBACKW;
+          lpItemData->iImage = I_IMAGECALLBACK;
+          lpItemData->iSubItem = lpLVItem->iSubItem;
+          nPosition = LISTVIEW_FindInsertPosition(lpItem->hdpaSubItems,lpItemData->iSubItem);
+          DPA_InsertPtr(lpItem->hdpaSubItems,nPosition,lpItemData);
+        }
 
         if (lpItemData)
@@ -3864 +3875 @@
   RECT rect;
 
-  if (Header_GetItemRect(infoPtr->hwndHeader,nSubItem,&rect))
+  if (HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)nSubItem,(LPARAM)&rect))
   {
     lpptPosition->x = rect.left+REPORT_MARGINX;
@@ -4218 +4229 @@
 
   nSubItem = lprc->top;
-  if ((nSubItem < 0) || (nSubItem >= Header_GetItemCount(infoPtr->hwndHeader))) return FALSE;
+  if ((nSubItem < 0) || (nSubItem >= HEADER_GetItemCount(infoPtr->hwndHeader))) return FALSE;
   if (!LISTVIEW_GetSubItemPosition(hwnd,nItem,nSubItem,&ptItem)) return FALSE;
 
@@ -4749 +4760 @@
   if (checkSubItems && (infoPtr->uView == LVS_REPORT))
   {
-    INT nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
+    INT nColumnCount = HEADER_GetItemCount(infoPtr->hwndHeader);
     INT xDiff = -infoPtr->lefttop.x*infoPtr->scrollStep.x;
 
@@ -4758 +4769 @@
       RECT rcColumn;
 
-      Header_GetItemRect(infoPtr->hwndHeader,x,&rcColumn);
+      HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)x,(LPARAM)&rcColumn);
       rcItem.left = xDiff+REPORT_MARGINX+rcColumn.left;
       rcItem.right = xDiff+rcColumn.right-REPORT_MARGINX;
@@ -4852 +4863 @@
 
     nItem = nTop+(lpHitTestInfo->pt.y/infoPtr->nItemHeight)+
-            ((INT)(lpHitTestInfo->pt.x-infoPtr->lefttop.x*infoPtr->scrollStep.x)/infoPtr->nItemWidth)*nCountPerColumn;
+            ((INT)(lpHitTestInfo->pt.x/infoPtr->nItemWidth))*nCountPerColumn;
     if (nItem >= GETITEMCOUNT(infoPtr)) return -1;
 
@@ -5041 +5052 @@
 
     /* insert item in header control */
-    if (unicode)
-      nNewColumn = Header_InsertItemW(infoPtr->hwndHeader,nColumn,&hdi);
-    else
-      nNewColumn = Header_InsertItemA(infoPtr->hwndHeader,nColumn,&hdi);
+    nNewColumn = HEADER_InsertItem(infoPtr->hwndHeader,(WPARAM)nColumn,(LPARAM)&hdi,unicode);
 
     /* Need to reset the item width when inserting a new column */
@@ -5396 +5404 @@
 
   if ((lpColumn != NULL) && (nColumn >= 0) &&
-      (nColumn < Header_GetItemCount(infoPtr->hwndHeader)))
+      (nColumn < HEADER_GetItemCount(infoPtr->hwndHeader)))
   {
     /* initialize memory */
@@ -5408 +5416 @@
       /* get current format first */
       hdiget.mask = HDI_FORMAT;
-      if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdiget))
+      if (HEADER_GetItem(infoPtr->hwndHeader,(WPARAM)nColumn,(LPARAM)&hdiget,TRUE))
               /* preserve HDF_STRING if present */
               hdi.fmt = hdiget.fmt & HDF_STRING;
@@ -5477 +5485 @@
 
     /* set header item attributes */
-    if (unicode)
-      bResult = Header_SetItemW(infoPtr->hwndHeader,nColumn,&hdi);
-    else
-      bResult = Header_SetItemA(infoPtr->hwndHeader,nColumn,(HDITEMA*)&hdi);
+    bResult = HEADER_SetItem(infoPtr->hwndHeader,(WPARAM)nColumn,(LPARAM)&hdi,unicode);
   }
 
@@ -5506 +5511 @@
   BOOL rc,changed = FALSE;
 
-  nHeaderItemCount = Header_GetItemCount(infoPtr->hwndHeader);
+  nHeaderItemCount = HEADER_GetItemCount(infoPtr->hwndHeader);
   if (iCount != nHeaderItemCount) return FALSE;
 
   oldArray = (LPINT)COMCTL32_Alloc(nHeaderItemCount*sizeof(INT));
-  Header_GetOrderArray(infoPtr->hwndHeader,nHeaderItemCount,oldArray);
-  rc = Header_SetOrderArray(infoPtr->hwndHeader,iCount,lpiArray);
+  HEADER_GetOrderArray(infoPtr->hwndHeader,(WPARAM)nHeaderItemCount,(LPARAM)oldArray);
+  rc = HEADER_SetOrderArray(infoPtr->hwndHeader,(WPARAM)iCount,(LPARAM)lpiArray);
   if (rc)
   {
@@ -5545 +5550 @@
           lpItemData = LISTVIEW_GetItemData(lpItem->hdpaSubItems,diffList[y]);
           if (!lpItemData) continue;
+          lpItemData->iSubItem = y;
           DPA_InsertPtr(newDPA,newDPA->nItemCount,lpItemData);
         }
@@ -5613 +5619 @@
 
     // call header to update the column change
-    lret = Header_SetItemW(infoPtr->hwndHeader, (WPARAM)iCol, (LPARAM)&hdi);
+    lret = HEADER_SetItem(infoPtr->hwndHeader,(WPARAM)iCol,(LPARAM)&hdi,TRUE);
 
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
@@ -5881 +5887 @@
         {
           /* set subitem only if column is present */
-          if (Header_GetItemCount(infoPtr->hwndHeader) > lpLVItem->iSubItem)
+          if (HEADER_GetItemCount(infoPtr->hwndHeader) > lpLVItem->iSubItem)
           {
             lpItemData = (LISTVIEW_ITEMDATA*)COMCTL32_Alloc(sizeof(LISTVIEW_ITEMDATA));
@@ -6964 +6970 @@
   LVHITTESTINFO htInfo;
 
-//  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
-
   /* send NM_DBLCLK notification */
   sendNotify(hwnd,NM_DBLCLK);
@@ -7542 +7546 @@
       hl.prc = &rcList;
       hl.pwpos = &wp;
-      Header_Layout(infoPtr->hwndHeader, &hl);
+      HEADER_Layout(infoPtr->hwndHeader,(WPARAM)0,(LPARAM)&hl);
       SetWindowPos(infoPtr->hwndHeader,hwnd,wp.x,wp.y,wp.cx,wp.cy,wp.flags);
       infoPtr->rcList.top = max(wp.cy,0);
@@ -7610 +7614 @@
       hl.prc = &rcList;
       hl.pwpos = &wp;
-      Header_Layout(infoPtr->hwndHeader, &hl);
+      HEADER_Layout(infoPtr->hwndHeader,(WPARAM)0,(LPARAM)&hl);
       SetWindowPos(infoPtr->hwndHeader, hwnd, wp.x, wp.y, wp.cx, wp.cy,
                    wp.flags);