mirror of
https://github.com/reactos/reactos.git
synced 2024-08-29 22:58:34 +00:00
revert my implementation of WM_SETCURSOR messages
svn path=/trunk/; revision=6759
This commit is contained in:
parent
57264c6ac9
commit
2314762543
|
@ -15,7 +15,6 @@ typedef struct _CURICON_OBJECT
|
||||||
ICONINFO IconInfo;
|
ICONINFO IconInfo;
|
||||||
} CURICON_OBJECT, *PCURICON_OBJECT;
|
} CURICON_OBJECT, *PCURICON_OBJECT;
|
||||||
|
|
||||||
LPARAM FASTCALL IntSendSetCursorMessage(PWINDOW_OBJECT Window, USHORT Msg, USHORT HitTest);
|
|
||||||
HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange);
|
HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange);
|
||||||
BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject);
|
BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject);
|
||||||
PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HICON hIcon);
|
PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HICON hIcon);
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: msgqueue.c,v 1.36 2003/11/23 11:39:48 navaraf Exp $
|
/* $Id: msgqueue.c,v 1.37 2003/11/23 12:08:00 weiden Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -269,10 +269,6 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
|
||||||
|
|
||||||
if (Window == NULL)
|
if (Window == NULL)
|
||||||
{
|
{
|
||||||
/* set default cursor */
|
|
||||||
if(CaptureWin == NULL)
|
|
||||||
IntSendSetCursorMessage(NULL, Msg, HTNOWHERE);
|
|
||||||
|
|
||||||
ExFreePool(Message);
|
ExFreePool(Message);
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
}
|
}
|
||||||
|
@ -312,11 +308,6 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
|
||||||
*ScreenPoint = Message->Msg.pt;
|
*ScreenPoint = Message->Msg.pt;
|
||||||
Point = Message->Msg.pt;
|
Point = Message->Msg.pt;
|
||||||
|
|
||||||
if(!CaptureWin && !IntSendSetCursorMessage(Window, Msg, *HitTest))
|
|
||||||
{
|
|
||||||
/* FIXME - what should we do here? */
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((*HitTest) != HTCLIENT)
|
if ((*HitTest) != HTCLIENT)
|
||||||
{
|
{
|
||||||
switch(Msg)
|
switch(Msg)
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: cursoricon.c,v 1.25 2003/11/23 11:39:48 navaraf Exp $ */
|
/* $Id: cursoricon.c,v 1.26 2003/11/23 12:08:00 weiden Exp $ */
|
||||||
|
|
||||||
#undef WIN32_LEAN_AND_MEAN
|
#undef WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
|
@ -63,21 +63,6 @@ IntCopyBitmap(HBITMAP bmp)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
LPARAM FASTCALL
|
|
||||||
IntSendSetCursorMessage(PWINDOW_OBJECT Window, USHORT Msg, USHORT HitTest)
|
|
||||||
{
|
|
||||||
/* FIXME - high-order word of lParam is 0 if we're in menu mode */
|
|
||||||
if(Window)
|
|
||||||
return IntSendMessage(Window->Self, WM_SETCURSOR, (WPARAM)Window->Self, MAKELPARAM(HitTest, Msg), FALSE);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* set default cursor */
|
|
||||||
IntLoadDefaultCursors(TRUE);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#define COLORCURSORS_ALLOWED FALSE
|
#define COLORCURSORS_ALLOWED FALSE
|
||||||
HCURSOR FASTCALL
|
HCURSOR FASTCALL
|
||||||
IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange)
|
IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange)
|
||||||
|
|
Loading…
Reference in a new issue