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

Timestamp:

Mar 26, 2000, 6:32:33 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.7 2000-03-24 17:14:02 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.8 2000-03-26 16:32:33 cbratschi Exp $*/
 /*
  * Listview control
@@ -160 +160 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
 
-  if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
+  if (infoPtr->internalFlags & IF_NOREDRAW) return;
 
   if ((infoPtr->uView == LVS_REPORT) && !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER))
@@ -174 +174 @@
 }
 
-static VOID LISTVIEW_QueueRefresh(HWND hwnd)
+static LRESULT LISTVIEW_Timer(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
 
-  if (infoPtr->refreshFlags & RF_NOREDRAW) return;
-
-  if (infoPtr->refreshFlags & RF_REFRESH)
-    KillTimer (hwnd,LV_REFRESH_TIMER);
-  infoPtr->refreshFlags |= RF_REFRESH;
-  SetTimer(hwnd,LV_REFRESH_TIMER,LV_REFRESH_DELAY,0);
-}
-
-static LRESULT LISTVIEW_Timer(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
-
-  switch (wParam)
-  {
-    case LV_REFRESH_TIMER:
-      KillTimer(hwnd,LV_REFRESH_TIMER);
-      if (infoPtr->refreshFlags & RF_UPDATESCROLL)
-      {
-        LISTVIEW_UpdateScroll(hwnd);
-        infoPtr->refreshFlags &= ~RF_UPDATESCROLL;
-      }
-      if (infoPtr->refreshFlags & RF_REFRESH)
-      {
-        infoPtr->refreshFlags &= ~RF_REFRESH;
-        LISTVIEW_Refresh(hwnd);
-      }
-      return 0;
-  }
-
-  return 1;
+  return DefWindowProcA(hwnd,WM_TIMER,wParam,lParam);
 }
 
@@ -215 +186 @@
   RECT rect;
 
-  if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
+  if (infoPtr->internalFlags & IF_NOREDRAW) return;
   LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
 
@@ -238 +209 @@
   INT xOffset = infoPtr->lefttop.x*infoPtr->scrollStep.x;
 
-  if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
+  if (infoPtr->internalFlags & IF_NOREDRAW) return;
   LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
 
@@ -267 +238 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
 
-  if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
+  if (infoPtr->internalFlags & IF_NOREDRAW) return;
 
   if ((infoPtr->uView == LVS_REPORT) && !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER))
@@ -2751 +2722 @@
 
     /* refresh client area */
-    infoPtr->refreshFlags |= RF_UPDATESCROLL;
-    LISTVIEW_QueueRefresh(hwnd);
+    LISTVIEW_UpdateScroll(hwnd);
+    LISTVIEW_Refresh(hwnd);
   }
 
@@ -5135 +5106 @@
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
 
-    infoPtr->refreshFlags |= RF_UPDATESCROLL;
-    LISTVIEW_QueueRefresh(hwnd);
+    LISTVIEW_UpdateScroll(hwnd);
+    LISTVIEW_Refresh(hwnd);
   }
 
@@ -5271 +5242 @@
 
                 /* refresh client area */
-                infoPtr->refreshFlags |= RF_UPDATESCROLL;
-                LISTVIEW_QueueRefresh(hwnd);
+                LISTVIEW_UpdateScroll(hwnd);
+                LISTVIEW_Refresh(hwnd);
               }
             }
@@ -5551 +5522 @@
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
 
-    LISTVIEW_QueueRefresh(hwnd); // force redraw of the listview
+    LISTVIEW_Refresh(hwnd); // force redraw of the listview
 
     return lret;
@@ -5671 +5642 @@
   HDPA hdpaSubItems;
   NMLISTVIEW nmlv;
-
+//CB: LVS_REPORT (and other) and new text: invalidate if item rect > nItemWidth
   if (lpLVItem != NULL)
   {
@@ -6167 +6138 @@
 static LRESULT LISTVIEW_Create(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   LPCREATESTRUCTA lpcs = (LPCREATESTRUCTA)lParam;
   UINT uView = lpcs->style & LVS_TYPEMASK;
@@ -6627 +6598 @@
         return 0;
 
-    infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+    infoPtr = (LISTVIEW_INFO*)getInfoPtr(hwnd);
 
     if ( !infoPtr )
@@ -7017 +6988 @@
   LISTVIEW_INFO *infoPtr;
 
-  //TRACE("(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
-
   /* allocate memory for info structure */
   infoPtr = (LISTVIEW_INFO*)initControl(hwnd,sizeof(LISTVIEW_INFO));
@@ -7230 +7199 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-
-//  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
   if (infoPtr->bRButtonDown != FALSE)
@@ -7340 +7306 @@
   if (bRedraw)
   {
-    infoPtr->refreshFlags &= ~RF_NOREDRAW;
+    infoPtr->internalFlags &= ~IF_NOREDRAW;
     lResult = DefWindowProcA(hwnd, WM_SETREDRAW, bRedraw, 0);
 
     LISTVIEW_UpdateScroll(hwnd);
-    //CB: WINE calls RedrawWindow but many (all?) programs invalidate the control themself
-    //  RedrawWindow(hwnd,NULL,0,RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN | RDW_ERASENOW);
+    RedrawWindow(hwnd,NULL,0,RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN | RDW_ERASENOW);
   } else
   {
-    infoPtr->refreshFlags |= RF_NOREDRAW;
-    if (infoPtr->refreshFlags & RF_REFRESH)
-      KillTimer(hwnd,LV_REFRESH_TIMER);
-    infoPtr->refreshFlags &= ~(RF_REFRESH | RF_UPDATESCROLL);
+    infoPtr->internalFlags |= IF_NOREDRAW;
     lResult = DefWindowProcA(hwnd, WM_SETREDRAW, bRedraw, 0);
   }