Changeset 8739 for trunk/src

Timestamp:

Jun 20, 2002, 9:18:12 PM (23 years ago)

Author:

sandervl

Message:

PF: Don't erase background for ownerdrawn listview controls (LISTVIEW_RefreshReport) + SvL: Added LVN_BEGINDRAG/LVN_BEGINRDRAG notification to listview

File:

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

trunk/src/comctl32/listview.c

@@ -148 +148 @@
     POINT             scrollStep;   //in pixels
     DWORD             internalFlags;
+    BOOL              bDragInProcess;
 #endif
   HWND hwndSelf;
@@ -2423 +2424 @@
     }
   }
-  
+#ifdef __WIN32OS2__
+  else 
+  if(!infoPtr->bDragInProcess && (infoPtr->bLButtonDown || infoPtr->bRButtonDown) && infoPtr->nSelectionMark != -1) {
+      NMLISTVIEW nml = {0};
+      nml.iItem = infoPtr->nSelectionMark;
+      listview_notify(hwnd, (infoPtr->bLButtonDown) ? LVN_BEGINDRAG : LVN_BEGINRDRAG, &nml);
+      infoPtr->bDragInProcess = TRUE;
+  }
+#endif  
   return 0;
 }
@@ -3748 +3757 @@
   FullSelected = infoPtr->dwExStyle & LVS_EX_FULLROWSELECT;
 
-  /* clear the background of any part of the control that doesn't contain items */
-  SubtractRect(&rcTemp, &infoPtr->rcList, &infoPtr->rcView);
-  LISTVIEW_FillBackground(hwnd, hdc, &rcTemp);
+#ifdef __WIN32OS2__
+  //@PF OwnerDraw does not need background clearing, it is supposed to be
+  //done by application itself.
+  if (!(lStyle & LVS_OWNERDRAWFIXED))
+  {
+#endif
+    /* clear the background of any part of the control that doesn't contain items */
+    SubtractRect(&rcTemp, &infoPtr->rcList, &infoPtr->rcView);
+    LISTVIEW_FillBackground(hwnd, hdc, &rcTemp);
+#ifdef __WIN32OS2__
+  }
+#endif
 
   /* nothing to draw */
@@ -9207 +9225 @@
     }
   }
+#ifdef __WIN32OS2__
+  if(infoPtr->bDragInProcess) {
+      infoPtr->bDragInProcess = FALSE;
+  }
+#endif  
 
   return 0;
@@ -9556 +9579 @@
     SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM) hwnd, MAKELPARAM(pt.x, pt.y));
   }
+
+#ifdef __WIN32OS2__
+  if(infoPtr->bDragInProcess) {
+      infoPtr->bDragInProcess = FALSE;
+  }
+#endif  
   
   return 0;