Changeset 164 for trunk/src/comctl32/imagelist.c

Timestamp:

Jun 23, 1999, 9:45:02 PM (26 years ago)

Author:

achimha

Message:

updated comctl32 with the latest WINE bugfixes. Listview is much better now and tab control doesn't have the wrong color anymore. Many small improvements

File:

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

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.3 1999-06-10 16:21:59 achimha Exp $ */
+/* $Id: imagelist.c,v 1.4 1999-06-23 19:45:00 achimha Exp $ */
 /*
  *  ImageList implementation
@@ -1207 +1207 @@
     HICON  hIcon;
     HDC    hdcSrc, hdcDst;
-    INT    nWidth, nHeight;
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
         return 0;
 
-    nWidth = GetSystemMetrics (SM_CXICON);
-    nHeight = GetSystemMetrics (SM_CYICON);
-
     hdcSrc = CreateCompatibleDC(0);
     hdcDst = CreateCompatibleDC(0);
 
     ii.fIcon = TRUE;
-    ii.xHotspot = nWidth / 2;
-    ii.yHotspot = nHeight / 2;
-    ii.hbmMask  = CreateCompatibleBitmap (hdcDst, nWidth, nHeight);
-    ii.hbmColor = CreateCompatibleBitmap (hdcDst, nWidth, nHeight);
+    ii.hbmMask  = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
+    ii.hbmColor = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
 
 
@@ -1229 +1223 @@
     if (himl->hbmMask) {
         SelectObject (hdcSrc, himl->hbmMask);
-        BitBlt (hdcDst, 0, 0, nWidth, nHeight,
+        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
                   hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-        PatBlt (hdcDst, 0, 0, nWidth, nHeight, BLACKNESS);
+        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
 
     /* draw image*/
     SelectObject (hdcDst, ii.hbmColor);
     SelectObject (hdcSrc, himl->hbmImage);
-    BitBlt (hdcDst, 0, 0, nWidth, nHeight,
+    BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
               hdcSrc, i * himl->cx, 0, SRCCOPY);