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

Timestamp:

May 28, 2003, 10:53:38 AM (22 years ago)

Author:

sandervl

Message:

PF: OWNERDRAW fixes for ListView control

File:

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

trunk/src/comctl32/listview.c

@@ -278 +278 @@
   WCHAR szSearchParam[ MAX_PATH ];
   BOOL bIsDrawing;
+#ifdef __WIN32OS2__
+  BOOL              bDragInProcess;
+#endif
 } LISTVIEW_INFO;
 
@@ -2400 +2403 @@
         if (infoPtr->himlState || infoPtr->himlSmall)
             nItemHeight += HEIGHT_PADDING;
+
+#ifdef __WIN32OS2__
+        if(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) {
+            /* Get item height */
+
+           MEASUREITEMSTRUCT mis;
+           UINT              id = GetWindowLongA(infoPtr->hwndSelf,GWL_ID);
+
+           mis.CtlType    = ODT_LISTVIEW;
+           mis.CtlID      = id;
+           mis.itemID     = 0;
+           mis.itemData   = 0;     //TODO:!!!!
+           mis.itemHeight = nItemHeight;
+           SendMessageA(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
+           nItemHeight = mis.itemHeight;
+       }
+#endif
     }
 
@@ -3168 +3188 @@
     }
   }
-
+#ifdef __WIN32OS2__
+  else 
+  if(!infoPtr->bDragInProcess && (infoPtr->bLButtonDown || infoPtr->bRButtonDown) && infoPtr->nSelectionMark != -1) {
+      NMLISTVIEW nml = {0};
+      nml.iItem = infoPtr->nSelectionMark;
+      notify_listview(infoPtr, (infoPtr->bLButtonDown) ? LVN_BEGINDRAG : LVN_BEGINRDRAG, &nml);
+      infoPtr->bDragInProcess = TRUE;
+  }
+#endif  
   return 0;
 }
@@ -5844 +5872 @@
         SelectObject(hdc, hOldFont);
         ReleaseDC(infoPtr->hwndSelf, hdc);
+#ifdef __WIN32OS2__
+        if(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) {
+        /* Get item width */
+
+        MEASUREITEMSTRUCT mis;
+        UINT             id = GetWindowLongA(infoPtr->hwndSelf,GWL_ID);
+        mis.CtlType    = ODT_LISTVIEW;
+        mis.CtlID      = id;
+        mis.itemID     = 0;
+        mis.itemData   = 0;     //TODO:!!!!
+        mis.itemHeight = 0;
+        mis.itemWidth  = 0;
+        if (isW)  
+         SendMessageW(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
+        else
+         SendMessageA(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
+        stringSize.cx  = (mis.itemWidth) ? mis.itemWidth : infoPtr->nItemWidth;
+    }
+#endif
     }
     return stringSize.cx;
@@ -7686 +7733 @@
   nmKeyDown.wVKey = nVirtualKey;
   nmKeyDown.flags = 0;
+#ifdef __WIN32OS2__
+  if(notify_hdr(infoPtr, LVN_KEYDOWN, &nmKeyDown.hdr) == TRUE) 
+    return 0;    //application processed this key press
+#else
   notify_hdr(infoPtr, LVN_KEYDOWN, &nmKeyDown.hdr);
+#endif
 
   switch (nVirtualKey)
@@ -7911 +7963 @@
   }
 
+#ifdef __WIN32OS2__
+  //SvL: Send WM_COMMAND as well. (also done by NT's comctl32)
+  SendMessageA(GetParent(infoPtr->hwndSelf), WM_COMMAND, (1<<16) | GetWindowLongW(infoPtr->hwndSelf, GWL_ID), infoPtr->hwndSelf);
+#endif
+
   return 0;
 }
@@ -7947 +8004 @@
     if(lvHitTestInfo.iItem == infoPtr->nEditLabelItem && (lvHitTestInfo.flags & LVHT_ONITEMLABEL))
         LISTVIEW_EditLabelT(infoPtr, lvHitTestInfo.iItem, TRUE);
+
+#ifdef __WIN32OS2__
+  if(infoPtr->bDragInProcess) {
+      infoPtr->bDragInProcess = FALSE;
+  }
+#endif  
 
     return 0;