Changeset 350 for trunk/src/user32/new/oslibres.cpp

Timestamp:

Jul 20, 1999, 7:50:39 PM (26 years ago)

Author:

sandervl

Message:

Fixed icons

File:

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

trunk/src/user32/new/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.1 1999-07-20 15:46:53 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.2 1999-07-20 17:50:39 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -63 +63 @@
     if(hIcon == 0) {
             //skip xor/and mask
-            bfh = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB)*2 + sizeof(BITMAPFILEHEADER2));
+            bfh = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
             hps = WinGetPS(hwnd);
             hbmColor = GpiCreateBitmap(hps, &bfh->bmp2, CBM_INIT, 
@@ -96 +96 @@
     }
     WinSendMsg(hwnd, WM_SETICON, (MPARAM)hIcon, 0);
-//    if(WinSetPointer(hwnd, hIcon) == FALSE) {
-//      dprintf(("WinSetPointer %x %x failed with error %x!", hwnd, hIcon, WinGetLastError(GetThreadHAB())));
-//  }
     WinReleasePS(hps);
     return hIcon;