Changeset 4019 for trunk/src/comctl32/treeview.cpp

Timestamp:

Aug 15, 2000, 7:04:39 PM (25 years ago)

Author:

cbratschi

Message:

redraw fix

File:

• trunk/src/comctl32/treeview.cpp (modified) (7 diffs)

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.17 2000-08-13 17:12:40 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.18 2000-08-15 17:04:39 cbratschi Exp $ */
 /* Treeview control
  *
@@ -1286 +1286 @@
     if (lParam == (LPARAM)TVI_ROOT)
     {
-        parent = infoPtr->root;
+        parent = infoPtr->root;
         newSelection = NULL;
-        visible = TRUE;
+        visible = TRUE;
         TREEVIEW_RemoveTree(infoPtr);
     }
@@ -1299 +1299 @@
 
         //TRACE("%p (%s)\n", wineItem, TREEVIEW_ItemName(wineItem));
-        parent = wineItem->parent;
+        parent = wineItem->parent;
 
         if (ISVISIBLE(wineItem))
@@ -1317 +1317 @@
         }
 
-        if (infoPtr->firstVisible == wineItem)
-        {
-            if (wineItem->nextSibling)
-               newFirstVisible = wineItem->nextSibling;
-            else if (wineItem->prevSibling)
-               newFirstVisible = wineItem->prevSibling;
-            else if (wineItem->parent != infoPtr->root)
-               newFirstVisible = wineItem->parent;
-        }
-        else
-            newFirstVisible = infoPtr->firstVisible;
+        if (infoPtr->firstVisible == wineItem)
+        {
+            if (wineItem->nextSibling)
+               newFirstVisible = wineItem->nextSibling;
+            else if (wineItem->prevSibling)
+               newFirstVisible = wineItem->prevSibling;
+            else if (wineItem->parent != infoPtr->root)
+               newFirstVisible = wineItem->parent;
+        }
+        else
+            newFirstVisible = infoPtr->firstVisible;
 
         TREEVIEW_RemoveItem(infoPtr, wineItem);
@@ -1345 +1345 @@
      */
     if (!TREEVIEW_ValidItem(infoPtr, infoPtr->insertMarkItem))
-        infoPtr->insertMarkItem = 0;
+        infoPtr->insertMarkItem = 0;
 
     if (!TREEVIEW_ValidItem(infoPtr, infoPtr->dropItem))
-        infoPtr->dropItem = 0;
+        infoPtr->dropItem = 0;
 
     if (!TREEVIEW_ValidItem(infoPtr, newFirstVisible))
@@ -1805 +1805 @@
     if (changed & (TVIF_INTEGRAL | TVIF_CHILDREN))
       TREEVIEW_QueueRefresh(infoPtr);
-    else
+    else if (changed)
       TREEVIEW_RefreshItem(infoPtr,wineItem,changed);
 
@@ -2016 +2016 @@
             LONG plussize = (rectsize + 1) * 3 / 4;
 
-            HPEN hNewPen  = CreatePen(PS_SOLID, 0, infoPtr->clrLine);
-            HPEN hOldPen  = SelectObject(hdc, hNewPen);
-            HBRUSH hbr    = CreateSolidBrush(infoPtr->clrBk);
-            HBRUSH hbrOld = SelectObject(hdc, hbr);
+            HPEN hNewPen  = CreatePen(PS_SOLID, 0, infoPtr->clrLine);
+            HPEN hOldPen  = SelectObject(hdc, hNewPen);
+            HBRUSH hbr    = CreateSolidBrush(infoPtr->clrBk);
+            HBRUSH hbrOld = SelectObject(hdc, hbr);
 
             Rectangle(hdc, centerx - rectsize, centery - rectsize,
                       centerx + rectsize + 1, centery + rectsize + 1);
 
-            SelectObject(hdc, hbrOld);
-            DeleteObject(hbr);
+            SelectObject(hdc, hbrOld);
+            DeleteObject(hbr);
 
             SelectObject(hdc, hOldPen);