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

Timestamp:

Sep 26, 1999, 1:01:11 PM (26 years ago)

Author:

achimha

Message:

merged latest WINE 990923 changes

File:

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

trunk/src/comctl32/listview.c

@@ -43 +43 @@
  *   LISTVIEW_Update : not completed
  */
+
+/* WINE 990923 level */
 
 #include <string.h>
@@ -3576 +3578 @@
   HDC hdc;
   HFONT hOldFont;
-  INT nMaxWidth;
+  INT nLeftPos;
   INT nLabelWidth;
   TEXTMETRICA tm;
@@ -3682 +3684 @@
           {
             bResult = TRUE;
-            nMaxWidth = lprc->left = ptItem.x + ptOrigin.x;
+            nLeftPos = lprc->left = ptItem.x + ptOrigin.x; 
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3697 +3699 @@
 
             nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
-            if (lprc->left + nLabelWidth < nMaxWidth + infoPtr->nItemWidth)
+            if (lprc->left + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
             {
               lprc->right = lprc->left + nLabelWidth;
@@ -3703 +3705 @@
             else
             {
-              lprc->right = nMaxWidth + infoPtr->nItemWidth;
+              lprc->right = nLeftPos + infoPtr->nItemWidth;
             }
           }
@@ -3710 +3712 @@
         {
           bResult = TRUE;
-          lprc->left = ptItem.x;
+          nLeftPos = lprc->left = ptItem.x; 
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3724 +3726 @@
           }
 
-          lprc->right = lprc->left + LISTVIEW_GetLabelWidth(hwnd, nItem);
+          nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+          if (lprc->left + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
+          {
+            lprc->right = lprc->left + nLabelWidth;
+          }
+          else
+          {
+            lprc->right = nLeftPos + infoPtr->nItemWidth;
+          }
         }
         break;
@@ -3777 +3787 @@
           }
 
-          lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+            if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
+            {
+              lprc->right += nLabelWidth;
+            }
+            else
+            {
+              lprc->right = lprc->left + infoPtr->nItemWidth;
+            }
         }
         break;
@@ -3801 +3819 @@
           {
             bResult = TRUE;
-            lprc->left = ptItem.x + ptOrigin.x;
+            nLeftPos= lprc->left = ptItem.x + ptOrigin.x;  
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3817 +3835 @@
             }
 
-            lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
+          nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+          if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
+          {
+            lprc->right += nLabelWidth;
+          }
+          else
+          {
+            lprc->right = lprc->left + infoPtr->nItemWidth;
+          }
           }
         }
@@ -3823 +3849 @@
         {
           bResult = TRUE;
-          lprc->left = ptItem.x;
+          nLeftPos = lprc->left = ptItem.x; 
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3839 +3865 @@
           }
 
-          lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
+          nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+          if (lprc->right + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
+          {
+            lprc->right += nLabelWidth;
+          }
+          else
+          {
+            lprc->right = nLeftPos + infoPtr->nItemWidth;
+          }
         }
         break;
@@ -3860 +3894 @@
  *   FAILURE : zero
  */
-static INT LISTVIEW_GetLabelWidth(HWND hwnd, INT nItem)
+INT LISTVIEW_GetLabelWidth(HWND hwnd, INT nItem)
 {
   CHAR szDispText[DISP_TEXT_SIZE];
@@ -3892 +3926 @@
  * Horizontal + vertical spacing
  */
-static LRESULT LISTVIEW_GetItemSpacing(HWND hwnd, BOOL bSmall)
+LRESULT LISTVIEW_GetItemSpacing(HWND hwnd, BOOL bSmall)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
@@ -3922 +3956 @@
  * State specified by the mask.
  */
-static LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask)
+LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
@@ -3956 +3990 @@
  *   FAILURE : 0
  */
-static LRESULT LISTVIEW_GetItemTextA(HWND hwnd, INT nItem, LPLVITEMA lpLVItem)
+LRESULT LISTVIEW_GetItemTextA(HWND hwnd, INT nItem, LPLVITEMA lpLVItem)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
@@ -4509 +4543 @@
 }
 
-/* LISTVIEW_InsertColumnW  */
+static LRESULT LISTVIEW_InsertColumnW(HWND hwnd, INT nColumn, 
+                                      LPLVCOLUMNW lpColumn)
+{
+  LVCOLUMNA     lvca;
+  LRESULT               lres;
+      
+  memcpy(&lvca,lpColumn,sizeof(lvca));
+//AH: todo
+//  if (lpColumn->mask & LVCF_TEXT)
+//    lvca.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpColumn->pszText);
+  lres = LISTVIEW_InsertColumnA(hwnd,nColumn,&lvca);
+  if (lpColumn->mask & LVCF_TEXT)
+    HeapFree(GetProcessHeap(),0,lvca.pszText);
+  return lres;
+}
 
 /***
@@ -4609 +4657 @@
 }
 
-/* LISTVIEW_InsertItemW */
+static LRESULT LISTVIEW_InsertItemW(HWND hwnd, LPLVITEMW lpLVItem) {
+  LVITEMA lvia;
+  LRESULT lres;
+
+  memcpy(&lvia,lpLVItem,sizeof(LVITEMA));
+  if (lvia.mask & LVIF_TEXT) {
+    if (lpLVItem->pszText == LPSTR_TEXTCALLBACKW)
+      lvia.pszText = LPSTR_TEXTCALLBACKA;
+//AH: todo
+//    else
+//      lvia.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpLVItem->pszText);
+  }
+  lres = LISTVIEW_InsertItemA(hwnd, &lvia);
+  if (lvia.mask & LVIF_TEXT) {
+    if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW)
+      HeapFree(GetProcessHeap(),0,lvia.pszText);
+  }
+  return lres;
+}
 
 /***
@@ -6323 +6389 @@
   infoPtr->bFocus = TRUE;
 
+  InvalidateRect(hwnd, NULL, TRUE);
+  UpdateWindow(hwnd);
+
   return 0;
 }
@@ -6722 +6791 @@
 
   case LVM_INSERTCOLUMNA:
-    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam,
-                                    (LPLVCOLUMNA)lParam);
-
-/*      case LVM_INSERTCOLUMNW: */
+    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
+
+  case LVM_INSERTCOLUMNW:
+    return LISTVIEW_InsertColumnW(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam);
 
   case LVM_INSERTITEMA:
     return LISTVIEW_InsertItemA(hwnd, (LPLVITEMA)lParam);
 
-/*      case LVM_INSERTITEMW: */
+  case LVM_INSERTITEMW:
+    return LISTVIEW_InsertItemW(hwnd, (LPLVITEMW)lParam);
 
   case LVM_REDRAWITEMS:
@@ -6827 +6897 @@
 
   case WM_GETDLGCODE:
-    return DLGC_WANTTAB | DLGC_WANTARROWS;
+    return DLGC_WANTCHARS | DLGC_WANTARROWS;
 
   case WM_GETFONT: