Commit in reactos/lib/comctl32 on MAIN
progress.c+9-101.3 -> 1.4
reverted change

reactos/lib/comctl32
progress.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- progress.c	4 Apr 2004 06:46:22 -0000	1.3
+++ progress.c	5 Apr 2004 09:16:49 -0000	1.4
@@ -121,16 +121,15 @@
     else
         hbrBar = CreateSolidBrush (infoPtr->ColorBar);
 
-    /* Draw the border */
+    if (infoPtr->ColorBk == CLR_DEFAULT)
+        hbrBk = GetSysColorBrush(COLOR_3DFACE);
+    else
+        hbrBk = CreateSolidBrush(infoPtr->ColorBk);
+
+    /* get client rectangle */
     GetClientRect (infoPtr->Self, &rect);
-    SelectObject( hdc,  CreateSolidBrush( RGB(96, 96, 96) ) );
-    PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, 1, PATCOPY );
-    PatBlt( hdc, rect.left, rect.top, 1, rect.bottom - rect.top, PATCOPY );
-    
-    SelectObject( hdc, CreateSolidBrush(RGB(255,255,255) ));
-    PatBlt( hdc, rect.left, rect.bottom-1, rect.right - rect.left, 1, PATCOPY );
-    PatBlt( hdc, rect.right-1, rect.top, 1, rect.bottom - rect.top, PATCOPY );
-    InflateRect(&rect, -2, -2);
+    FrameRect( hdc, &rect, hbrBk );
+    InflateRect(&rect, -1, -1);
 
     /* get the window style */
     dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE);
@@ -152,7 +151,7 @@
         rightMost = rect.right;
     }
 
-  
+    /* now draw the bar */
     if (dwStyle & PBS_SMOOTH)
     {
         if (dwStyle & PBS_VERTICAL)
CVSspam 0.2.8