* doc/ttk_Geometry.3, doc/ttk_Theme.3, doc/ttk_button.n:

	* doc/ttk_checkbutton.n, doc/ttk_combobox.n, doc/ttk_dialog.n:
	* doc/ttk_entry.n, doc/ttk_frame.n, doc/ttk_image.n:
	* doc/ttk_intro.n, doc/ttk_label.n, doc/ttk_labelframe.n:
	* doc/ttk_menubutton.n, doc/ttk_notebook.n, doc/ttk_panedwindow.n:
	* doc/ttk_progressbar.n, doc/ttk_radiobutton.n, doc/ttk_scrollbar.n:
	* doc/ttk_separator.n, doc/ttk_sizegrip.n, doc/ttk_style.n:
	* doc/ttk_treeview.n, doc/ttk_widget.n,:
	* generic/ttk/ttk.decls, generic/ttk/ttkBlink.c:
	* generic/ttk/ttkButton.c, generic/ttk/ttkCache.c:
	* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c:
	* generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c:
	* generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c:
	* generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c:
	* generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c:
	* generic/ttk/ttkLayout.c, generic/ttk/ttkManager.c:
	* generic/ttk/ttkManager.h, generic/ttk/ttkNotebook.c:
	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c:
	* generic/ttk/ttkScale.c, generic/ttk/ttkScroll.c:
	* generic/ttk/ttkScrollbar.c, generic/ttk/ttkSeparator.c:
	* generic/ttk/ttkSquare.c, generic/ttk/ttkState.c:
	* generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c:
	* generic/ttk/ttkTagSet.c, generic/ttk/ttkTheme.c:
	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h:
	* generic/ttk/ttkTrace.c, generic/ttk/ttkTrack.c:
	* generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c:
	* generic/ttk/ttkWidget.h:
	* library/demos/ttk_demo.tcl, library/demos/ttk_iconlib.tcl:
	* library/demos/ttk_repeater.tcl:
	* library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl:
	* library/ttk/button.tcl, library/ttk/clamTheme.tcl:
	* library/ttk/classicTheme.tcl, library/ttk/combobox.tcl:
	* library/ttk/cursors.tcl, library/ttk/defaults.tcl:
	* library/ttk/dialog.tcl, library/ttk/entry.tcl:
	* library/ttk/fonts.tcl, library/ttk/icons.tcl:
	* library/ttk/keynav.tcl, library/ttk/menubutton.tcl:
	* library/ttk/notebook.tcl, library/ttk/panedwindow.tcl:
	* library/ttk/progress.tcl, library/ttk/scale.tcl:
	* library/ttk/scrollbar.tcl, library/ttk/sizegrip.tcl:
	* library/ttk/treeview.tcl, library/ttk/ttk.tcl:
	* library/ttk/utils.tcl, library/ttk/winTheme.tcl:
	* library/ttk/xpTheme.tcl:
	* macosx/ttkMacOSXTheme.c:
	* tests/ttk/all.tcl, tests/ttk/bwidget.test, tests/ttk/combobox.test:
	* tests/ttk/entry.test, tests/ttk/image.test:
	* tests/ttk/labelframe.test, tests/ttk/layout.test:
	* tests/ttk/misc.test, tests/ttk/notebook.test:
	* tests/ttk/panedwindow.test, tests/ttk/progressbar.test:
	* tests/ttk/scrollbar.test, tests/ttk/treetags.test:
	* tests/ttk/treeview.test, tests/ttk/ttk.test, tests/ttk/validate.test:
	* win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c:
	First import of Ttk themed Tk widgets as branched from tile 0.7.8

	* generic/tkInt.h, generic/tkWindow.c: add Ttk_Init call, copy
	tk classic widgets to ::tk namespace.
	* library/tk.tcl: add source of ttk/ttk.tcl, define $::ttk::library.
	* unix/Makefile.in, win/Makefile.in: add Ttk build bits
	* win/configure, win/configure.in: check for uxtheme.h (XP theme).

1 files changed, 998 insertions, 0 deletions

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
new file mode 100644
index 0000000..107aa55
--- /dev/null
+++ b/win/ttkWinXPTheme.c
@@ -0,0 +1,998 @@
+/*
+ * $Id: ttkWinXPTheme.c,v 1.1 2006/10/31 01:42:28 hobbs Exp $
+ *
+ * Tk theme engine which uses the Windows XP "Visual Styles" API
+ * Adapted from Georgios Petasis' XP theme patch.
+ *
+ * Copyright (c) 2003 by Georgios Petasis, petasis@iit.demokritos.gr.
+ * Copyright (c) 2003 by Joe English
+ * Copyright (c) 2003 by Pat Thoyts
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * See also:
+ *
+ * <URL: http://msdn.microsoft.com/library/en-us/
+ *  	shellcc/platform/commctls/userex/refentry.asp >
+ */
+
+#ifndef HAVE_UXTHEME_H
+/* Stub for platforms that lack the XP theme API headers: */
+#include <windows.h>
+#include <tcl.h>
+int XPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
+#else
+
+#define WINVER 0x0501	/* Requires Windows XP APIs */
+
+#include <windows.h>
+#include <uxtheme.h>
+#include <tmschema.h>
+
+#include <tkWinInt.h>
+
+#include "ttk/ttkTheme.h"
+
+typedef HTHEME  (STDAPICALLTYPE OpenThemeDataProc)(HWND hwnd,
+		 LPCWSTR pszClassList);
+typedef HRESULT (STDAPICALLTYPE CloseThemeDataProc)(HTHEME hTheme);
+typedef HRESULT (STDAPICALLTYPE DrawThemeBackgroundProc)(HTHEME hTheme,
+                 HDC hdc, int iPartId, int iStateId, const RECT *pRect,
+                 OPTIONAL const RECT *pClipRect);
+typedef HRESULT (STDAPICALLTYPE DrawThemeParentBackgroundProc)(HWND hwnd,
+                 HDC hdc, OPTIONAL const RECT *prc);
+typedef HRESULT (STDAPICALLTYPE DrawThemeEdgeProc)(HTHEME hTheme, HDC hdc,
+		 int iPartId, int iStateId, const RECT *pDestRect,
+		 UINT uEdge, UINT uFlags, RECT *pContentRect);
+typedef HRESULT (STDAPICALLTYPE DrawThemeTextProc)(HTHEME hTheme, HDC hdc,
+		 int iPartId, int iStateId, LPCWSTR pszText, int iCharCount,
+		 DWORD dwTextFlags, DWORD dwTextFlags2, const RECT *pRect);
+typedef HRESULT	(STDAPICALLTYPE GetThemeMarginsProc)(HTHEME, HDC,
+		 int iPartId, int iStateId, int iPropId,
+		 OPTIONAL RECT *prc, MARGINS *pMargins);
+typedef HRESULT	(STDAPICALLTYPE GetThemePartSizeProc)(HTHEME,HDC,
+		 int iPartId, int iStateId,
+		 RECT *prc, enum THEMESIZE eSize, SIZE *psz);
+typedef HRESULT (STDAPICALLTYPE GetThemeTextExtentProc)(HTHEME hTheme, HDC hdc,
+		 int iPartId, int iStateId, LPCWSTR pszText, int iCharCount,
+		 DWORD dwTextFlags, const RECT *pBoundingRect, RECT *pExtentRect);
+typedef BOOL    (STDAPICALLTYPE IsThemeActiveProc)(VOID);
+
+typedef struct
+{
+    OpenThemeDataProc			*OpenThemeData;
+    CloseThemeDataProc			*CloseThemeData;
+    DrawThemeBackgroundProc		*DrawThemeBackground;
+    DrawThemeParentBackgroundProc	*DrawThemeParentBackground;
+    DrawThemeEdgeProc			*DrawThemeEdge;
+    DrawThemeTextProc		        *DrawThemeText;
+    GetThemePartSizeProc		*GetThemePartSize;
+    GetThemeTextExtentProc		*GetThemeTextExtent;
+    IsThemeActiveProc                   *IsThemeActive;
+
+    HWND                                stubWindow;
+} XPThemeProcs;
+
+typedef struct
+{
+    HINSTANCE hlibrary;
+    XPThemeProcs *procs;
+} XPThemeData;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * LoadXPThemeProcs --
+ *	Initialize XP theming support.
+ *
+ *	XP theme support is included in UXTHEME.DLL
+ *	We dynamically load this DLL at runtime instead of linking
+ *	to it at build-time.
+ *
+ * Returns:
+ *	A pointer to an XPThemeProcs table if successful, NULL otherwise.
+ */
+
+static XPThemeProcs *
+LoadXPThemeProcs(HINSTANCE *phlib)
+{
+    OSVERSIONINFO os;
+
+    /*
+     * We have to check whether we are running at least on Windows XP.
+     * In order to determine this we call GetVersionEx directly, although
+     * it would be a good idea to wrap it inside a function similar to
+     * TkWinGetPlatformId...
+     */
+    ZeroMemory(&os, sizeof(os));
+    os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    GetVersionEx(&os);
+    if (os.dwMajorVersion >= 5 && os.dwMinorVersion >= 1) {
+	/*
+	 * We are running under Windows XP or a newer version.
+	 * Load the library "uxtheme.dll", where the native widget
+	 * drawing routines are implemented.
+	 */
+	HINSTANCE handle;
+	*phlib = handle = LoadLibrary("uxtheme.dll");
+	if (handle != 0)
+	{
+	    /*
+	     * We have successfully loaded the library. Proceed in storing the
+	     * addresses of the functions we want to use.
+	     */
+	    XPThemeProcs *procs = (XPThemeProcs*)ckalloc(sizeof(XPThemeProcs));
+#define LOADPROC(name) \
+	(0 != (procs->name = (name ## Proc *)GetProcAddress(handle, #name) ))
+
+	    if (   LOADPROC(OpenThemeData)
+		&& LOADPROC(CloseThemeData)
+		&& LOADPROC(DrawThemeBackground)
+		&& LOADPROC(DrawThemeParentBackground)
+		&& LOADPROC(DrawThemeEdge)
+		&& LOADPROC(DrawThemeText)
+		&& LOADPROC(GetThemePartSize)
+		&& LOADPROC(GetThemeTextExtent)
+		&& LOADPROC(IsThemeActive)
+	    )
+	    {
+		return procs;
+	    }
+#undef LOADPROC
+	    ckfree((char*)procs);
+	}
+    }
+    return 0;
+}
+
+/*
+ * XPThemeDeleteProc --
+ *
+ *      Release any theme allocated resources.
+ */
+
+static void
+XPThemeDeleteProc(void *clientData)
+{
+    XPThemeData *themeData = clientData;
+    FreeLibrary(themeData->hlibrary);
+    ckfree(clientData);
+}
+
+static int
+XPThemeEnabled(Ttk_Theme theme, void *clientData)
+{
+    XPThemeData *themeData = clientData;
+    return themeData->procs->IsThemeActive();
+}
+
+/*
+ * BoxToRect --
+ * 	Helper routine.  Returns a RECT data structure.
+ */
+static RECT
+BoxToRect(Ttk_Box b)
+{
+    RECT rc;
+    rc.top = b.y;
+    rc.left = b.x;
+    rc.bottom = b.y + b.height;
+    rc.right = b.x + b.width;
+    return rc;
+}
+
+/*
+ * Map Tk state bitmaps to XP style enumerated values.
+ */
+static Ttk_StateTable null_statemap[] = { {0,0,0} };
+
+/*
+ * Pushbuttons (Tk: "Button")
+ */
+static Ttk_StateTable pushbutton_statemap[] =
+{
+    { PBS_DISABLED, 	TTK_STATE_DISABLED, 0 },
+    { PBS_PRESSED, 	TTK_STATE_PRESSED, 0 },
+    { PBS_HOT,		TTK_STATE_ACTIVE, 0 },
+    { PBS_DEFAULTED,	TTK_STATE_ALTERNATE, 0 },
+    { PBS_NORMAL, 	0, 0 }
+};
+
+/*
+ * Checkboxes (Tk: "Checkbutton")
+ *
+ * Missing: CBS_MIXEDDISABLED CBS_MIXEDHOT CBS_MIXEDNORMAL CBS_MIXEDPRESSED
+ */
+static Ttk_StateTable checkbox_statemap[] =
+{
+{CBS_CHECKEDDISABLED,	TTK_STATE_DISABLED|TTK_STATE_SELECTED, 0},
+{CBS_CHECKEDPRESSED,	TTK_STATE_PRESSED|TTK_STATE_SELECTED, 0},
+{CBS_CHECKEDHOT,	TTK_STATE_ACTIVE|TTK_STATE_SELECTED, 0},
+{CBS_CHECKEDNORMAL,	TTK_STATE_SELECTED, 0},
+{CBS_UNCHECKEDDISABLED,	TTK_STATE_DISABLED, TTK_STATE_SELECTED},
+{CBS_UNCHECKEDPRESSED,	TTK_STATE_PRESSED, TTK_STATE_SELECTED},
+{CBS_UNCHECKEDHOT,	TTK_STATE_ACTIVE, TTK_STATE_SELECTED},
+{CBS_UNCHECKEDNORMAL,	0,0 }
+};
+
+/*
+ * Radiobuttons:
+ */
+static Ttk_StateTable radiobutton_statemap[] =
+{
+{RBS_CHECKEDDISABLED,	TTK_STATE_DISABLED|TTK_STATE_SELECTED, 0},
+{RBS_CHECKEDPRESSED,	TTK_STATE_PRESSED|TTK_STATE_SELECTED, 0},
+{RBS_CHECKEDHOT,	TTK_STATE_ACTIVE|TTK_STATE_SELECTED, 0},
+{RBS_CHECKEDNORMAL,	TTK_STATE_SELECTED, 0},
+{RBS_UNCHECKEDDISABLED,	TTK_STATE_DISABLED, TTK_STATE_SELECTED},
+{RBS_UNCHECKEDPRESSED,	TTK_STATE_PRESSED, TTK_STATE_SELECTED},
+{RBS_UNCHECKEDHOT,	TTK_STATE_ACTIVE, TTK_STATE_SELECTED},
+{RBS_UNCHECKEDNORMAL,	0,0 }
+};
+
+/*
+ * Groupboxes (tk: "frame")
+ */
+static Ttk_StateTable groupbox_statemap[] =
+{
+{GBS_DISABLED,	TTK_STATE_DISABLED, 0},
+{GBS_NORMAL,	0,0 }
+};
+
+/*
+ * Edit fields (tk: "entry")
+ */
+static Ttk_StateTable edittext_statemap[] = 
+{
+    { ETS_DISABLED,	TTK_STATE_DISABLED, 0 },
+    { ETS_READONLY,	TTK_STATE_READONLY, 0 },
+    { ETS_FOCUSED,	TTK_STATE_FOCUS, 0 },
+    { ETS_HOT,		TTK_STATE_ACTIVE, 0 },
+    { ETS_NORMAL,	0, 0 }
+/* NOT USED: ETS_ASSIST, ETS_SELECTED */
+};
+
+/*
+ * Combobox text field statemap: 
+ * Same as edittext_statemap, but doesn't use ETS_READONLY 
+ * (fixes: #1032409)
+ */
+static Ttk_StateTable combotext_statemap[] = 
+{
+    { ETS_DISABLED,	TTK_STATE_DISABLED, 0 },
+    { ETS_FOCUSED,	TTK_STATE_FOCUS, 0 },
+    { ETS_HOT,		TTK_STATE_ACTIVE, 0 },
+    { ETS_NORMAL,	0, 0 }
+};
+
+/*
+ * Combobox button: (CBP_DROPDOWNBUTTON)
+ */
+static Ttk_StateTable combobox_statemap[] = {
+    { CBXS_DISABLED,	TTK_STATE_DISABLED, 0 },
+    { CBXS_PRESSED, 	TTK_STATE_PRESSED, 0 },
+    { CBXS_HOT, 	TTK_STATE_ACTIVE, 0 },
+    { CBXS_NORMAL, 	0, 0 }
+};
+
+/*
+ * Toolbar buttons (TP_BUTTON):
+ */
+static Ttk_StateTable toolbutton_statemap[] =  {
+    { TS_DISABLED, 	TTK_STATE_DISABLED, 0 },
+    { TS_PRESSED,	TTK_STATE_PRESSED, 0 },
+    { TS_HOTCHECKED,	TTK_STATE_SELECTED|TTK_STATE_ACTIVE, 0 },
+    { TS_CHECKED, 	TTK_STATE_SELECTED, 0 },
+    { TS_HOT,  		TTK_STATE_ACTIVE, 0 },
+    { TS_NORMAL, 	0,0 }
+};
+
+/*
+ * Scrollbars (Tk: "Scrollbar.thumb")
+ */
+static Ttk_StateTable scrollbar_statemap[] =
+{
+    { SCRBS_DISABLED, 	TTK_STATE_DISABLED, 0 },
+    { SCRBS_PRESSED, 	TTK_STATE_PRESSED, 0 },
+    { SCRBS_HOT,	TTK_STATE_ACTIVE, 0 },
+    { SCRBS_NORMAL, 	0, 0 }
+};
+
+static Ttk_StateTable uparrow_statemap[] =
+{
+    { ABS_UPDISABLED,	TTK_STATE_DISABLED, 0 },
+    { ABS_UPPRESSED, 	TTK_STATE_PRESSED, 0 },
+    { ABS_UPHOT,	TTK_STATE_ACTIVE, 0 },
+    { ABS_UPNORMAL, 	0, 0 }
+};
+
+static Ttk_StateTable downarrow_statemap[] =
+{
+    { ABS_DOWNDISABLED,	TTK_STATE_DISABLED, 0 },
+    { ABS_DOWNPRESSED, 	TTK_STATE_PRESSED, 0 },
+    { ABS_DOWNHOT,	TTK_STATE_ACTIVE, 0 },
+    { ABS_DOWNNORMAL, 	0, 0 }
+};
+
+static Ttk_StateTable leftarrow_statemap[] =
+{
+    { ABS_LEFTDISABLED,	TTK_STATE_DISABLED, 0 },
+    { ABS_LEFTPRESSED, 	TTK_STATE_PRESSED, 0 },
+    { ABS_LEFTHOT,	TTK_STATE_ACTIVE, 0 },
+    { ABS_LEFTNORMAL, 	0, 0 }
+};
+
+static Ttk_StateTable rightarrow_statemap[] =
+{
+    { ABS_RIGHTDISABLED,TTK_STATE_DISABLED, 0 },
+    { ABS_RIGHTPRESSED, TTK_STATE_PRESSED, 0 },
+    { ABS_RIGHTHOT,	TTK_STATE_ACTIVE, 0 },
+    { ABS_RIGHTNORMAL, 	0, 0 }
+};
+
+/*
+ * Trackbar thumb: (Tk: "scale slider")
+ */
+static Ttk_StateTable scale_statemap[] =
+{
+    { TUS_DISABLED, 	TTK_STATE_DISABLED, 0 },
+    { TUS_PRESSED, 	TTK_STATE_PRESSED, 0 },
+    { TUS_FOCUSED, 	TTK_STATE_FOCUS, 0 },
+    { TUS_HOT,		TTK_STATE_ACTIVE, 0 },
+    { TUS_NORMAL, 	0, 0 }
+};
+
+static Ttk_StateTable tabitem_statemap[] =
+{
+    { TIS_DISABLED,     TTK_STATE_DISABLED, 0 },
+    { TIS_SELECTED,     TTK_STATE_SELECTED, 0 },
+    { TIS_HOT,          TTK_STATE_ACTIVE,   0 },
+    { TIS_FOCUSED,      TTK_STATE_FOCUS,    0 },
+    { TIS_NORMAL,       0,                  0 },
+};
+
+
+/*
+ *----------------------------------------------------------------------
+ * +++ Element data:
+ *
+ * The following structure is passed as the 'clientData' pointer
+ * to most elements in this theme.  It contains data relevant
+ * to a single XP Theme "part".
+ *
+ * <<NOTE-GetThemeMargins>>: 
+ *	In theory, we should be call GetThemeMargins(...TMT_CONTENTRECT...)
+ *	to calculate the internal padding.  In practice, this routine
+ *	only seems to work properly for BP_PUSHBUTTON.  So we hardcode
+ *	the required padding at element registration time instead.
+ *
+ * <<NOTE-GetThemePartSize>>: 
+ *	This gives bogus metrics for some parts (in particular,
+ *	BP_PUSHBUTTONS).  Set the IGNORE_THEMESIZE flag to skip this call.
+ */
+
+typedef struct 	/* XP element specifications */
+{
+    const char	*elementName;	/* Tk theme engine element name */
+    Ttk_ElementSpec *elementSpec;	
+    				/* Element spec (usually GenericElementSpec) */
+    LPCWSTR	className;	/* Windows window class name */
+    int 	partId;		/* BP_PUSHBUTTON, BP_CHECKBUTTON, etc. */
+    Ttk_StateTable *statemap;	/* Map Tk states to XP states */
+    Ttk_Padding	padding;	/* See NOTE-GetThemeMargins */
+    int  	flags;		
+#   define 	IGNORE_THEMESIZE 0x1	/* See NOTE-GetThemePartSize */
+} ElementInfo;
+
+typedef struct
+{
+    /*
+     * Static data, initialized when element is registered:
+     */
+    ElementInfo	*info;
+    XPThemeProcs *procs;	/* Pointer to theme procedure table */
+
+    /*
+     * Dynamic data, allocated by InitElementData:
+     */
+    HTHEME	hTheme;
+    HDC		hDC;
+    HWND	hwnd;
+
+    /* For TkWinDrawableReleaseDC: */
+    Drawable	drawable;
+    TkWinDCState dcState;
+} ElementData;
+
+static ElementData *
+NewElementData(XPThemeProcs *procs, ElementInfo *info)
+{
+    ElementData *elementData = (ElementData*)ckalloc(sizeof(ElementData));
+
+    elementData->procs = procs;
+    elementData->info = info;
+    elementData->hTheme = elementData->hDC = 0;
+
+    return elementData;
+}
+
+static void DestroyElementData(void *elementData)
+{
+    ckfree(elementData);
+}
+
+/*
+ * InitElementData --
+ * 	Looks up theme handle.  If Drawable argument is non-NULL,
+ * 	also initializes DC.
+ *
+ * Returns:
+ * 	1 on success, 0 on error.
+ * 	Caller must later call FreeElementData() so this element
+ * 	can be reused.
+ */
+
+static int
+InitElementData(ElementData *elementData, Tk_Window tkwin, Drawable d)
+{
+    Window win = Tk_WindowId(tkwin);
+
+    if (win != None) {
+	elementData->hwnd = Tk_GetHWND(win);
+    } else  {
+	elementData->hwnd = elementData->procs->stubWindow;
+    }
+
+    elementData->hTheme = elementData->procs->OpenThemeData(
+	elementData->hwnd, elementData->info->className);
+
+    if (!elementData->hTheme)
+	return 0;
+
+    elementData->drawable = d;
+    if (d != 0) {
+	elementData->hDC = TkWinGetDrawableDC(Tk_Display(tkwin), d,
+	    &elementData->dcState);
+    }
+
+    return 1;
+}
+
+static void
+FreeElementData(ElementData *elementData)
+{
+    elementData->procs->CloseThemeData(elementData->hTheme);
+    if (elementData->drawable != 0) {
+	TkWinReleaseDrawableDC(
+	    elementData->drawable, elementData->hDC, &elementData->dcState);
+    }
+}
+
+/*----------------------------------------------------------------------
+ * +++ Generic element implementation.
+ * 
+ * Used for elements which are handled entirely by the XP Theme API,
+ * such as radiobutton and checkbutton indicators, scrollbar arrows, etc.
+ */
+
+static void
+GenericElementGeometry(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
+{
+    ElementData *elementData = clientData;
+    HRESULT result;
+    SIZE size;
+
+    if (!InitElementData(elementData, tkwin, 0))
+	return;
+
+    if (!(elementData->info->flags & IGNORE_THEMESIZE)) {
+	result = elementData->procs->GetThemePartSize(
+	    elementData->hTheme,
+	    elementData->hDC,
+	    elementData->info->partId,
+	    Ttk_StateTableLookup(elementData->info->statemap, 0),
+	    NULL /*RECT *prc*/,
+	    TS_TRUE,
+	    &size);
+
+	if (SUCCEEDED(result)) {
+	    *widthPtr = size.cx;
+	    *heightPtr = size.cy;
+	} 
+    }
+
+    /* See NOTE-GetThemeMargins 
+     */
+    *paddingPtr = elementData->info->padding;
+}
+
+static void
+GenericElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
+{
+    ElementData *elementData = clientData;
+    RECT rc = BoxToRect(b);
+
+    if (!InitElementData(elementData, tkwin, d))
+	return;
+
+    elementData->procs->DrawThemeBackground(
+	elementData->hTheme,
+	elementData->hDC,
+	elementData->info->partId,
+	Ttk_StateTableLookup(elementData->info->statemap, state),
+	&rc,
+	NULL/*pContentRect*/);
+
+    FreeElementData(elementData);
+}
+
+static Ttk_ElementSpec GenericElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    NullElementOptions,
+    GenericElementGeometry,
+    GenericElementDraw
+};
+
+/*----------------------------------------------------------------------
+ * +++ Scrollbar thumb element.
+ *     Same as a GenericElement, but don't draw in the disabled state.
+ */
+
+static void
+ThumbElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
+{
+    ElementData *elementData = clientData;
+    unsigned stateId = Ttk_StateTableLookup(elementData->info->statemap, state);
+    RECT rc = BoxToRect(b);
+
+    /*
+     * Don't draw the thumb if we are disabled.
+     */
+    if (state & TTK_STATE_DISABLED)
+	return;
+
+    if (!InitElementData(elementData, tkwin, d))
+	return;
+
+    elementData->procs->DrawThemeBackground(elementData->hTheme,
+	elementData->hDC, elementData->info->partId, stateId,
+	&rc, NULL);
+
+    FreeElementData(elementData);
+}
+
+static Ttk_ElementSpec ThumbElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    NullElementOptions,
+    GenericElementGeometry,
+    ThumbElementDraw
+};
+
+/*----------------------------------------------------------------------
+ * +++ Progress bar element.
+ *	Increases the requested length of PP_CHUNK and PP_CHUNKVERT parts
+ *	so that indeterminate progress bars show 3 bars instead of 1.   
+ */
+
+static void PbarElementGeometry(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
+{
+    ElementData *elementData = clientData;
+    int nBars = 3;
+
+    GenericElementGeometry(clientData, elementRecord, tkwin,
+    	widthPtr, heightPtr, paddingPtr);
+
+    if (elementData->info->partId == PP_CHUNK) {
+    	*widthPtr *= nBars;
+    } else if (elementData->info->partId == PP_CHUNKVERT) {
+    	*heightPtr *= nBars;
+    }
+}
+
+static Ttk_ElementSpec PbarElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    NullElementOptions,
+    PbarElementGeometry,
+    GenericElementDraw
+};
+
+/*----------------------------------------------------------------------
+ * +++  Notebook tab element.
+ *	Same as generic element, with additional logic to select
+ *	proper iPartID for the leftmost tab.
+ * 	
+ *	Notes: TABP_TABITEMRIGHTEDGE (or TABP_TOPTABITEMRIGHTEDGE, 
+ * 	which appears to be identical) should be used if the
+ *	tab is exactly at the right edge of the notebook, but
+ *	not if it's simply the rightmost tab.  This information
+ * 	is not available.
+ *
+ *	The TIS_* and TTKS_* definitions are identical, so 
+ * 	we can use the same statemap no matter what the partId.
+ */
+static void TabElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
+{
+    ElementData *elementData = clientData;
+    int partId = elementData->info->partId;
+    RECT rc = BoxToRect(b);
+
+    if (!InitElementData(elementData, tkwin, d))
+	return;
+    if (state & TTK_STATE_USER1)
+	partId = TABP_TABITEMLEFTEDGE;
+    elementData->procs->DrawThemeBackground(
+	elementData->hTheme, elementData->hDC, partId,
+	Ttk_StateTableLookup(elementData->info->statemap, state), &rc, NULL);
+    FreeElementData(elementData);
+}
+
+static Ttk_ElementSpec TabElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    NullElementOptions,
+    GenericElementGeometry,
+    TabElementDraw
+};
+
+/*----------------------------------------------------------------------
+ * +++  Tree indicator element.
+ *
+ *	Generic element, but don't display at all if TTK_STATE_LEAF (=USER2) set
+ */
+
+#define TTK_STATE_OPEN TTK_STATE_USER1
+#define TTK_STATE_LEAF TTK_STATE_USER2
+
+static Ttk_StateTable header_statemap[] = 
+{
+    { HIS_PRESSED, 	TTK_STATE_PRESSED, 0 },
+    { HIS_HOT,  	TTK_STATE_ACTIVE, 0 },
+    { HIS_NORMAL, 	0,0 },
+};
+
+static Ttk_StateTable tvpglyph_statemap[] = 
+{
+    { GLPS_OPENED, 	TTK_STATE_OPEN, 0 },
+    { GLPS_CLOSED, 	0,0 },
+};
+
+static void TreeIndicatorElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
+{
+    if (!(state & TTK_STATE_LEAF)) {
+        GenericElementDraw(clientData,elementRecord,tkwin,d,b,state);
+    }
+}
+
+static Ttk_ElementSpec TreeIndicatorElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    NullElementOptions,
+    GenericElementGeometry,
+    TreeIndicatorElementDraw
+};
+
+#if BROKEN_TEXT_ELEMENT
+
+/*
+ *----------------------------------------------------------------------
+ * Text element (does not work yet).
+ *
+ * According to "Using Windows XP Visual Styles",  we need to select 
+ * a font into the DC before calling DrawThemeText().
+ * There's just no easy way to get an HFONT out of a Tk_Font.
+ * Maybe GetThemeFont() would work?
+ * 
+ */
+
+typedef struct
+{
+    Tcl_Obj *textObj;
+    Tcl_Obj *fontObj;
+} TextElement;
+
+static Ttk_ElementOptionSpec TextElementOptions[] =
+{
+    { "-text", TK_OPTION_STRING,
+	Tk_Offset(TextElement,textObj), "" },
+    { "-font", TK_OPTION_FONT,
+	Tk_Offset(TextElement,fontObj), DEFAULT_FONT },
+    { NULL }
+};
+
+static void
+TextElementGeometry(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
+{
+    TextElement *element = elementRecord;
+    ElementData *elementData = clientData;
+    RECT rc = {0, 0};
+    HRESULT hr = S_OK;
+
+    if (!InitElementData(elementData, tkwin, 0))
+	return;
+
+    hr = elementData->procs->GetThemeTextExtent(
+	    elementData->hTheme,
+	    elementData->hDC,
+	    elementData->info->partId,
+	    Ttk_StateTableLookup(elementData->info->statemap, 0),
+	    Tcl_GetUnicode(element->textObj),
+	    -1,
+	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    NULL,
+	    &rc);
+
+    if (SUCCEEDED(hr)) {
+	*widthPtr = rc.right - rc.left;
+	*heightPtr = rc.bottom - rc.top;
+    }
+    if (*widthPtr < 80) *widthPtr = 80;
+    if (*heightPtr < 20) *heightPtr = 20;
+
+    FreeElementData(elementData);
+}
+
+static void 
+TextElementDraw(
+    ClientData clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
+{
+    TextElement *element = elementRecord;
+    ElementData *elementData = clientData;
+    RECT rc = BoxToRect(b);
+    HRESULT hr = S_OK;
+
+    if (!InitElementData(elementData, tkwin, d))
+	return;
+
+    hr = elementData->procs->DrawThemeText(
+	    elementData->hTheme,
+	    elementData->hDC,
+	    elementData->info->partId,
+	    Ttk_StateTableLookup(elementData->info->statemap, state),
+	    Tcl_GetUnicode(element->textObj),
+	    -1,
+	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    (state & TTK_STATE_DISABLED) ? DTT_GRAYED : 0,
+	    &rc);
+    FreeElementData(elementData);
+}
+
+static Ttk_ElementSpec TextElementSpec =
+{
+    TK_STYLE_VERSION_2,
+    sizeof(TextElement),
+    TextElementOptions,
+    TextElementGeometry,
+    TextElementDraw
+};
+
+#endif	/* BROKEN_TEXT_ELEMENT */
+
+/*----------------------------------------------------------------------
+ * +++ Widget layouts:
+ */
+
+TTK_BEGIN_LAYOUT(ButtonLayout)
+    TTK_GROUP("Button.button", TTK_FILL_BOTH,
+	TTK_GROUP("Button.focus", TTK_FILL_BOTH, 
+	    TTK_GROUP("Button.padding", TTK_FILL_BOTH,
+		TTK_NODE("Button.label", TTK_FILL_BOTH))))
+TTK_END_LAYOUT
+
+TTK_BEGIN_LAYOUT(MenubuttonLayout)
+    TTK_NODE("Menubutton.dropdown", TTK_PACK_RIGHT|TTK_FILL_Y)
+    TTK_GROUP("Menubutton.button", TTK_PACK_RIGHT|TTK_EXPAND|TTK_FILL_BOTH,
+	    TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_X,
+	        TTK_NODE("Menubutton.label", 0)))
+TTK_END_LAYOUT
+
+TTK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
+    TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
+	TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_LEFT)
+	TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
+	TTK_GROUP("Horizontal.Scrollbar.thumb", TTK_FILL_BOTH|TTK_UNIT,
+	    TTK_NODE("Horizontal.Scrollbar.grip", 0)))
+TTK_END_LAYOUT
+
+TTK_BEGIN_LAYOUT(VerticalScrollbarLayout)
+    TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
+	TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_TOP)
+	TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
+	TTK_GROUP("Vertical.Scrollbar.thumb", TTK_FILL_BOTH|TTK_UNIT,
+	    TTK_NODE("Vertical.Scrollbar.grip", 0)))
+TTK_END_LAYOUT
+
+TTK_BEGIN_LAYOUT(VerticalScaleLayout)
+    TTK_GROUP("Scale.focus", TTK_EXPAND|TTK_FILL_BOTH,
+	TTK_GROUP("Vertical.Scale.trough", TTK_EXPAND|TTK_FILL_BOTH,
+	    TTK_NODE("Vertical.Scale.track", TTK_FILL_Y)
+	    TTK_NODE("Vertical.Scale.slider", TTK_PACK_TOP) ))
+TTK_END_LAYOUT
+
+TTK_BEGIN_LAYOUT(HorizontalScaleLayout)
+    TTK_GROUP("Scale.focus", TTK_EXPAND|TTK_FILL_BOTH,
+	TTK_GROUP("Horizontal.Scale.trough", TTK_EXPAND|TTK_FILL_BOTH,
+	    TTK_NODE("Horizontal.Scale.track", TTK_FILL_X) 
+	    TTK_NODE("Horizontal.Scale.slider", TTK_PACK_LEFT) ))
+TTK_END_LAYOUT
+
+/*----------------------------------------------------------------------
+ * +++ XP element info table: 
+ */
+
+#define PAD(l,t,r,b) {l,t,r,b}
+#define NOPAD {0,0,0,0}
+
+/* name spec className partId statemap padding flags */
+
+static ElementInfo ElementInfoTable[] = {
+    { "Checkbutton.indicator", &GenericElementSpec, L"BUTTON",
+    	BP_CHECKBOX, checkbox_statemap, PAD(0, 0, 4, 0), 0 },
+    { "Radiobutton.indicator", &GenericElementSpec, L"BUTTON",
+    	BP_RADIOBUTTON, radiobutton_statemap, PAD(0, 0, 4, 0), 0 },
+    { "Button.button", &GenericElementSpec, L"BUTTON",
+    	BP_PUSHBUTTON, pushbutton_statemap, PAD(3, 3, 3, 3), IGNORE_THEMESIZE },
+    { "Labelframe.border", &GenericElementSpec, L"BUTTON",
+    	BP_GROUPBOX, groupbox_statemap, PAD(2, 2, 2, 2), 0 },
+    { "Entry.field", &GenericElementSpec, L"EDIT", EP_EDITTEXT,
+    	edittext_statemap, PAD(1, 1, 1, 1), 0 },
+    { "Combobox.field", &GenericElementSpec, L"EDIT",
+	EP_EDITTEXT, combotext_statemap, PAD(1, 1, 1, 1), 0 },
+    { "Combobox.downarrow", &GenericElementSpec, L"COMBOBOX",
+	CP_DROPDOWNBUTTON, combobox_statemap, NOPAD, 0 },
+    { "Vertical.Scrollbar.trough", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_UPPERTRACKVERT, scrollbar_statemap, NOPAD, 0 },
+    { "Vertical.Scrollbar.thumb", &ThumbElementSpec, L"SCROLLBAR",
+    	SBP_THUMBBTNVERT, scrollbar_statemap, NOPAD, 0 },
+    { "Vertical.Scrollbar.grip", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_GRIPPERVERT, scrollbar_statemap, NOPAD, 0 },
+    { "Horizontal.Scrollbar.trough", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_UPPERTRACKHORZ, scrollbar_statemap, NOPAD, 0 },
+    { "Horizontal.Scrollbar.thumb", &ThumbElementSpec, L"SCROLLBAR",
+   	SBP_THUMBBTNHORZ, scrollbar_statemap, NOPAD, 0 },
+    { "Horizontal.Scrollbar.grip", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_GRIPPERHORZ, scrollbar_statemap, NOPAD, 0 },
+    { "Scrollbar.uparrow", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_ARROWBTN, uparrow_statemap, NOPAD, 0 },
+    { "Scrollbar.downarrow", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_ARROWBTN, downarrow_statemap, NOPAD, 0 },
+    { "Scrollbar.leftarrow", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_ARROWBTN, leftarrow_statemap, NOPAD, 0 },
+    { "Scrollbar.rightarrow", &GenericElementSpec, L"SCROLLBAR",
+    	SBP_ARROWBTN, rightarrow_statemap, NOPAD, 0 },
+    { "Horizontal.Scale.slider", &GenericElementSpec, L"TRACKBAR",
+    	TKP_THUMB, scale_statemap, NOPAD, 0 },
+    { "Vertical.Scale.slider", &GenericElementSpec, L"TRACKBAR",
+    	TKP_THUMBVERT, scale_statemap, NOPAD, 0 },
+    { "Horizontal.Scale.track", &GenericElementSpec, L"TRACKBAR",
+    	TKP_TRACK, scale_statemap, NOPAD, 0 },
+    { "Vertical.Scale.track", &GenericElementSpec, L"TRACKBAR",
+    	TKP_TRACKVERT, scale_statemap, NOPAD, 0 },
+    /* ttk::progressbar elements */
+    { "Horizontal.Progressbar.pbar", &PbarElementSpec, L"PROGRESS",
+    	PP_CHUNK, null_statemap, NOPAD, 0 },
+    { "Vertical.Progressbar.pbar", &PbarElementSpec, L"PROGRESS",
+    	PP_CHUNKVERT, null_statemap, NOPAD, 0 },
+    { "Horizontal.Progressbar.trough", &GenericElementSpec, L"PROGRESS",
+    	PP_BAR, null_statemap, PAD(3,3,3,3), IGNORE_THEMESIZE },
+    { "Vertical.Progressbar.trough", &GenericElementSpec, L"PROGRESS",
+    	PP_BARVERT, null_statemap, PAD(3,3,3,3), IGNORE_THEMESIZE },
+    /* ttk::notebook */
+    { "tab", &TabElementSpec, L"TAB",
+    	TABP_TABITEM, tabitem_statemap, PAD(3,3,3,0), 0 },
+    { "client", &GenericElementSpec, L"TAB", 
+    	TABP_PANE, null_statemap, PAD(1,1,3,3), 0 },
+    { "NotebookPane.background", &GenericElementSpec, L"TAB",
+    	TABP_BODY, null_statemap, NOPAD, 0 },
+    { "Toolbutton.border", &GenericElementSpec, L"TOOLBAR",
+    	TP_BUTTON, toolbutton_statemap, NOPAD,0 },
+    { "Menubutton.button", &GenericElementSpec, L"TOOLBAR",
+    	TP_SPLITBUTTON,toolbutton_statemap, NOPAD,0 },
+    { "Menubutton.dropdown", &GenericElementSpec, L"TOOLBAR",
+    	TP_SPLITBUTTONDROPDOWN,toolbutton_statemap, NOPAD,0 },
+    { "Treeitem.indicator", &TreeIndicatorElementSpec, L"TREEVIEW",
+    	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), 0 },
+    { "Treeheading.border", &GenericElementSpec, L"HEADER", 
+    	HP_HEADERITEM, header_statemap, PAD(4,0,4,0),0 },
+    { "sizegrip", &GenericElementSpec, L"STATUS", 
+    	SP_GRIPPER, null_statemap, NOPAD,0 },
+
+#if BROKEN_TEXT_ELEMENT
+    { "Labelframe.text", &TextElementSpec, L"BUTTON", 
+    	BP_GROUPBOX, groupbox_statemap, NOPAD,0 },
+#endif
+
+    { 0,0,0,0,0,NOPAD,0 }
+};
+#undef PAD
+
+/*----------------------------------------------------------------------
+ * +++ Initialization routine:
+ */
+
+int XPTheme_Init(Tcl_Interp *interp, HWND hwnd)
+{
+    XPThemeData *themeData;
+    XPThemeProcs *procs;
+    HINSTANCE hlibrary;
+    Ttk_Theme themePtr, parentPtr;
+    ElementInfo *infoPtr;
+
+    procs = LoadXPThemeProcs(&hlibrary);
+    if (!procs)
+	return TCL_ERROR;
+    procs->stubWindow = hwnd;
+
+    /*
+     * Create the new style engine.
+     */
+    parentPtr = Ttk_GetTheme(interp, "winnative");
+    themePtr = Ttk_CreateTheme(interp, "xpnative", parentPtr);
+
+    if (!themePtr)
+        return TCL_ERROR;
+
+    /*
+     * Set theme data and cleanup proc
+     */
+
+    themeData = (XPThemeData *)ckalloc(sizeof(XPThemeData));
+    themeData->procs = procs;
+    themeData->hlibrary = hlibrary;
+
+    Ttk_SetThemeEnabledProc(themePtr, XPThemeEnabled, themeData);
+    Ttk_RegisterCleanup(interp, themeData, XPThemeDeleteProc);
+
+    /*
+     * New elements:
+     */
+    for (infoPtr = ElementInfoTable; infoPtr->elementName != 0; ++infoPtr) {
+	ClientData clientData = NewElementData(procs, infoPtr);
+	Ttk_RegisterElementSpec(
+	    themePtr, infoPtr->elementName, infoPtr->elementSpec, clientData);
+	Ttk_RegisterCleanup(interp, clientData, DestroyElementData);
+    }
+
+    Ttk_RegisterElementSpec(themePtr, "Scale.trough", &NullElementSpec, 0);
+
+    /*
+     * Layouts:
+     */
+    Ttk_RegisterLayout(themePtr, "TButton", ButtonLayout);
+    Ttk_RegisterLayout(themePtr, "TMenubutton", MenubuttonLayout);
+    Ttk_RegisterLayout(themePtr, "Vertical.TScrollbar",
+    	VerticalScrollbarLayout);
+    Ttk_RegisterLayout(themePtr, "Horizontal.TScrollbar",
+    	HorizontalScrollbarLayout);
+    Ttk_RegisterLayout(themePtr, "Vertical.TScale", VerticalScaleLayout);
+    Ttk_RegisterLayout(themePtr, "Horizontal.TScale", HorizontalScaleLayout);
+
+    Tcl_PkgProvide(interp, "ttk::theme::xpnative", TTK_VERSION);
+
+    return TCL_OK;
+}
+
+#endif /* HAVE_UXTHEME_H */