From ebfd1ae8f80dd16f99f9ef89c28a06f809d07f8d Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Aug 2012 11:13:44 +0200 Subject: Synchronised with xwin master branch --- xorg-server/hw/xwin/winwindow.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'xorg-server/hw/xwin/winwindow.h') diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index ce8157d8a..ffb744e66 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -69,7 +69,7 @@ typedef struct { DWORD dwDummy; HRGN hRgn; HWND hWnd; - BOOL OpenGlWindow; + BOOL OpenGlWindow; winPrivScreenPtr pScreenPriv; Bool fXKilled; HDWP hDwp; @@ -110,7 +110,7 @@ typedef struct _winWMMessageRec { #define WM_WM_KILL (WM_USER + 7) #define WM_WM_ACTIVATE (WM_USER + 8) #define WM_WM_NAME_EVENT (WM_USER + 9) -#define WM_WM_HINTS_EVENT (WM_USER + 10) +#define WM_WM_ICON_EVENT (WM_USER + 10) #define WM_WM_CHANGE_STATE (WM_USER + 11) #define WM_WM_MAP2 (WM_USER + 12) #define WM_WM_MAP3 (WM_USER + 13) @@ -166,14 +166,5 @@ winSetAppID (HWND hWnd, const char* AppID); * winmultiwindowicons.c */ -void - winUpdateIcon(Window id); - -void - winInitGlobalIcons(void); - -void - winDestroyIcon(HICON hIcon); - #endif /* XWIN_MULTIWINDOW */ #endif -- cgit v1.2.3