Removed winuser16.h from x11drv.h.
This commit is contained in:
parent
fdedc34872
commit
e94e35431e
|
@ -17,6 +17,7 @@
|
||||||
#endif /* defined(HAVE_LIBXXSHM) */
|
#endif /* defined(HAVE_LIBXXSHM) */
|
||||||
#include "x11drv.h"
|
#include "x11drv.h"
|
||||||
|
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "bitmap.h"
|
#include "bitmap.h"
|
||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#include "dc.h"
|
#include "dc.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include "winuser.h"
|
||||||
#include "heap.h"
|
#include "heap.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "font.h"
|
#include "font.h"
|
||||||
|
|
|
@ -68,7 +68,7 @@ typedef struct
|
||||||
|
|
||||||
/* Cursors / Icons */
|
/* Cursors / Icons */
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagCURSORICONINFO
|
||||||
{
|
{
|
||||||
POINT16 ptHotSpot;
|
POINT16 ptHotSpot;
|
||||||
WORD nWidth;
|
WORD nWidth;
|
||||||
|
|
|
@ -648,7 +648,7 @@ typedef struct
|
||||||
|
|
||||||
/****** Window classes ******/
|
/****** Window classes ******/
|
||||||
|
|
||||||
typedef struct
|
typedef struct tagCREATESTRUCTA
|
||||||
{
|
{
|
||||||
LPVOID lpCreateParams;
|
LPVOID lpCreateParams;
|
||||||
HINSTANCE hInstance;
|
HINSTANCE hInstance;
|
||||||
|
@ -785,7 +785,7 @@ typedef struct
|
||||||
#define DBGFILL_STACK 0xf7
|
#define DBGFILL_STACK 0xf7
|
||||||
|
|
||||||
/* WM_WINDOWPOSCHANGING/CHANGED struct */
|
/* WM_WINDOWPOSCHANGING/CHANGED struct */
|
||||||
typedef struct
|
typedef struct tagWINDOWPOS
|
||||||
{
|
{
|
||||||
HWND hwnd;
|
HWND hwnd;
|
||||||
HWND hwndInsertAfter;
|
HWND hwndInsertAfter;
|
||||||
|
|
|
@ -14,14 +14,17 @@
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#endif /* !defined(X_DISPLAY_MISSING) */
|
#endif /* !defined(X_DISPLAY_MISSING) */
|
||||||
|
|
||||||
|
#include "winbase.h"
|
||||||
#include "gdi.h"
|
#include "gdi.h"
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "wine/winuser16.h"
|
|
||||||
|
|
||||||
struct tagCLASS;
|
struct tagCLASS;
|
||||||
struct tagDC;
|
struct tagDC;
|
||||||
struct tagDeviceCaps;
|
struct tagDeviceCaps;
|
||||||
struct tagWND;
|
struct tagWND;
|
||||||
|
struct tagCREATESTRUCTA;
|
||||||
|
struct tagWINDOWPOS;
|
||||||
|
struct tagCURSORICONINFO;
|
||||||
|
|
||||||
/* X physical pen */
|
/* X physical pen */
|
||||||
typedef struct
|
typedef struct
|
||||||
|
@ -316,7 +319,7 @@ extern int X11DRV_MONITOR_GetDepth(struct tagMONITOR *pMonitor);
|
||||||
|
|
||||||
extern struct _MOUSE_DRIVER X11DRV_MOUSE_Driver;
|
extern struct _MOUSE_DRIVER X11DRV_MOUSE_Driver;
|
||||||
|
|
||||||
extern void X11DRV_MOUSE_SetCursor(CURSORICONINFO *lpCursor);
|
extern void X11DRV_MOUSE_SetCursor(struct tagCURSORICONINFO *lpCursor);
|
||||||
extern void X11DRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
|
extern void X11DRV_MOUSE_MoveCursor(WORD wAbsX, WORD wAbsY);
|
||||||
|
|
||||||
/* X11 windows driver */
|
/* X11 windows driver */
|
||||||
|
@ -335,11 +338,11 @@ extern Window X11DRV_WND_GetXRootWindow(struct tagWND *wndPtr);
|
||||||
extern void X11DRV_WND_Initialize(struct tagWND *wndPtr);
|
extern void X11DRV_WND_Initialize(struct tagWND *wndPtr);
|
||||||
extern void X11DRV_WND_Finalize(struct tagWND *wndPtr);
|
extern void X11DRV_WND_Finalize(struct tagWND *wndPtr);
|
||||||
extern BOOL X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
|
extern BOOL X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
|
||||||
extern BOOL X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode);
|
extern BOOL X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, struct tagCREATESTRUCTA *cs, BOOL bUnicode);
|
||||||
extern BOOL X11DRV_WND_DestroyWindow(struct tagWND *pWnd);
|
extern BOOL X11DRV_WND_DestroyWindow(struct tagWND *pWnd);
|
||||||
extern struct tagWND *X11DRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
|
extern struct tagWND *X11DRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
|
||||||
extern void X11DRV_WND_ForceWindowRaise(struct tagWND *pWnd);
|
extern void X11DRV_WND_ForceWindowRaise(struct tagWND *pWnd);
|
||||||
extern void X11DRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS);
|
extern void X11DRV_WND_SetWindowPos(struct tagWND *wndPtr, const struct tagWINDOWPOS *winpos, BOOL bSMC_SETXPOS);
|
||||||
extern void X11DRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
|
extern void X11DRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
|
||||||
extern void X11DRV_WND_SetFocus(struct tagWND *wndPtr);
|
extern void X11DRV_WND_SetFocus(struct tagWND *wndPtr);
|
||||||
extern void X11DRV_WND_PreSizeMove(struct tagWND *wndPtr);
|
extern void X11DRV_WND_PreSizeMove(struct tagWND *wndPtr);
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#ifdef MALLOC_DEBUGGING
|
#ifdef MALLOC_DEBUGGING
|
||||||
# include <malloc.h>
|
# include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "winsock.h"
|
#include "winsock.h"
|
||||||
#include "heap.h"
|
#include "heap.h"
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include "ts_xlib.h"
|
#include "ts_xlib.h"
|
||||||
|
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "clipboard.h"
|
#include "clipboard.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "message.h"
|
#include "message.h"
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "ts_xresource.h"
|
#include "ts_xresource.h"
|
||||||
#include "ts_xutil.h"
|
#include "ts_xutil.h"
|
||||||
|
|
||||||
|
#include "wine/winuser16.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "message.h"
|
#include "message.h"
|
||||||
|
|
Loading…
Reference in New Issue