From c7d39318631b2cea23fabc87aecd0fbc74be0d4e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 18 Apr 2001 17:41:57 +0000 Subject: [PATCH] Moved DCX_* constants to winuser.h. --- include/dce.h | 13 +------------ include/wingdi.h | 11 ----------- include/winuser.h | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/include/dce.h b/include/dce.h index b32ea653649..3c386817855 100644 --- a/include/dce.h +++ b/include/dce.h @@ -11,16 +11,7 @@ struct tagWND; -/* additional DCX flags - */ - -#define DCX_NORESETATTR 0x00000004 -#define DCX_EXCLUDEUPDATE 0x00000100 -#define DCX_INTERSECTUPDATE 0x00000200 -#define DCX_LOCKWINDOWUPDATE 0x00000400 -#define DCX_NORECOMPUTE 0x00100000 -#define DCX_VALIDATE 0x00200000 - +/* internal DCX flags */ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 @@ -47,8 +38,6 @@ typedef struct tagDCE DWORD DCXflags; } DCE; - -extern void DCE_Init(void); extern DCE* DCE_AllocDCE( HWND hWnd, DCE_TYPE type ); extern DCE* DCE_FreeDCE( DCE *dce ); extern void DCE_FreeWindowDCE( struct tagWND* ); diff --git a/include/wingdi.h b/include/wingdi.h index c02e428d91c..90963ec5cb7 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1429,17 +1429,6 @@ typedef struct tagEXTLOGPEN #define RGN_MAX RGN_COPY /* Device contexts */ -/* GetDCEx flags */ -#define DCX_WINDOW 0x00000001 -#define DCX_CACHE 0x00000002 -#define DCX_CLIPCHILDREN 0x00000008 -#define DCX_CLIPSIBLINGS 0x00000010 -#define DCX_PARENTCLIP 0x00000020 -#define DCX_EXCLUDERGN 0x00000040 -#define DCX_INTERSECTRGN 0x00000080 -#define DCX_LOCKWINDOWUPDATE 0x00000400 -#define DCX_USESTYLE 0x00010000 - /* Polygon modes */ #define ALTERNATE 1 #define WINDING 2 diff --git a/include/winuser.h b/include/winuser.h index af1b9cb9a79..e39ddffe2e8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2585,6 +2585,22 @@ DECL_WINELIB_TYPE_AW(LPICONMETRICS) #define HWND_NOTOPMOST ((HWND)-2) #define HWND_MESSAGE ((HWND)-3) +/* GetDCEx flags */ +#define DCX_WINDOW 0x00000001 +#define DCX_CACHE 0x00000002 +#define DCX_NORESETATTRS 0x00000004 +#define DCX_CLIPCHILDREN 0x00000008 +#define DCX_CLIPSIBLINGS 0x00000010 +#define DCX_PARENTCLIP 0x00000020 +#define DCX_EXCLUDERGN 0x00000040 +#define DCX_INTERSECTRGN 0x00000080 +#define DCX_EXCLUDEUPDATE 0x00000100 +#define DCX_INTERSECTUPDATE 0x00000200 +#define DCX_LOCKWINDOWUPDATE 0x00000400 +#define DCX_USESTYLE 0x00010000 +#define DCX_NORECOMPUTE 0x00100000 +#define DCX_VALIDATE 0x00200000 + #define MF_INSERT 0x0000 #define MF_CHANGE 0x0080 #define MF_APPEND 0x0100