Changeset 6168 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

add icon to PM tasklist

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (4 diffs)
• oslibres.h (modified) (2 diffs)
• oslibwin.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (3 diffs)
• winicon.cpp (modified) (3 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.14 2001-05-17 11:25:48 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.15 2001-07-04 09:55:17 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -46 +46 @@
     else    return 0;
 }
+#if 0
 //******************************************************************************
 //TODO: change search method for icon array (cxDesired, cyDesired)
@@ -228 +229 @@
     return hPointer;
 }
+#endif
 //******************************************************************************
 //NOTE: Depends on origin of bitmap data!!!
 //      Assumes 1 bpp bitmaps have a top left origin and all others have a bottom left origin
 //******************************************************************************
-HANDLE OSLibWinCreateCursor(CURSORICONINFO *pInfo, char *pAndBits, BITMAP_W *pAndBmp, char *pXorBits, BITMAP_W *pXorBmp)
+HANDLE OSLibWinCreatePointer(CURSORICONINFO *pInfo, char *pAndBits, BITMAP_W *pAndBmp, char *pXorBits, 
+                             BITMAP_W *pXorBmp, BOOL fCursor)
 {
  POINTERINFO  pointerInfo = {0};
@@ -338 +341 @@
     }
 
-    pointerInfo.fPointer   = TRUE;
+    pointerInfo.fPointer   = fCursor; //FALSE = icon
     pointerInfo.xHotspot   = pInfo->ptHotSpot.x;
     pointerInfo.yHotspot   = mapY(pInfo->nHeight, pInfo->ptHotSpot.y);

trunk/src/user32/oslibres.h

@@ -1 @@
-/* $Id: oslibres.h,v 1.8 2001-05-17 11:25:48 sandervl Exp $ */
+/* $Id: oslibres.h,v 1.9 2001-07-04 09:55:17 sandervl Exp $ */
 /*
  * Window GUI resource wrapper functions for OS/2
@@ -41 +41 @@
 
 HANDLE  OSLibWinSetAccelTable(HWND hwnd, HANDLE hAccel, PVOID acceltemplate);
-HANDLE  OSLibWinCreateIcon(PVOID iconbitmap, ULONG cxDesired, ULONG cyDesired);
 
-//NOTE: Depends on origin of bitmap data!!!
-//      Assumes 1 bpp bitmaps have a top left origin and all others have a bottom left origin
-HANDLE  OSLibWinCreatePointer(PVOID cursorbitmap, ULONG cxDesired, ULONG cyDesired);
-
-HANDLE  OSLibWinCreateCursor(CURSORICONINFO *pInfo, char *pAndBits, BITMAP_W *pAndBmp, char *pXorBits, BITMAP_W *pXorBmp);
+HANDLE  OSLibWinCreatePointer(CURSORICONINFO *pInfo, char *pAndBits, BITMAP_W *pAndBmp, char *pXorBits, BITMAP_W *pXorBmp, BOOL fCursor);
 HANDLE  OSLibWinQuerySysPointer(ULONG type,INT w,INT h);
 HANDLE  OSLibWinQuerySysIcon(ULONG type,INT w,INT h);

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.104 2001-07-03 18:33:26 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.105 2001-07-04 09:55:17 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -21 +21 @@
 #include <win32type.h>
 #include <winconst.h>
+#include <winuser32.h>
 #include "oslibwin.h"
 #include "oslibutil.h"
@@ -494 +495 @@
 BOOL OSLibWinSetIcon(HWND hwnd, HANDLE hIcon)
 {
-    return (BOOL) WinSendMsg(hwnd, WM_SETICON, (MPARAM)hIcon, 0);
+    ULONG hIconOS2 = GetOS2Icon(hIcon);
+    if(hIconOS2) 
+       return (BOOL) WinSendMsg(hwnd, WM_SETICON, (MPARAM)hIconOS2, 0);
+    return FALSE;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.272 2001-07-04 09:29:51 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.273 2001-07-04 09:55:18 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -638 +638 @@
     //Set icon from window or class
     if (hIcon)
-        OSLibWinSetIcon(OS2Hwnd,hIcon);
+        OSLibWinSetIcon(OS2HwndFrame,hIcon);
     else
     if (windowClass->getIcon())
-        OSLibWinSetIcon(OS2Hwnd,windowClass->getIcon());
+        OSLibWinSetIcon(OS2HwndFrame,windowClass->getIcon());
 
     /* Get class or window DC if needed */
@@ -1875 +1875 @@
               hIcon = (HICON)lParam;
               if ((dwStyle & WS_CAPTION) == WS_CAPTION)
-                OSLibWinSetIcon(OS2Hwnd,hIcon);
+                OSLibWinSetIcon(OS2HwndFrame,hIcon);
             }
           }

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 );
     }