Import Tk 8.6.8

tests/ttk/combobox.test

@@ -45,6 +45,15 @@ test combobox-2.4 "current -- value not in list" -body {
 
 test combobox-2.end "Cleanup" -body { destroy .cb }
 
+test combobox-3 "Read postoffset value dynamically from current style" -body {
+    ttk::combobox .cb -values [list a b c] -style "DerivedStyle.TCombobox"
+    pack .cb -expand true -fill both 
+    ttk::style configure DerivedStyle.TCombobox -postoffset [list 25 0 0 0]
+    ttk::combobox::Post .cb
+    expr {[winfo rootx .cb.popdown] - [winfo rootx .cb]}
+} -result 25 -cleanup {
+    destroy .cb
+}
 
 test combobox-1890211 "ComboboxSelected event after listbox unposted" -body {
     # whitebox test...

tests/ttk/entry.test

@@ -85,7 +85,7 @@ test entry-2.2 "Initial scroll position" -body {
 # Bounding box / scrolling tests.
 test entry-3.0 "Series 3 setup" -body {
     ttk::style theme use default
-    variable fixed fixed
+    variable fixed TkFixedFont
     variable cw [font measure $fixed a]
     variable ch [font metrics $fixed -linespace]
     variable bd 2	;# border + padding

tests/ttk/spinbox.test

@@ -199,6 +199,27 @@ test spinbox-2.4 "current command -- value not in list" -constraints nyi -setup
     destroy .sb
 } -result -1
 
+test spinbox-3.0 "textarea should expand to fill widget" -setup {
+    set SBV 5
+    set ::spinbox_test {}
+    ttk::spinbox .sb -from 0 -to 10 -textvariable SBV
+} -body {
+    grid .sb -sticky ew
+    grid columnconfigure . 0 -weight 1
+    bind . <Map> {
+        after idle {
+            wm geometry . "210x80"
+            after 100 {set ::spinbox_test [.sb identify element 5 5]}
+        }
+        bind . <Map> {}
+    }
+    after 500 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test SBV
+} -result {textarea}
+
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266
 #