Changeset 5728 for trunk/src


Ignore:
Timestamp:
May 17, 2001, 1:25:49 PM (24 years ago)
Author:
sandervl
Message:

SetCursor fix

Location:
trunk/src/user32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/oslibres.cpp

    r5509 r5728  
    1 /* $Id: oslibres.cpp,v 1.13 2001-04-15 14:29:48 sandervl Exp $ */
     1/* $Id: oslibres.cpp,v 1.14 2001-05-17 11:25:48 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    473473//******************************************************************************
    474474//******************************************************************************
     475HANDLE  OSLibWinQueryPointer()
     476{
     477    return WinQueryPointer(HWND_DESKTOP);
     478}
     479//******************************************************************************
     480//******************************************************************************
    475481BOOL OSLibWinClipCursor(const RECT * pRect)
    476482{

  • trunk/src/user32/oslibres.h

    r5509 r5728  
    1 /* $Id: oslibres.h,v 1.7 2001-04-15 14:29:48 sandervl Exp $ */
     1/* $Id: oslibres.h,v 1.8 2001-05-17 11:25:48 sandervl Exp $ */
    22/*
    33 * Window GUI resource wrapper functions for OS/2
    … …  
    5252VOID    OSLibWinDestroyPointer(HANDLE hPointer);
    5353BOOL    OSLibWinSetPointer(HANDLE hPointer);
     54HANDLE  OSLibWinQueryPointer();
    5455BOOL    OSLibWinClipCursor(const RECT * pRect);
    5556BOOL    OSLibWinGetClipCursor(LPRECT pRect);

  • trunk/src/user32/winicon.cpp

    r5509 r5728  
    1 /* $Id: winicon.cpp,v 1.22 2001-04-15 14:29:49 sandervl Exp $ */
     1/* $Id: winicon.cpp,v 1.23 2001-05-17 11:25:49 sandervl Exp $ */
    22/*
    33 * Win32 Icon Code for OS/2
    … …  
    8282static WORD    ICON_HOTSPOT  = 0x4242;
    8383static HCURSOR hActiveCursor = 0;
     84static HCURSOR hActiveCursorPM = 0;
    8485
    8586
    … …  
    329330{
    330331    dprintf2(("USER32: GetCursor"));
     332    if(hActiveCursorPM && hActiveCursorPM != OSLibWinQueryPointer()) {
     333       dprintf(("Another app changed mouse cursor"));
     334       hActiveCursorPM = hActiveCursor = 0;
     335    }
    331336    return hActiveCursor;
    332337}
    … …  
    338343
    339344    dprintf(("USER32: SetCursor %x (prev %x)", hCursor, hActiveCursor));
     345    GetCursor();
    340346    if (hCursor == hActiveCursor) return hActiveCursor;  /* No change */
    341347
    … …  
    355361        dprintf(("OSLibWinSetPointer %x returned FALSE!!", iconinfo->hColorBmp));
    356362    }
     363    hActiveCursorPM = iconinfo->hColorBmp;
    357364    GlobalUnlock(hCursor);
    358365
Note: See TracChangeset for help on using the changeset viewer.