* include/uxtheme.h: Include <commctrl.h>

2 files changed, 127 insertions, 121 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index cf19ace24..8a059c220 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,6 +1,10 @@
 2004-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	* basetyps.h (GUID_SECT): Define to nothimg for GCC >= 2.95.
+	* include/uxtheme.h: Include <commctrl.h>
+
+2004-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/basetyps.h (GUID_SECT): Define to nothimg for GCC >= 2.95.
 
 2004-03-02  Martin Fuchs  <martin-fuchs@gmx.net>
 
diff --git a/winsup/w32api/include/uxtheme.h b/winsup/w32api/include/uxtheme.h
index f7054bd44..cc52784f3 100644
--- a/winsup/w32api/include/uxtheme.h
+++ b/winsup/w32api/include/uxtheme.h
@@ -1,120 +1,122 @@
-#ifndef _UXTHEME_H

-#define _UXTHEME_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#if (_WIN32_WINNT >= 0x0501)

-#define DTBG_CLIPRECT 0x00000001

-#define DTBG_DRAWSOLID 0x00000002

-#define DTBG_OMITBORDER 0x00000004

-#define DTBG_OMITCONTENT 0x00000008

-#define DTBG_COMPUTINGREGION 0x00000010

-#define DTBG_MIRRORDC 0x00000020

-#define DTT_GRAYED 0x00000001

-#define ETDT_DISABLE 0x00000001

-#define ETDT_ENABLE 0x00000002

-#define ETDT_USETABTEXTURE 0x00000004

-#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE)

-#define STAP_ALLOW_NONCLIENT 0x00000001

-#define STAP_ALLOW_CONTROLS 0x00000002

-#define STAP_ALLOW_WEBCONTENT 0x00000004

-#define HTTB_BACKGROUNDSEG 0x0000  

-#define HTTB_FIXEDBORDER 0x0002

-#define HTTB_CAPTION 0x0004

-#define HTTB_RESIZINGBORDER_LEFT 0x0010

-#define HTTB_RESIZINGBORDER_TOP 0x0020

-#define HTTB_RESIZINGBORDER_RIGHT 0x0040

-#define HTTB_RESIZINGBORDER_BOTTOM 0x0080

-#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)

-#define HTTB_SIZINGTEMPLATE 0x0100

-#define HTTB_SYSTEMSIZINGMARGINS 0x0200

-

-typedef enum PROPERTYORIGIN {

-	PO_STATE = 0,

-	PO_PART = 1,

-	PO_CLASS = 2,

-	PO_GLOBAL = 3,

-	PO_NOTFOUND = 4

-} PROPERTYORIGIN;

-typedef enum THEMESIZE {

-	TS_MIN,

-	TS_TRUE,

-	TS_DRAW

-} THEME_SIZE;

-typedef struct _DTBGOPTS {

-	DWORD dwSize;

-	DWORD dwFlags;

-	RECT rcClip;

-} DTBGOPTS, *PDTBGOPTS;

-#define MAX_INTLIST_COUNT 10

-typedef struct _INTLIST {

-	int iValueCount;

-	int iValues[MAX_INTLIST_COUNT];

-} INTLIST, *PINTLIST;

-typedef struct _MARGINS {

-	int cxLeftWidth;

-	int cxRightWidth;

-	int cyTopHeight;

-	int cyBottomHeight;

-} MARGINS, *PMARGINS;

-typedef HANDLE HTHEME;

-

-HRESULT WINAPI CloseThemeData(HTHEME);

-HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);

-HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*,const DTBGOPTS*);

-HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT,RECT*);

-HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int);

-HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*);

-HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD,const RECT*);

-HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD);

-HRESULT WINAPI EnableTheming(BOOL);

-HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int);

-DWORD WINAPI GetThemeAppProperties();

-HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int,const RECT*,RECT*);

-HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*);

-HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);

-HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);

-HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);

-HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int);

-HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*);

-HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int);

-HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONT*);

-HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*);

-HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*);

-HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);

-HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);

-HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEME_SIZE,SIZE*);

-HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);

-HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*);

-HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*);

-HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int);

-BOOL WINAPI GetThemeSysBool(HTHEME,int);

-COLORREF WINAPI GetThemeSysColor(HTHEME,int);

-HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int);

-HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONT*);

-HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*);

-int WINAPI GetThemeSysSize(HTHEME,int);

-HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int);

-HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,const RECT*,RECT*);

-HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRIC*);

-HTHEME WINAPI GetWindowTheme(HWND);

-HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*,HRGN,POINT,WORD*);

-BOOL WINAPI IsAppThemed();

-BOOL WINAPI IsThemeActive();

-BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int);

-BOOL WINAPI IsThemeDialogTextureEnabled(HWND);

-BOOL WINAPI IsThemePartDefined(HTHEME,int,int);

-HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);

-void WINAPI SetThemeAppProperties(DWORD);

-HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

+#ifndef _UXTHEME_H
+#define _UXTHEME_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#include <commctrl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if (_WIN32_WINNT >= 0x0501)
+#define DTBG_CLIPRECT 0x00000001
+#define DTBG_DRAWSOLID 0x00000002
+#define DTBG_OMITBORDER 0x00000004
+#define DTBG_OMITCONTENT 0x00000008
+#define DTBG_COMPUTINGREGION 0x00000010
+#define DTBG_MIRRORDC 0x00000020
+#define DTT_GRAYED 0x00000001
+#define ETDT_DISABLE 0x00000001
+#define ETDT_ENABLE 0x00000002
+#define ETDT_USETABTEXTURE 0x00000004
+#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE)
+#define STAP_ALLOW_NONCLIENT 0x00000001
+#define STAP_ALLOW_CONTROLS 0x00000002
+#define STAP_ALLOW_WEBCONTENT 0x00000004
+#define HTTB_BACKGROUNDSEG 0x0000  
+#define HTTB_FIXEDBORDER 0x0002
+#define HTTB_CAPTION 0x0004
+#define HTTB_RESIZINGBORDER_LEFT 0x0010
+#define HTTB_RESIZINGBORDER_TOP 0x0020
+#define HTTB_RESIZINGBORDER_RIGHT 0x0040
+#define HTTB_RESIZINGBORDER_BOTTOM 0x0080
+#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
+#define HTTB_SIZINGTEMPLATE 0x0100
+#define HTTB_SYSTEMSIZINGMARGINS 0x0200
+
+typedef enum PROPERTYORIGIN {
+	PO_STATE = 0,
+	PO_PART = 1,
+	PO_CLASS = 2,
+	PO_GLOBAL = 3,
+	PO_NOTFOUND = 4
+} PROPERTYORIGIN;
+typedef enum THEMESIZE {
+	TS_MIN,
+	TS_TRUE,
+	TS_DRAW
+} THEME_SIZE;
+typedef struct _DTBGOPTS {
+	DWORD dwSize;
+	DWORD dwFlags;
+	RECT rcClip;
+} DTBGOPTS, *PDTBGOPTS;
+#define MAX_INTLIST_COUNT 10
+typedef struct _INTLIST {
+	int iValueCount;
+	int iValues[MAX_INTLIST_COUNT];
+} INTLIST, *PINTLIST;
+typedef struct _MARGINS {
+	int cxLeftWidth;
+	int cxRightWidth;
+	int cyTopHeight;
+	int cyBottomHeight;
+} MARGINS, *PMARGINS;
+typedef HANDLE HTHEME;
+
+HRESULT WINAPI CloseThemeData(HTHEME);
+HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);
+HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*,const DTBGOPTS*);
+HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT,RECT*);
+HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int);
+HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*);
+HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD,const RECT*);
+HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD);
+HRESULT WINAPI EnableTheming(BOOL);
+HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int);
+DWORD WINAPI GetThemeAppProperties();
+HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int,const RECT*,RECT*);
+HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*);
+HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);
+HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);
+HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);
+HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int);
+HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*);
+HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int);
+HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONT*);
+HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*);
+HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*);
+HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);
+HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);
+HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEME_SIZE,SIZE*);
+HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);
+HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*);
+HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*);
+HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int);
+BOOL WINAPI GetThemeSysBool(HTHEME,int);
+COLORREF WINAPI GetThemeSysColor(HTHEME,int);
+HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int);
+HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONT*);
+HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*);
+int WINAPI GetThemeSysSize(HTHEME,int);
+HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int);
+HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,const RECT*,RECT*);
+HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRIC*);
+HTHEME WINAPI GetWindowTheme(HWND);
+HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*,HRGN,POINT,WORD*);
+BOOL WINAPI IsAppThemed();
+BOOL WINAPI IsThemeActive();
+BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int);
+BOOL WINAPI IsThemeDialogTextureEnabled(HWND);
+BOOL WINAPI IsThemePartDefined(HTHEME,int,int);
+HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
+void WINAPI SetThemeAppProperties(DWORD);
+HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif