merge trunk

6 files changed, 71 insertions, 35 deletions

diff --git a/library/ttk/altTheme.tcl b/library/ttk/altTheme.tcl
index d57227c..5630e6c 100644
--- a/library/ttk/altTheme.tcl
+++ b/library/ttk/altTheme.tcl
@@ -14,6 +14,7 @@ namespace eval ttk::theme::alt {
 	-disabledfg	"#a3a3a3"
 	-selectbg	"#4a6984"
 	-selectfg	"#ffffff"
+	-altindicator	"#aaaaaa"
     }
 
     ttk::style theme settings alt {
@@ -46,9 +47,13 @@ namespace eval ttk::theme::alt {
 	ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
 	ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
 	ttk::style map TCheckbutton -indicatorcolor \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+	           alternate $colors(-altindicator) \
+	           disabled $colors(-frame)]
 	ttk::style map TRadiobutton -indicatorcolor \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+	           alternate $colors(-altindicator) \
+	           disabled $colors(-frame)]
 
 	ttk::style configure TMenubutton \
 	    -width -11 -padding "3 3" -relief raised
@@ -58,7 +63,8 @@ namespace eval ttk::theme::alt {
 		[list readonly $colors(-frame) disabled $colors(-frame)]
 	ttk::style configure TCombobox -padding 1
 	ttk::style map TCombobox -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)]
+		[list readonly $colors(-frame) disabled $colors(-frame)] \
+		-arrowcolor [list disabled $colors(-disabledfg)]
 	ttk::style configure ComboboxPopdownFrame \
 	    -relief solid -borderwidth 1
 
diff --git a/library/ttk/clamTheme.tcl b/library/ttk/clamTheme.tcl
index 1789b8a..98f0036 100644
--- a/library/ttk/clamTheme.tcl
+++ b/library/ttk/clamTheme.tcl
@@ -7,16 +7,18 @@
 namespace eval ttk::theme::clam {
     variable colors
     array set colors {
-	-disabledfg	"#999999"
-	-frame  	"#dcdad5"
-	-window  	"#ffffff"
-	-dark		"#cfcdc8"
-	-darker 	"#bab5ab"
-	-darkest	"#9e9a91"
-	-lighter	"#eeebe7"
-	-lightest 	"#ffffff"
-	-selectbg	"#4a6984"
-	-selectfg	"#ffffff"
+	-disabledfg		"#999999"
+	-frame  		"#dcdad5"
+	-window  		"#ffffff"
+	-dark			"#cfcdc8"
+	-darker 		"#bab5ab"
+	-darkest		"#9e9a91"
+	-lighter		"#eeebe7"
+	-lightest 		"#ffffff"
+	-selectbg		"#4a6984"
+	-selectfg		"#ffffff"
+	-altindicator		"#5895bc"
+	-disabledaltindicator	"#a0a0a0"
     }
 
     ttk::style theme settings clam {
@@ -80,9 +82,15 @@ namespace eval ttk::theme::clam {
 	    -indicatormargin {1 1 4 1} \
 	    -padding 2 ;
 	ttk::style map TCheckbutton -indicatorbackground \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			disabled $colors(-frame)]
 	ttk::style map TRadiobutton -indicatorbackground \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			disabled $colors(-frame)]
 
 	ttk::style configure TMenubutton \
 	    -width -11 -padding 5 -relief raised
@@ -102,7 +110,7 @@ namespace eval ttk::theme::clam {
 	    -fieldbackground [list {readonly focus} $colors(-selectbg) \
 				  readonly $colors(-frame)] \
 	    -foreground [list {readonly focus} $colors(-selectfg)] \
-	    ;
+	    -arrowcolor [list disabled $colors(-disabledfg)]
 	ttk::style configure ComboboxPopdownFrame \
 	    -relief solid -borderwidth 1
 
diff --git a/library/ttk/classicTheme.tcl b/library/ttk/classicTheme.tcl
index 7e3eff5..3cb2b18 100644
--- a/library/ttk/classicTheme.tcl
+++ b/library/ttk/classicTheme.tcl
@@ -15,6 +15,7 @@ namespace eval ttk::theme::classic {
 	-selectfg	"#000000"
 	-disabledfg	"#a3a3a3"
 	-indicator	"#b03060"
+	-altindicator	"#b05e5e"
     }
 
     ttk::style theme settings classic {
@@ -49,15 +50,19 @@ namespace eval ttk::theme::classic {
 	ttk::style configure TCheckbutton -indicatorrelief raised
 	ttk::style map TCheckbutton \
 	    -indicatorcolor [list \
-		pressed $colors(-frame)  selected $colors(-indicator)] \
-	    -indicatorrelief {selected sunken  pressed sunken} \
+		    pressed $colors(-frame) \
+		    alternate $colors(-altindicator) \
+		    selected $colors(-indicator)] \
+	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
 	    ;
 
 	ttk::style configure TRadiobutton -indicatorrelief raised
 	ttk::style map TRadiobutton \
 	    -indicatorcolor [list \
-		pressed $colors(-frame)  selected $colors(-indicator)] \
-	    -indicatorrelief {selected sunken  pressed sunken} \
+		    pressed $colors(-frame) \
+		    alternate $colors(-altindicator) \
+		    selected $colors(-indicator)] \
+	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
 	    ;
 
 	ttk::style configure TMenubutton -relief raised -padding "3m 1m"
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 03821a2..6ceccef 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -368,7 +368,8 @@ proc ttk::combobox::PlacePopdown {cb popdown} {
     set y [winfo rooty $cb]
     set w [winfo width $cb]
     set h [winfo height $cb]
-    set postoffset [ttk::style lookup TCombobox -postoffset {} {0 0 0 0}]
+    set style [$cb cget -style]
+    set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
     foreach var {x y w h} delta $postoffset {
     	incr $var $delta
     }
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl
index 4551966..9cc5880 100644
--- a/library/ttk/defaults.tcl
+++ b/library/ttk/defaults.tcl
@@ -5,16 +5,19 @@
 namespace eval ttk::theme::default {
     variable colors
     array set colors {
-	-frame		"#d9d9d9"
-	-foreground	"#000000"
-	-window		"#ffffff"
-	-text   	"#000000"
-	-activebg	"#ececec"
-	-selectbg	"#4a6984"
-	-selectfg	"#ffffff"
-	-darker 	"#c3c3c3"
-	-disabledfg	"#a3a3a3"
-	-indicator	"#4a6984"
+	-frame			"#d9d9d9"
+	-foreground		"#000000"
+	-window			"#ffffff"
+	-text   		"#000000"
+	-activebg		"#ececec"
+	-selectbg		"#4a6984"
+	-selectfg		"#ffffff"
+	-darker 		"#c3c3c3"
+	-disabledfg		"#a3a3a3"
+	-indicator		"#4a6984"
+	-disabledindicator	"#a3a3a3"
+	-altindicator		"#9fbdd8"
+	-disabledaltindicator	"#c0c0c0"
     }
 
     ttk::style theme settings default {
@@ -45,12 +48,24 @@ namespace eval ttk::theme::default {
 	ttk::style configure TCheckbutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
 	ttk::style map TCheckbutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
+	    [list pressed $colors(-activebg)  \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			{!disabled selected} $colors(-indicator) \
+			{disabled selected} $colors(-disabledindicator)]
+	ttk::style map TCheckbutton -indicatorrelief \
+	    [list alternate raised]
 
 	ttk::style configure TRadiobutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
 	ttk::style map TRadiobutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
+	    [list pressed $colors(-activebg)  \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			{!disabled selected} $colors(-indicator) \
+			{disabled selected} $colors(-disabledindicator)]
+	ttk::style map TRadiobutton -indicatorrelief \
+	    [list alternate raised]
 
 	ttk::style configure TMenubutton \
 	    -relief raised -padding "10 3"
@@ -62,7 +77,8 @@ namespace eval ttk::theme::default {
 
 	ttk::style configure TCombobox -arrowsize 12 -padding 1
 	ttk::style map TCombobox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)]
+	    [list readonly $colors(-frame) disabled $colors(-frame)] \
+	    -arrowcolor [list disabled $colors(-disabledfg)]
 
 	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
 	ttk::style map TSpinbox -fieldbackground \
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index c284a52..c6c380d 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -133,7 +133,7 @@ namespace eval ttk::theme::vista {
                 Spinbox.background -sticky news -children {
                     Spinbox.padding -sticky news -children {
                         Spinbox.innerbg -sticky news -children {
-                            Spinbox.textarea -expand 1 -sticky {}
+                            Spinbox.textarea -expand 1
                         }
                     }
                     Spinbox.uparrow -side top -sticky ens