Changeset 6168 for trunk/src/user32/winicon.cpp

Timestamp:

Jul 4, 2001, 11:55:18 AM (24 years ago)

Author:

sandervl

Message:

add icon to PM tasklist

File:

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

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.24 2001-06-11 20:08:26 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.25 2001-07-04 09:55:18 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -209 +209 @@
     dprintf(("USER32:  CopyIcon %x", hIcon));
     return CURSORICON_Copy( hIcon );
+}
+//******************************************************************************
+//******************************************************************************
+HICON WIN32API GetOS2Icon(HICON hIcon)
+{
+    CURSORICONINFO  *ciconinfo;
+
+    ciconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)hIcon);
+    if (!ciconinfo)
+        return 0;
+    HICON hOS2Icon = ciconinfo->hColorBmp;
+    GlobalUnlock(hIcon);
+    return hOS2Icon;
 }
 /**********************************************************************
@@ -1074 +1087 @@
             GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd);
         }
-        if(!bIcon) {
-            info->hColorBmp = OSLibWinCreateCursor(info, (char *)(info + 1), (LPBITMAP_W)&bmpAnd, (char *)(info + 1) + sizeAnd, (LPBITMAP_W)&bmpXor);
-            dprintf(("Create cursor %x with OS/2 pointer handle %x", hObj, info->hColorBmp));
-        }
+        info->hColorBmp = OSLibWinCreatePointer(info, (char *)(info + 1), (LPBITMAP_W)&bmpAnd, (char *)(info + 1) + sizeAnd, (LPBITMAP_W)&bmpXor, bIcon == FALSE);
+        dprintf(("Create cursor/icon %x with OS/2 pointer handle %x", hObj, info->hColorBmp));
         GlobalUnlock( hObj );
     }