Changeset 219 for trunk/src/comctl32/progress.c

Timestamp:

Jun 26, 1999, 4:20:32 PM (26 years ago)

Author:

cbratschi

Message:

Updates for new DrawEdge and colors

File:

• trunk/src/comctl32/progress.c (modified) (3 diffs)

trunk/src/comctl32/progress.c

@@ -1 @@
-/* $Id: progress.c,v 1.5 1999-06-16 20:25:43 cbratschi Exp $ */
+/* $Id: progress.c,v 1.6 1999-06-26 14:20:31 cbratschi Exp $ */
 /*
  * Progress control
@@ -56 +56 @@
 
   /* get the required background brush */
-  if (infoPtr->ColorBk == CLR_DEFAULT) hbrBk = GetSysColorBrush (COLOR_3DFACE);
-  else hbrBk = CreateSolidBrush (infoPtr->ColorBk);
+  if (infoPtr->ColorBk == CLR_DEFAULT) hbrBk = GetSysColorBrush(COLOR_3DFACE);
+  else hbrBk = CreateSolidBrush(infoPtr->ColorBk);
 
   /* get client rectangle */
   GetClientRect (hwnd, &rect);
-  rect.right--;
-  rect.bottom--;
 
   /* draw the background */
@@ -69 +67 @@
     FillRect(hdc, &rect, hbrBk);
     //Border
-    hbrLight = GetSysColorBrush(COLOR_3DLIGHT);
-    hbrShadow = GetSysColorBrush(COLOR_3DSHADOW);
-    MoveToEx(hdc,rect.left,rect.bottom,NULL);
+    hbrLight = GetSysColorPen(COLOR_BTNHILIGHT);
+    hbrShadow = GetSysColorPen(COLOR_BTNSHADOW);
+    MoveToEx(hdc,rect.left,rect.bottom-1,NULL);
     hbrOld = SelectObject(hdc,hbrShadow);
     LineTo(hdc,rect.left,rect.top);
-    LineTo(hdc,rect.right,rect.top);
+    LineTo(hdc,rect.right-1,rect.top);
     SelectObject(hdc,hbrLight);
-    LineTo(hdc,rect.right,rect.bottom);
-    LineTo(hdc,rect.left,rect.bottom);
+    LineTo(hdc,rect.right-1,rect.bottom-1);
+    LineTo(hdc,rect.left,rect.bottom-1);
     SelectObject(hdc,hbrOld);
   }