Changeset 7107 for trunk/src

Timestamp:

Oct 18, 2001, 1:02:22 PM (24 years ago)

Author:

sandervl

Message:

OSLibWinCreatePointer fix for cursors

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.26 2001-10-16 14:49:46 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.27 2001-10-18 11:02:22 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -281 +281 @@
     HAB hab;
 
+    dprintf2(("Convert color bitmap to mono (%d,%d) %d", pBmpDest->cx, pBmpDest->cy, pBmpDest->cBitCount));
+
     hab = GetThreadHAB();
 
@@ -445 +447 @@
                 goto fail;
         }
-        if(pXorBmp->bmBitsPixel >= 8) 
+        if(fCursor && pXorBmp->bmBitsPixel >= 8) 
         {
             if(isMonoBitmap(pXorBmp, (PBYTE)os2rgb) == TRUE) 
@@ -504 +506 @@
     }
 
-    pointerInfo.fPointer   = !fCursor; //TRUE = icon
+    pointerInfo.fPointer   = fCursor; //FALSE = icon
     pointerInfo.xHotspot   = pInfo->ptHotSpot.x;
     pointerInfo.yHotspot   = mapY(pInfo->nHeight, pInfo->ptHotSpot.y);
     pointerInfo.hbmColor   = hbmColor;
     pointerInfo.hbmPointer = hbmMask;
+    dprintf2(("WinCreatePointerIndirect %d (%d,%d) (org %d,%d)", pointerInfo.fPointer, pointerInfo.xHotspot, pointerInfo.yHotspot, pInfo->ptHotSpot.x, pInfo->ptHotSpot.y));
     hPointer = WinCreatePointerIndirect(HWND_DESKTOP, &pointerInfo);
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.292 2001-10-17 15:16:57 phaller Exp $ */
+/* $Id: win32wbase.cpp,v 1.293 2001-10-18 11:02:22 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3636 +3636 @@
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x (%x)", getWindowHandle(), dwStyle, value));
 #ifdef DEBUG
-                if((value & WS_CHILD) != (dwStyle & WS_CHILD)) {
-                    DebugInt3(); //is this allowed?
-                }
+//                if((value & WS_CHILD) != (dwStyle & WS_CHILD)) {
+//                    DebugInt3(); //is this allowed?
+//                }
 #endif
                 value &= ~(WS_CHILD);