Major backport of 8.6 Ttk for 8.5.9. Most changes were only being

        committed to head (8.6), although they could apply for 8.5 as well.
        This re-sync makes future work easier to maintain and adds some
        useful work for 8.5 users. Notable changes:
        - Lots of code cleanup
        - Some bug fixes never backported
        - Addition of ttk::spinbox
        - minor color changes
        - Improved Vista/7 styling
        - Move to tile version 0.8.6 (pseudo-package)
        - ABI and API compatible (even $w identify)
        - minor new features (extended $w identify)

1 files changed, 48 insertions, 2 deletions

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 5502206..c4a921e 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkWinXPTheme.c,v 1.18.2.2 2009/12/03 23:58:35 patthoyts Exp $
+ * $Id: ttkWinXPTheme.c,v 1.18.2.3 2010/08/26 02:06:10 hobbs Exp $
  *
  * Tk theme engine which uses the Windows XP "Visual Styles" API
  * Adapted from Georgios Petasis' XP theme patch.
@@ -101,7 +101,7 @@ LoadXPThemeProcs(HINSTANCE *phlib)
      * if we are running at least on Windows XP.
      */
     HINSTANCE handle;
-    *phlib = handle = LoadLibrary("uxtheme.dll");
+    *phlib = handle = LoadLibrary(TEXT("uxtheme.dll"));
     if (handle != 0)
     {
 	/*
@@ -321,6 +321,14 @@ static Ttk_StateTable rightarrow_statemap[] =
     { ABS_RIGHTNORMAL, 	0, 0 }
 };
 
+static Ttk_StateTable spinbutton_statemap[] =
+{
+    { DNS_DISABLED,	TTK_STATE_DISABLED, 0 },
+    { DNS_PRESSED,	TTK_STATE_PRESSED,  0 },
+    { DNS_HOT,		TTK_STATE_ACTIVE,   0 },
+    { DNS_NORMAL,	0,		    0 },
+};
+
 /*
  * Trackbar thumb: (Tk: "scale slider")
  */
@@ -591,6 +599,36 @@ static Ttk_ElementSpec GenericSizedElementSpec = {
 };
 
 /*----------------------------------------------------------------------
+ * +++ Spinbox arrow element.
+ *     These are half-height scrollbar buttons.
+ */
+
+static void
+SpinboxArrowElementSize(
+    void *clientData, void *elementRecord, Tk_Window tkwin,
+    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
+{
+    ElementData *elementData = clientData;
+
+    if (!InitElementData(elementData, tkwin, 0))
+	return;
+
+    GenericSizedElementSize(clientData, elementRecord, tkwin,
+	widthPtr, heightPtr, paddingPtr);
+
+    /* force the arrow button height to half size */
+    *heightPtr /= 2;
+}
+
+static Ttk_ElementSpec SpinboxArrowElementSpec = {
+    TK_STYLE_VERSION_2,
+    sizeof(NullElement),
+    TtkNullElementOptions,
+    SpinboxArrowElementSize,
+    GenericElementDraw
+};
+
+/*----------------------------------------------------------------------
  * +++ Scrollbar thumb element.
  *     Same as a GenericElement, but don't draw in the disabled state.
  */
@@ -979,6 +1017,14 @@ static ElementInfo ElementInfoTable[] = {
     	HP_HEADERITEM, header_statemap, PAD(4,0,4,0),0 },
     { "sizegrip", &GenericElementSpec, L"STATUS",
     	SP_GRIPPER, null_statemap, NOPAD,0 },
+    { "Spinbox.field", &GenericElementSpec, L"EDIT",
+	EP_EDITTEXT, edittext_statemap, PAD(1, 1, 1, 1), 0 },
+    { "Spinbox.uparrow", &SpinboxArrowElementSpec, L"SPIN",
+	SPNP_UP, spinbutton_statemap, NOPAD,
+	PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) },
+    { "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN",
+	SPNP_DOWN, spinbutton_statemap, NOPAD,
+	PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) },
 
 #if BROKEN_TEXT_ELEMENT
     { "Labelframe.text", &TextElementSpec, L"BUTTON",