Changeset 4649 for trunk/src

Timestamp:

Nov 20, 2000, 9:28:16 PM (25 years ago)

Author:

sandervl

Message:

icon lookup fix (colors)

File:

• trunk/src/user32/winicon.cpp (modified) (5 diffs)

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.14 2000-11-18 14:08:54 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.15 2000-11-20 20:28:16 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -820 +820 @@
  */
 HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,
-                                   INT iDesiredCX, INT iDesiredCY,
-                                       UINT nFlags)
+                           INT iDesiredCX, INT iDesiredCY,
+                           UINT nFlags)
 {
     HGLOBAL hNew=0;
@@ -827 +827 @@
     if(Handle == 0)
     {
-            return 0;
+        return 0;
     }
     /* Best Fit or Monochrome */
@@ -913 +913 @@
             pBits = (LPBYTE)LockResource( hMem );
 
-                if(nFlags & LR_DEFAULTSIZE)
-                {
-                    iTargetCY = GetSystemMetrics(SM_CYICON);
+            if(nFlags & LR_DEFAULTSIZE)
+            {
+                iTargetCY = GetSystemMetrics(SM_CYICON);
                 iTargetCX = GetSystemMetrics(SM_CXICON);
-                }
+            }
 
             /* Create a New Icon with the proper dimension
@@ -974 +974 @@
             abs(height - entry->ResInfo.icon.bHeight) == iYDiff)
         {
+#ifdef __WIN32OS2__
+            iTempColorDiff = abs(colors - (1 << entry->wBitCount));
+#else
             iTempColorDiff = abs(colors - entry->ResInfo.icon.bColorCount);
+#endif
             if(iColorDiff > iTempColorDiff)
         {