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

Timestamp:

May 17, 2001, 1:25:49 PM (24 years ago)

Author:

sandervl

Message:

SetCursor fix

File:

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

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.22 2001-04-15 14:29:49 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.23 2001-05-17 11:25:49 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -82 +82 @@
 static WORD    ICON_HOTSPOT  = 0x4242;
 static HCURSOR hActiveCursor = 0;
+static HCURSOR hActiveCursorPM = 0;
 
 
@@ -329 +330 @@
 {
     dprintf2(("USER32: GetCursor"));
+    if(hActiveCursorPM && hActiveCursorPM != OSLibWinQueryPointer()) {
+       dprintf(("Another app changed mouse cursor"));
+       hActiveCursorPM = hActiveCursor = 0; 
+    }
     return hActiveCursor;
 }
@@ -338 +343 @@
 
     dprintf(("USER32: SetCursor %x (prev %x)", hCursor, hActiveCursor));
+    GetCursor();
     if (hCursor == hActiveCursor) return hActiveCursor;  /* No change */
 
@@ -355 +361 @@
         dprintf(("OSLibWinSetPointer %x returned FALSE!!", iconinfo->hColorBmp));
     }
+    hActiveCursorPM = iconinfo->hColorBmp;
     GlobalUnlock(hCursor);