user32: Merge caret.c into input.c.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b8732c80b1
commit
ba8024bfcd
|
@ -7,7 +7,6 @@ DELAYIMPORTS = hid setupapi imm32
|
|||
|
||||
C_SRCS = \
|
||||
button.c \
|
||||
caret.c \
|
||||
class.c \
|
||||
clipboard.c \
|
||||
combo.c \
|
||||
|
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* Caret functions
|
||||
*
|
||||
* Copyright 1993 David Metcalfe
|
||||
* Copyright 1996 Frans van Dorsselaer
|
||||
* Copyright 2001 Eric Pouech
|
||||
* Copyright 2002 Alexandre Julliard
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "ntuser.h"
|
||||
#include "user_private.h"
|
||||
#include "wine/server.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
/*****************************************************************
|
||||
* DestroyCaret (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI DestroyCaret(void)
|
||||
{
|
||||
return NtUserDestroyCaret();
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* SetCaretPos (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI SetCaretPos( INT x, INT y )
|
||||
{
|
||||
return NtUserSetCaretPos( x, y );
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* SetCaretBlinkTime (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI SetCaretBlinkTime( unsigned int time )
|
||||
{
|
||||
return NtUserSetCaretBlinkTime( time );
|
||||
}
|
|
@ -162,6 +162,33 @@ HWND WINAPI GetCapture(void)
|
|||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* DestroyCaret (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI DestroyCaret(void)
|
||||
{
|
||||
return NtUserDestroyCaret();
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* SetCaretPos (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI SetCaretPos( int x, int y )
|
||||
{
|
||||
return NtUserSetCaretPos( x, y );
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* SetCaretBlinkTime (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI SetCaretBlinkTime( unsigned int time )
|
||||
{
|
||||
return NtUserSetCaretBlinkTime( time );
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* GetInputState (USER32.@)
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue