Move widget layout registration from TtkElements_Init()

to widget *_Init() routines.
Renaming/consistency: s/...ElementGeometry()/...ElementSize()/

3 files changed, 360 insertions, 522 deletions

diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 2c9229f..cdfc2e6 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWinMonitor.c,v 1.12 2007/09/08 16:13:45 dkf Exp $
+/* $Id: ttkWinMonitor.c,v 1.13 2007/10/25 07:08:26 jenglish Exp $
  */
 
 #ifdef _MSC_VER
@@ -56,9 +56,7 @@ static SystemColorEntry sysColors[] = {
 	{ NULL, 0 }
 };
 
-static void
-RegisterSystemColors(
-    Tcl_Interp *interp)
+static void RegisterSystemColors(Tcl_Interp *interp)
 {
     Ttk_ResourceCache cache = Ttk_GetResourceCache(interp);
     SystemColorEntry *sysColor;
@@ -74,14 +72,12 @@ RegisterSystemColors(
 }
 
 static HWND
-CreateThemeMonitorWindow(
-    HINSTANCE hinst,
-    Tcl_Interp *interp)
+CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
 {
     WNDCLASSEX wc;
-    HWND hwnd = NULL;
-    CHAR title[32] = "TtkMonitorWindow";
-    CHAR name[32] = "TtkMonitorClass";
+    HWND       hwnd = NULL;
+    CHAR       title[32] = "TtkMonitorWindow";
+    CHAR       name[32] = "TtkMonitorClass";
     
     wc.cbSize        = sizeof(WNDCLASSEX);
     wc.style         = CS_HREDRAW | CS_VREDRAW;
@@ -97,9 +93,9 @@ CreateThemeMonitorWindow(
     wc.lpszClassName = name;
 
     if (RegisterClassEx(&wc)) {
-	hwnd = CreateWindow(name, title, WS_OVERLAPPEDWINDOW,
-		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-		NULL, NULL, hinst, NULL);
+	hwnd = CreateWindow( name, title, WS_OVERLAPPEDWINDOW,
+	    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+	    NULL, NULL, hinst, NULL );
 #ifdef _WIN64
 	SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG)interp);
 #else
@@ -112,20 +108,14 @@ CreateThemeMonitorWindow(
 }
 
 static void 
-DestroyThemeMonitorWindow(
-    void *clientData)
+DestroyThemeMonitorWindow(void *clientData)
 {
     HWND hwnd = (HWND)clientData;
-
     DestroyWindow(hwnd);
 }
 
 static LRESULT WINAPI
-WndProc(
-    HWND hwnd,
-    UINT msg,
-    WPARAM wp,
-    LPARAM lp)
+WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
 {
 #ifdef _WIN64
     Tcl_Interp *interp = (Tcl_Interp *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
@@ -144,8 +134,9 @@ WndProc(
 
     case WM_THEMECHANGED:
 	/*
-	 * Reset the application theme to 'xpnative' if present, which will in
-	 * turn fall back to 'winnative' if XP theming is disabled.
+	 * Reset the application theme to 'xpnative' if present,
+	 * which will in turn fall back to 'winnative' if XP theming
+	 * is disabled.
 	 */
 
 	theme = Ttk_GetTheme(interp, "xpnative");
@@ -165,9 +156,7 @@ WndProc(
 MODULE_SCOPE int TtkWinTheme_Init(Tcl_Interp *, HWND hwnd);
 MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *, HWND hwnd);
 
-MODULE_SCOPE int
-Ttk_WinPlatformInit(
-    Tcl_Interp *interp)
+MODULE_SCOPE int Ttk_WinPlatformInit(Tcl_Interp *interp)
 {
     HWND hwnd;
 
@@ -179,11 +168,3 @@ Ttk_WinPlatformInit(
 
     return TCL_OK;
 }
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index a05c0de..41754ee 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -1,6 +1,6 @@
 /* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
  *
- * $Id: ttkWinTheme.c,v 1.7 2007/09/08 16:13:45 dkf Exp $
+ * $Id: ttkWinTheme.c,v 1.8 2007/10/25 07:08:26 jenglish Exp $
  */
 
 #ifdef _MSC_VER
@@ -16,18 +16,14 @@
 #endif
 
 #include "ttk/ttkTheme.h"
-
+
 /*
  * BoxToRect --
  * 	Helper routine.  Converts a Ttk_Box to a Win32 RECT.
  */
-
-static RECT
-BoxToRect(
-    Ttk_Box b)
+static RECT BoxToRect(Ttk_Box b)
 {
     RECT rc;
-
     rc.top = b.y;
     rc.left = b.x;
     rc.bottom = b.y + b.height;
@@ -37,39 +33,31 @@ BoxToRect(
 
 /*
  * ReliefToEdge --
- * 	Convert a Tk "relief" value into an Windows "edge" value. NB: Caller
- * 	must check for RELIEF_FLAT and RELIEF_SOLID, which must be handled
- * 	specially.
+ * 	Convert a Tk "relief" value into an Windows "edge" value.
+ * 	NB: Caller must check for RELIEF_FLAT and RELIEF_SOLID,
+ *	which must be handled specially.
  *
- *	Passing the BF_FLAT flag to DrawEdge() yields something similar to
- *	TK_RELIEF_SOLID. TK_RELIEF_FLAT can be implemented by not drawing
- *	anything.
+ *	Passing the BF_FLAT flag to DrawEdge() yields something similar
+ * 	to TK_RELIEF_SOLID. TK_RELIEF_FLAT can be implemented by not 
+ *	drawing anything.
  */
-
-static unsigned int
-ReliefToEdge(
-    int relief)
+static unsigned int ReliefToEdge(int relief)
 {
     switch (relief) {
-    case TK_RELIEF_RAISED:
-	return EDGE_RAISED;
-    case TK_RELIEF_SUNKEN:
-	return EDGE_SUNKEN;
-    case TK_RELIEF_RIDGE:
-	return EDGE_BUMP;
-    case TK_RELIEF_GROOVE:
-	return EDGE_ETCHED;
-    case TK_RELIEF_SOLID:
-	return BDR_RAISEDOUTER;
-    default:
-    case TK_RELIEF_FLAT:
-	return BDR_RAISEDOUTER;
+	case TK_RELIEF_RAISED: return EDGE_RAISED;
+	case TK_RELIEF_SUNKEN: return EDGE_SUNKEN;
+	case TK_RELIEF_RIDGE:  return EDGE_BUMP;
+	case TK_RELIEF_GROOVE: return EDGE_ETCHED;
+	case TK_RELIEF_SOLID:  return BDR_RAISEDOUTER;
+	default:
+	case TK_RELIEF_FLAT:   return BDR_RAISEDOUTER;
     }
 }
 
 /* ---------------------------------------------------------------------- */
 
-static Ttk_StateTable checkbutton_statemap[] = {
+static Ttk_StateTable checkbutton_statemap[] =
+{
     { DFCS_CHECKED|DFCS_INACTIVE, TTK_STATE_SELECTED|TTK_STATE_DISABLED, 0 },
     { DFCS_CHECKED|DFCS_PUSHED,   TTK_STATE_SELECTED|TTK_STATE_PRESSED, 0 },
     { DFCS_CHECKED,	          TTK_STATE_SELECTED, 0 },
@@ -78,24 +66,27 @@ static Ttk_StateTable checkbutton_statemap[] = {
     { 0, 0, 0 }
 };
 
-static Ttk_StateTable pushbutton_statemap[] = {
+static Ttk_StateTable pushbutton_statemap[] =
+{
     { DFCS_INACTIVE,	  TTK_STATE_DISABLED, 0 },
     { DFCS_PUSHED,	  TTK_STATE_PRESSED, 0 },
     { DFCS_HOT,		  TTK_STATE_ACTIVE, 0 },
     { 0, 0, 0 }
 };
 
-static Ttk_StateTable arrow_statemap[] = {
+static Ttk_StateTable arrow_statemap[] = 
+{
     { DFCS_INACTIVE,            TTK_STATE_DISABLED, 0 },
     { DFCS_PUSHED | DFCS_FLAT,  TTK_STATE_PRESSED,  0 },
     { 0, 0, 0 }
 };
-
+
 /*------------------------------------------------------------------------
  * +++ FrameControlElement --
  * 	General-purpose element for things drawn with DrawFrameControl
  */
-typedef struct {
+typedef struct
+{
     const char *name;		/* element name */
     int classId;		/* class id for DrawFrameControl */
     int partId;			/* part id for DrawFrameControl  */
@@ -105,7 +96,8 @@ typedef struct {
     Ttk_Padding padding;	/* additional placement padding */
 } FrameControlElementData;
 
-static FrameControlElementData FrameControlElements[] = {
+static FrameControlElementData FrameControlElements[] =
+{
     { "Checkbutton.indicator", 
 	DFC_BUTTON, DFCS_BUTTONCHECK, SM_CYMENUCHECK, SM_CYMENUCHECK,
 	checkbutton_statemap, {0,0,4,0} },
@@ -133,55 +125,46 @@ static FrameControlElementData FrameControlElements[] = {
 
 /* ---------------------------------------------------------------------- */
 
-static void
-FrameControlElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void FrameControlElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     FrameControlElementData *elementData = clientData;
-
     *widthPtr = GetSystemMetrics(elementData->cxId);
     *heightPtr = GetSystemMetrics(elementData->cyId);
     *paddingPtr = elementData->padding;
 }
 
-static void 
-FrameControlElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void FrameControlElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     FrameControlElementData *elementData = clientData;
     RECT rc = BoxToRect(b);
     TkWinDCState dcState;
     HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
 
-    DrawFrameControl(hdc, &rc, elementData->classId,
-	elementData->partId|Ttk_StateTableLookup(elementData->stateMap,state));
+    DrawFrameControl(hdc, &rc,
+	elementData->classId,
+	elementData->partId|Ttk_StateTableLookup(elementData->stateMap, state));
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec FrameControlElementSpec = {
+static Ttk_ElementSpec FrameControlElementSpec = 
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    FrameControlElementGeometry,
+    FrameControlElementSize,
     FrameControlElementDraw
 };
-
+
 /*----------------------------------------------------------------------
  * +++ Border element implementation.
  */
 
 typedef struct {
-    Tcl_Obj *reliefObj;
+    Tcl_Obj	*reliefObj;
 } BorderElement;
 
 static Ttk_ElementOptionSpec BorderElementOptions[] = {
@@ -189,27 +172,17 @@ static Ttk_ElementOptionSpec BorderElementOptions[] = {
     {NULL}
 };
 
-static void
-BorderElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void BorderElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE);
     paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE);
 }
 
-static void
-BorderElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void BorderElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     BorderElement *border = elementRecord;
     RECT rc = BoxToRect(b);
@@ -221,57 +194,49 @@ BorderElementDraw(
 
     if (relief != TK_RELIEF_FLAT) {
 	UINT xFlags = (relief == TK_RELIEF_SOLID) ? BF_FLAT : 0;
-
 	hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
 	DrawEdge(hdc, &rc, ReliefToEdge(relief), BF_RECT | xFlags);
 	TkWinReleaseDrawableDC(d, hdc, &dcState);
     }
 }
 
-static Ttk_ElementSpec BorderElementSpec = {
+static Ttk_ElementSpec BorderElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(BorderElement),
     BorderElementOptions,
-    BorderElementGeometry,
+    BorderElementSize,
     BorderElementDraw
 };
-
+
 /*
  * Entry field borders:
  * Sunken border; also fill with window color.
  */
 
-typedef struct {
-    Tcl_Obj *backgroundObj;
+typedef struct
+{
+    Tcl_Obj	*backgroundObj;
 } FieldElement;
 
-static Ttk_ElementOptionSpec FieldElementOptions[] = {
+static Ttk_ElementOptionSpec FieldElementOptions[] =
+{
     { "-fieldbackground", TK_OPTION_BORDER, 
     	Tk_Offset(FieldElement,backgroundObj), "white" },
     {NULL}
 };
 
-static void
-FieldElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void FieldElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE);
     paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE);
 }
 
-static void
-FieldElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void FieldElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     FieldElement *field = elementRecord;
     Tk_3DBorder bg = Tk_Get3DBorderFromObj(tkwin, field->backgroundObj);
@@ -279,32 +244,32 @@ FieldElementDraw(
     TkWinDCState dcState;
     HDC hdc;
 
-    Tk_Fill3DRectangle(tkwin, d, bg, b.x, b.y, b.width, b.height, 0,
-	    TK_RELIEF_FLAT);
+    Tk_Fill3DRectangle(
+	tkwin, d, bg, b.x, b.y, b.width, b.height, 0, TK_RELIEF_FLAT);
 
     hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
     DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT);
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec FieldElementSpec = {
+static Ttk_ElementSpec FieldElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(FieldElement),
     FieldElementOptions,
-    FieldElementGeometry,
+    FieldElementSize,
     FieldElementDraw
 };
-
+
 /*------------------------------------------------------------------------
  * +++ Button borders.
  *	Drawn with DrawFrameControl instead of DrawEdge;
  *	Also draw default indicator and focus ring.
  */
-
 typedef struct {
-    Tcl_Obj *reliefObj;
-    Tcl_Obj *highlightColorObj;
-    Tcl_Obj *defaultStateObj;
+    Tcl_Obj	*reliefObj;
+    Tcl_Obj	*highlightColorObj;
+    Tcl_Obj	*defaultStateObj;
 } ButtonBorderElement;
 
 static Ttk_ElementOptionSpec ButtonBorderElementOptions[] = {
@@ -317,14 +282,9 @@ static Ttk_ElementOptionSpec ButtonBorderElementOptions[] = {
     {NULL}
 };
 
-static void
-ButtonBorderElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void ButtonBorderElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     ButtonBorderElement *bd = elementRecord;
     int relief = TK_RELIEF_RAISED;
@@ -339,8 +299,7 @@ ButtonBorderElementGeometry(
     /* Space for default indicator:
      */
     if (defaultState != TTK_BUTTON_DEFAULT_DISABLED) {
-    	++cx;
-	++cy;
+    	++cx; ++cy;
     }
 
     /* Space for focus ring:
@@ -351,14 +310,9 @@ ButtonBorderElementGeometry(
     *paddingPtr = Ttk_MakePadding(cx,cy,cx,cy);
 }
 
-static void
-ButtonBorderElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void ButtonBorderElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     ButtonBorderElement *bd = elementRecord;
     int relief = TK_RELIEF_FLAT;
@@ -372,7 +326,7 @@ ButtonBorderElementDraw(
 
     if (defaultState == TTK_BUTTON_DEFAULT_ACTIVE) {
 	XColor *highlightColor =
-		Tk_GetColorFromObj(tkwin, bd->highlightColorObj);
+	    Tk_GetColorFromObj(tkwin, bd->highlightColorObj);
 	GC gc = Tk_GCForColor(highlightColor, d);
 	XDrawRectangle(Tk_Display(tkwin), d, gc, b.x,b.y,b.width-1,b.height-1);
     }
@@ -383,69 +337,60 @@ ButtonBorderElementDraw(
     hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
 
     rc = BoxToRect(b);
-    DrawFrameControl(hdc, &rc, DFC_BUTTON,	/* classId */
-	    DFCS_BUTTONPUSH|Ttk_StateTableLookup(pushbutton_statemap, state));
+    DrawFrameControl(hdc, &rc,
+	DFC_BUTTON,	/* classId */
+	DFCS_BUTTONPUSH | Ttk_StateTableLookup(pushbutton_statemap, state));
 
     /* Draw focus ring:
      */
     if (state & TTK_STATE_FOCUS) {
 	short int borderWidth = 3;	/* @@@ Use GetSystemMetrics?*/
-
 	rc = BoxToRect(Ttk_PadBox(b, Ttk_UniformPadding(borderWidth)));
     	DrawFocusRect(hdc, &rc);
     }
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec ButtonBorderElementSpec = {
+static Ttk_ElementSpec ButtonBorderElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(ButtonBorderElement),
     ButtonBorderElementOptions,
-    ButtonBorderElementGeometry,
+    ButtonBorderElementSize,
     ButtonBorderElementDraw
 };
-
+
 /*------------------------------------------------------------------------
  * +++ Focus element.
  * 	Draw dashed focus rectangle.
  */
 
-static void
-FocusElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void FocusElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     *paddingPtr = Ttk_UniformPadding(1);
 }
 
-static void
-FocusElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void FocusElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     if (state & TTK_STATE_FOCUS) {
 	RECT rc = BoxToRect(b);
 	TkWinDCState dcState;
 	HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
-
     	DrawFocusRect(hdc, &rc);
 	TkWinReleaseDrawableDC(d, hdc, &dcState);
     }
 }
 
-static Ttk_ElementSpec FocusElementSpec = {
+static Ttk_ElementSpec FocusElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    FocusElementGeometry,
+    FocusElementSize,
     FocusElementDraw
 };
 
@@ -464,17 +409,11 @@ static Ttk_ElementOptionSpec FillFocusElementOptions[] = {
 };
 
 	/* @@@ FIX THIS */
-static void
-FillFocusElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void FillFocusElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     FillFocusElement *focus = elementRecord;
-
     if (state & TTK_STATE_FOCUS) {
 	RECT rc = BoxToRect(b);
 	TkWinDCState dcState;
@@ -493,77 +432,61 @@ FillFocusElementDraw(
  * ComboboxFocusElement --
  * 	Read-only comboboxes have a filled focus ring, editable ones do not.
  */
-
-static void
-ComboboxFocusElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void ComboboxFocusElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     if (state & TTK_STATE_READONLY) {
     	FillFocusElementDraw(clientData, elementRecord, tkwin, d, b, state);
     }
 }
 
-static Ttk_ElementSpec ComboboxFocusElementSpec = {
+static Ttk_ElementSpec ComboboxFocusElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(FillFocusElement),
     FillFocusElementOptions,
-    FocusElementGeometry,
+    FocusElementSize,
     ComboboxFocusElementDraw
 };
-
+
 /*----------------------------------------------------------------------
  * +++ Scrollbar trough element.
  *
  * The native windows scrollbar is drawn using a pattern brush giving a
- * stippled appearance when the trough might otherwise be invisible. We can
- * deal with this here.
+ * stippled appearance when the trough might otherwise be invisible.
+ * We can deal with this here.
  */
 
-typedef struct {		/* clientData for Trough element */
-    HBRUSH PatternBrush;
-    HBITMAP PatternBitmap;
+typedef struct {	/* clientData for Trough element */
+    HBRUSH     PatternBrush;
+    HBITMAP    PatternBitmap;
 } TroughClientData;
 
 static const WORD Pattern[] = {
     0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa
 };
 
-static void
-TroughClientDataDeleteProc(
-    void *clientData)
+static void TroughClientDataDeleteProc(void *clientData)
 {
     TroughClientData *cd = clientData;
-
     DeleteObject(cd->PatternBrush);
     DeleteObject(cd->PatternBitmap);
     ckfree(clientData);
 }
 
-static TroughClientData *
-TroughClientDataInit(
-    Tcl_Interp *interp)
+static TroughClientData *TroughClientDataInit(Tcl_Interp *interp)
 {
-    TroughClientData *cd = (TroughClientData *) ckalloc(sizeof(*cd));
-
+    TroughClientData *cd = (TroughClientData*)ckalloc(sizeof(*cd));
     cd->PatternBitmap = CreateBitmap(8, 8, 1, 1, Pattern);
-    cd->PatternBrush = CreatePatternBrush(cd->PatternBitmap);
+    cd->PatternBrush  = CreatePatternBrush(cd->PatternBitmap);
     Ttk_RegisterCleanup(interp, cd, TroughClientDataDeleteProc);
     return cd;
 }
 
-static void
-TroughElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void TroughElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     TroughClientData *cd = clientData;
     TkWinDCState dcState;
@@ -589,34 +512,33 @@ TroughElementDraw(
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec TroughElementSpec = {
+static Ttk_ElementSpec TroughElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    TtkNullElementGeometry,
+    TtkNullElementSize,
     TroughElementDraw
 };
-
+
 /*------------------------------------------------------------------------
  * +++ Thumb element.
  */
 
-typedef struct {
+typedef struct
+{
     Tcl_Obj *orientObj;
 } ThumbElement;
 
-static Ttk_ElementOptionSpec ThumbElementOptions[] = {
+static Ttk_ElementOptionSpec ThumbElementOptions[] =
+{
     { "-orient", TK_OPTION_ANY,Tk_Offset(ThumbElement,orientObj),"horizontal"},
     { NULL }
 };
 
-static void ThumbElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void ThumbElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     ThumbElement *thumbPtr = elementRecord;
     int orient;
@@ -631,60 +553,52 @@ static void ThumbElementGeometry(
     }
 }
 
-static void
-ThumbElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void ThumbElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     RECT rc = BoxToRect(b);
     TkWinDCState dcState;
     HDC hdc;
 
     /* Windows doesn't show a thumb when the scrollbar is disabled */
-    if (state & TTK_STATE_DISABLED) {
+    if (state & TTK_STATE_DISABLED)
 	return;
-    }
 
     hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
     DrawEdge(hdc, &rc, EDGE_RAISED, BF_RECT | BF_MIDDLE);
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec ThumbElementSpec = {
+static Ttk_ElementSpec ThumbElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(ThumbElement),
     ThumbElementOptions,
-    ThumbElementGeometry,
+    ThumbElementSize,
     ThumbElementDraw
 };
-
+
 /* ---------------------------------------------------------------------- 
  * The slider element is the shaped thumb used in the slider widget.
  * Windows likes to call this a trackbar.
  */
 
-typedef struct {
+typedef struct
+{
     Tcl_Obj *orientObj;  /* orientation of the slider widget */
 } SliderElement;
 
-static Ttk_ElementOptionSpec SliderElementOptions[] = {
+static Ttk_ElementOptionSpec SliderElementOptions[] =
+{
     { "-orient", TK_OPTION_ANY, Tk_Offset(SliderElement,orientObj),
       "horizontal" },
     { NULL }
 };
 
-static void
-SliderElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void SliderElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     SliderElement *slider = elementRecord;
     int orient;
@@ -699,14 +613,9 @@ SliderElementGeometry(
     }
 }
 
-static void
-SliderElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void SliderElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     RECT rc = BoxToRect(b);
     TkWinDCState dcState;
@@ -717,56 +626,47 @@ SliderElementDraw(
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec SliderElementSpec = {
+static Ttk_ElementSpec SliderElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(SliderElement),
     SliderElementOptions,
-    SliderElementGeometry,
+    SliderElementSize,
     SliderElementDraw
 };
-
+
 /*------------------------------------------------------------------------
  * +++ Notebook elements.
  */
 
-static void
-ClientElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void ClientElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     paddingPtr->left = paddingPtr->right = GetSystemMetrics(SM_CXEDGE);
     paddingPtr->top = paddingPtr->bottom = GetSystemMetrics(SM_CYEDGE);
 }
 
-static void
-ClientElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void ClientElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     RECT rc = BoxToRect(b);
     TkWinDCState dcState;
     HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
-
     DrawEdge(hdc, &rc, EDGE_RAISED, BF_RECT | BF_SOFT);
     TkWinReleaseDrawableDC(d, hdc, &dcState);
 }
 
-static Ttk_ElementSpec ClientElementSpec = {
+static Ttk_ElementSpec ClientElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    ClientElementGeometry,
+    ClientElementSize,
     ClientElementDraw
 };
-
+
 /*------------------------------------------------------------------------
  * +++ Layouts.
  */
@@ -784,13 +684,11 @@ TTK_BEGIN_LAYOUT(ComboboxLayout)
 	    TTK_GROUP("Combobox.focus", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH,
 		TTK_NODE("Combobox.textarea", TTK_FILL_BOTH))))
 TTK_END_LAYOUT
-
+
+
 /* ---------------------------------------------------------------------- */
 
-MODULE_SCOPE int
-TtkWinTheme_Init(
-    Tcl_Interp *interp,
-    HWND hwnd)
+MODULE_SCOPE int TtkWinTheme_Init(Tcl_Interp *interp, HWND hwnd)
 {
     Ttk_Theme themePtr, parentPtr;
     FrameControlElementData *fce = FrameControlElements;
@@ -803,15 +701,15 @@ TtkWinTheme_Init(
 
     Ttk_RegisterElementSpec(themePtr, "border", &BorderElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "Button.border", 
-	    &ButtonBorderElementSpec, NULL);
+	&ButtonBorderElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "field", &FieldElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "focus", &FocusElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "Combobox.focus", 
-	    &ComboboxFocusElementSpec, NULL);
+    	&ComboboxFocusElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "thumb", &ThumbElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "slider", &SliderElementSpec, NULL);
     Ttk_RegisterElementSpec(themePtr, "Scrollbar.trough", &TroughElementSpec,
-	    TroughClientDataInit(interp));
+    	TroughClientDataInit(interp));
 
     Ttk_RegisterElementSpec(themePtr, "client", &ClientElementSpec, NULL);
 
@@ -826,11 +724,3 @@ TtkWinTheme_Init(
     Tcl_PkgProvide(interp, "ttk::theme::winnative", TTK_VERSION);
     return TCL_OK;
 }
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 38e373b..e18d604 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkWinXPTheme.c,v 1.12 2007/04/17 14:32:28 dkf Exp $
+ * $Id: ttkWinXPTheme.c,v 1.13 2007/10/25 07:08:27 jenglish Exp $
  *
  * Tk theme engine which uses the Windows XP "Visual Styles" API
  * Adapted from Georgios Petasis' XP theme patch.
@@ -53,7 +53,8 @@ typedef HRESULT (STDAPICALLTYPE DrawThemeTextProc)(HTHEME hTheme, HDC hdc,
 typedef BOOL    (STDAPICALLTYPE IsThemeActiveProc)(VOID);
 typedef BOOL    (STDAPICALLTYPE IsAppThemedProc)(VOID);
 
-typedef struct {
+typedef struct
+{
     OpenThemeDataProc			*OpenThemeData;
     CloseThemeDataProc			*CloseThemeData;
     GetThemePartSizeProc		*GetThemePartSize;
@@ -66,7 +67,8 @@ typedef struct {
     HWND                                stubWindow;
 } XPThemeProcs;
 
-typedef struct {
+typedef struct
+{
     HINSTANCE hlibrary;
     XPThemeProcs *procs;
 } XPThemeData;
@@ -86,39 +88,39 @@ typedef struct {
  */
 
 static XPThemeProcs *
-LoadXPThemeProcs(
-    HINSTANCE *phlib)
+LoadXPThemeProcs(HINSTANCE *phlib)
 {
     /*
-     * Load the library "uxtheme.dll", where the native widget drawing
-     * routines are implemented. This will only succeed if we are running at
-     * least on Windows XP.
+     * Load the library "uxtheme.dll", where the native widget
+     * drawing routines are implemented.  This will only succeed 
+     * if we are running at least on Windows XP.
      */
-
     HINSTANCE handle;
-
     *phlib = handle = LoadLibrary("uxtheme.dll");
-    if (handle != 0) {
+    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));
+	XPThemeProcs *procs = (XPThemeProcs*)ckalloc(sizeof(XPThemeProcs));
 #define LOADPROC(name) \
 	(0 != (procs->name = (name ## Proc *)GetProcAddress(handle, #name) ))
 
-	if (	LOADPROC(OpenThemeData) &&
-		LOADPROC(CloseThemeData) &&
-		LOADPROC(GetThemePartSize) &&
-		LOADPROC(DrawThemeBackground) &&
-		LOADPROC(GetThemeTextExtent) &&
-		LOADPROC(DrawThemeText) &&
-		LOADPROC(IsThemeActive) &&
-		LOADPROC(IsAppThemed)) {
+	if (   LOADPROC(OpenThemeData)
+	    && LOADPROC(CloseThemeData)
+	    && LOADPROC(GetThemePartSize)
+	    && LOADPROC(DrawThemeBackground)
+	    && LOADPROC(GetThemeTextExtent)
+	    && LOADPROC(DrawThemeText)
+	    && LOADPROC(IsThemeActive)
+	    && LOADPROC(IsAppThemed)
+	)
+	{
 	    return procs;
 	}
 #undef LOADPROC
-	ckfree((char *) procs);
+	ckfree((char*)procs);
     }
     return 0;
 }
@@ -130,8 +132,7 @@ LoadXPThemeProcs(
  */
 
 static void
-XPThemeDeleteProc(
-    void *clientData)
+XPThemeDeleteProc(void *clientData)
 {
     XPThemeData *themeData = clientData;
     FreeLibrary(themeData->hlibrary);
@@ -139,9 +140,7 @@ XPThemeDeleteProc(
 }
 
 static int
-XPThemeEnabled(
-    Ttk_Theme theme,
-    void *clientData)
+XPThemeEnabled(Ttk_Theme theme, void *clientData)
 {
     XPThemeData *themeData = clientData;
     int active = themeData->procs->IsThemeActive();
@@ -154,8 +153,7 @@ XPThemeEnabled(
  * 	Helper routine.  Returns a RECT data structure.
  */
 static RECT
-BoxToRect(
-    Ttk_Box b)
+BoxToRect(Ttk_Box b)
 {
     RECT rc;
     rc.top = b.y;
@@ -360,38 +358,44 @@ static Ttk_StateTable tabitem_statemap[] =
  *	BP_PUSHBUTTONS).  Set the IGNORE_THEMESIZE flag to skip this call.
  */
 
-typedef struct {		/* XP element specifications */
-    const char *elementName;	/* Tk theme engine element name */
+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. */
+    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 */
-#define PAD_MARGINS	 0x2	/* See NOTE-GetThemeMargins */
+    int  	flags;		
+#   define 	IGNORE_THEMESIZE 	0x1 /* See NOTE-GetThemePartSize */
+#   define 	PAD_MARGINS		0x2 /* See NOTE-GetThemeMargins */
 } ElementInfo;
 
-typedef struct {
-    /* Static data, initialized when element is registered: */
+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;
+
+    /*
+     * Dynamic data, allocated by InitElementData:
+     */
+    HTHEME	hTheme;
+    HDC		hDC;
+    HWND	hwnd;
+
     /* For TkWinDrawableReleaseDC: */
-    Drawable drawable;
+    Drawable	drawable;
     TkWinDCState dcState;
 } ElementData;
 
 static ElementData *
-NewElementData(
-    XPThemeProcs *procs,
-    ElementInfo *info)
+NewElementData(XPThemeProcs *procs, ElementInfo *info)
 {
-    ElementData *elementData = (ElementData *) ckalloc(sizeof(ElementData));
+    ElementData *elementData = (ElementData*)ckalloc(sizeof(ElementData));
 
     elementData->procs = procs;
     elementData->info = info;
@@ -400,29 +404,24 @@ NewElementData(
     return elementData;
 }
 
-static void
-DestroyElementData(
-    void *elementData)
+static void DestroyElementData(void *elementData)
 {
     ckfree(elementData);
 }
 
 /*
  * InitElementData --
- * 	Looks up theme handle. If Drawable argument is non-NULL, also
- * 	initializes DC.
+ * 	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.
+ * 	Caller must later call FreeElementData() so this element
+ * 	can be reused.
  */
 
 static int
-InitElementData(
-    ElementData *elementData,
-    Tk_Window tkwin,
-    Drawable d)
+InitElementData(ElementData *elementData, Tk_Window tkwin, Drawable d)
 {
     Window win = Tk_WindowId(tkwin);
 
@@ -448,8 +447,7 @@ InitElementData(
 }
 
 static void
-FreeElementData(
-    ElementData *elementData)
+FreeElementData(ElementData *elementData)
 {
     elementData->procs->CloseThemeData(elementData->hTheme);
     if (elementData->drawable != 0) {
@@ -465,28 +463,26 @@ FreeElementData(
  * 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)
+static void GenericElementSize(
+    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)) {
+    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);
+	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;
@@ -499,14 +495,9 @@ GenericElementGeometry(
     *paddingPtr = elementData->info->padding;
 }
 
-static void
-GenericElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    Drawable d,
-    Ttk_Box b,
-    unsigned int state)
+static void GenericElementDraw(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    Drawable d, Ttk_Box b, unsigned int state)
 {
     ElementData *elementData = clientData;
     RECT rc;
@@ -520,19 +511,23 @@ GenericElementDraw(
     }
     rc = BoxToRect(b);
 
-    elementData->procs->DrawThemeBackground(elementData->hTheme,
-	    elementData->hDC, elementData->info->partId,
-	    Ttk_StateTableLookup(elementData->info->statemap, state),
-	    &rc, NULL/*pContentRect*/);
+    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 = {
+static Ttk_ElementSpec GenericElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    GenericElementGeometry,
+    GenericElementSize,
     GenericElementDraw
 };
 
@@ -541,41 +536,36 @@ static Ttk_ElementSpec GenericElementSpec = {
  *     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)
+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);
+    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) {
+    if (state & TTK_STATE_DISABLED)
 	return;
-    }
 
-    if (!InitElementData(elementData, tkwin, d)) {
+    if (!InitElementData(elementData, tkwin, d))
 	return;
-    }
 
     elementData->procs->DrawThemeBackground(elementData->hTheme,
-	    elementData->hDC, elementData->info->partId, stateId, &rc, NULL);
+	elementData->hDC, elementData->info->partId, stateId,
+	&rc, NULL);
 
     FreeElementData(elementData);
 }
 
-static Ttk_ElementSpec ThumbElementSpec = {
+static Ttk_ElementSpec ThumbElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    GenericElementGeometry,
+    GenericElementSize,
     ThumbElementDraw
 };
 
@@ -585,20 +575,15 @@ static Ttk_ElementSpec ThumbElementSpec = {
  *	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)
+static void PbarElementSize(
+    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);
+    GenericElementSize(clientData, elementRecord, tkwin,
+    	widthPtr, heightPtr, paddingPtr);
 
     if (elementData->info->partId == PP_CHUNK) {
     	*widthPtr *= nBars;
@@ -607,103 +592,93 @@ PbarElementGeometry(
     }
 }
 
-static Ttk_ElementSpec PbarElementSpec = {
+static Ttk_ElementSpec PbarElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    PbarElementGeometry,
+    PbarElementSize,
     GenericElementDraw
 };
 
 /*----------------------------------------------------------------------
  * +++  Notebook tab element.
-
- *	Same as generic element, with additional logic to select proper
- *	iPartID for the leftmost tab.
+ *	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.
+ *	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 TILES_* definitions are identical, so we can use the
- *	same statemap no matter what the partId.
+ *	The TIS_* and TILES_* 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)
+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)) {
+    if (!InitElementData(elementData, tkwin, d))
 	return;
-    }
-    if (state & TTK_STATE_USER1) {
+    if (state & TTK_STATE_USER1)
 	partId = TABP_TABITEMLEFTEDGE;
-    }
-    elementData->procs->DrawThemeBackground(elementData->hTheme,
-	    elementData->hDC, partId,
-	    Ttk_StateTableLookup(elementData->info->statemap, state), &rc,
-	    NULL);
+    elementData->procs->DrawThemeBackground(
+	elementData->hTheme, elementData->hDC, partId,
+	Ttk_StateTableLookup(elementData->info->statemap, state), &rc, NULL);
     FreeElementData(elementData);
 }
 
-static Ttk_ElementSpec TabElementSpec = {
+static Ttk_ElementSpec TabElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    GenericElementGeometry,
+    GenericElementSize,
     TabElementDraw
 };
 
 /*----------------------------------------------------------------------
  * +++  Tree indicator element.
  *
- *	Generic element, but don't display at all if TTK_STATE_LEAF (=USER2)
- *	set
+ *	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[] = {
+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[] = {
+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)
+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 = {
+static Ttk_ElementSpec TreeIndicatorElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(NullElement),
     TtkNullElementOptions,
-    GenericElementGeometry,
+    GenericElementSize,
     TreeIndicatorElementDraw
 };
 
@@ -713,18 +688,21 @@ static Ttk_ElementSpec TreeIndicatorElementSpec = {
  *----------------------------------------------------------------------
  * 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?
+ * 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 {
+typedef struct
+{
     Tcl_Obj *textObj;
     Tcl_Obj *fontObj;
 } TextElement;
 
-static Ttk_ElementOptionSpec TextElementOptions[] = {
+static Ttk_ElementOptionSpec TextElementOptions[] =
+{
     { "-text", TK_OPTION_STRING,
 	Tk_Offset(TextElement,textObj), "" },
     { "-font", TK_OPTION_FONT,
@@ -732,76 +710,70 @@ static Ttk_ElementOptionSpec TextElementOptions[] = {
     { NULL }
 };
 
-static void
-TextElementGeometry(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *widthPtr,
-    int *heightPtr,
-    Ttk_Padding *paddingPtr)
+static void TextElementSize(
+    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)) {
+    if (!InitElementData(elementData, tkwin, 0))
 	return;
-    }
 
-    hr = elementData->procs->GetThemeTextExtent(elementData->hTheme,
-	    elementData->hDC, elementData->info->partId,
+    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);
+	    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;
-    }
+    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)
+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)) {
+    if (!InitElementData(elementData, tkwin, d))
 	return;
-    }
 
-    hr = elementData->procs->DrawThemeText(elementData->hTheme,
-	    elementData->hDC, elementData->info->partId,
+    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);
+	    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 = {
+static Ttk_ElementSpec TextElementSpec =
+{
     TK_STYLE_VERSION_2,
     sizeof(TextElement),
     TextElementOptions,
-    TextElementGeometry,
+    TextElementSize,
     TextElementDraw
 };
 
@@ -949,10 +921,7 @@ static ElementInfo ElementInfoTable[] = {
  * +++ Initialization routine:
  */
 
-MODULE_SCOPE int
-TtkXPTheme_Init(
-    Tcl_Interp *interp,
-    HWND hwnd)
+MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
 {
     XPThemeData *themeData;
     XPThemeProcs *procs;
@@ -961,9 +930,8 @@ TtkXPTheme_Init(
     ElementInfo *infoPtr;
 
     procs = LoadXPThemeProcs(&hlibrary);
-    if (!procs) {
+    if (!procs)
 	return TCL_ERROR;
-    }
     procs->stubWindow = hwnd;
 
     /*
@@ -972,9 +940,8 @@ TtkXPTheme_Init(
     parentPtr = Ttk_GetTheme(interp, "winnative");
     themePtr = Ttk_CreateTheme(interp, "xpnative", parentPtr);
 
-    if (!themePtr) {
+    if (!themePtr)
         return TCL_ERROR;
-    }
 
     /*
      * Set theme data and cleanup proc
@@ -992,8 +959,8 @@ TtkXPTheme_Init(
      */
     for (infoPtr = ElementInfoTable; infoPtr->elementName != 0; ++infoPtr) {
 	ClientData clientData = NewElementData(procs, infoPtr);
-	Ttk_RegisterElementSpec(themePtr, infoPtr->elementName,
-		infoPtr->elementSpec, clientData);
+	Ttk_RegisterElementSpec(
+	    themePtr, infoPtr->elementName, infoPtr->elementSpec, clientData);
 	Ttk_RegisterCleanup(interp, clientData, DestroyElementData);
     }
 
@@ -1005,9 +972,9 @@ TtkXPTheme_Init(
     Ttk_RegisterLayout(themePtr, "TButton", ButtonLayout);
     Ttk_RegisterLayout(themePtr, "TMenubutton", MenubuttonLayout);
     Ttk_RegisterLayout(themePtr, "Vertical.TScrollbar",
-	    VerticalScrollbarLayout);
+    	VerticalScrollbarLayout);
     Ttk_RegisterLayout(themePtr, "Horizontal.TScrollbar",
-	    HorizontalScrollbarLayout);
+    	HorizontalScrollbarLayout);
     Ttk_RegisterLayout(themePtr, "Vertical.TScale", VerticalScaleLayout);
     Ttk_RegisterLayout(themePtr, "Horizontal.TScale", HorizontalScaleLayout);