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

Timestamp:

Nov 9, 1999, 6:09:27 PM (26 years ago)

Author:

cbratschi

Message:

MoveTo fixes

File:

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

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.7 1999-09-26 11:01:09 achimha Exp $ */
+/* $Id: imagelist.c,v 1.8 1999-11-09 17:09:26 cbratschi Exp $ */
 /*
  *  ImageList implementation
@@ -242 +242 @@
     {
         /* to obtain a transparent look, background color should be set
-           to white and foreground color to black when blting the 
+           to white and foreground color to black when blting the
            monochrome mask. */
-        oldBkColor = SetBkColor(pimldp->hdcDst, RGB(0xff, 0xff, 0xff)); 
+        oldBkColor = SetBkColor(pimldp->hdcDst, RGB(0xff, 0xff, 0xff));
         oldFgColor = SetTextColor(pimldp->hdcDst, RGB(0, 0, 0));
 
@@ -259 +259 @@
             SRCPAINT);
 
-        SetBkColor(pimldp->hdcDst, oldBkColor); 
-        SetTextColor(pimldp->hdcDst, oldFgColor);
+        SetBkColor(pimldp->hdcDst, oldBkColor);
+        SetTextColor(pimldp->hdcDst, oldFgColor);
     }
     /* Draw the image when no Background is specified
@@ -903 +903 @@
     if (himl->cMaxImage > 0) {
         himl->hbmImage =
-          CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
+          CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
                         1, himl->uBitsPixel, NULL);
-        if (himl->hbmImage == 0) {
-//          ERR("Error creating image bitmap!\n");
-            return NULL;
-        }
+        if (himl->hbmImage == 0) {
+//          ERR("Error creating image bitmap!\n");
+            return NULL;
+        }
     }
     else
         himl->hbmImage = 0;
-    
+
     if ( (himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) {
         himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
@@ -1456 +1456 @@
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
-        return 0;
+        return 0;
 
     hdcSrc = CreateCompatibleDC(0);
@@ -1467 +1467 @@
     hOldDstBitmap = (HBITMAP)SelectObject (hdcDst, ii.hbmMask);
     if (himl->hbmMask) {
-        SelectObject (hdcSrc, himl->hbmMask);
-        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-                  hdcSrc, i * himl->cx, 0, SRCCOPY);
+        SelectObject (hdcSrc, himl->hbmMask);
+        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
+                  hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
 
     /* draw image*/
@@ -1479 +1479 @@
     SelectObject (hdcDst, ii.hbmColor);
     BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-              hdcSrc, i * himl->cx, 0, SRCCOPY);
+              hdcSrc, i * himl->cx, 0, SRCCOPY);
 
     /*
@@ -2136 +2136 @@
 
     hBestFitIcon = CopyImage(
-        hIcon, IMAGE_ICON, 
-        himl->cx, himl->cy, 
+        hIcon, IMAGE_ICON,
+        himl->cx, himl->cy,
         LR_COPYFROMRESOURCE);
 
@@ -2185 +2185 @@
 
     if(hBestFitIcon)
-        DestroyIcon(hBestFitIcon);
+        DestroyIcon(hBestFitIcon);
     if (hdcImageList)
         DeleteDC (hdcImageList);