Import build of Tcl/Tk 8.6.10

amd64/lib/tk8.6/ttk/aquaTheme.tcl

@@ -7,47 +7,113 @@ namespace eval ttk::theme::aqua {
 
 	ttk::style configure . \
 	    -font TkDefaultFont \
-	    -background systemWindowBody \
-	    -foreground systemModelessDialogActiveText \
-	    -selectbackground systemHighlight \
-	    -selectforeground systemModelessDialogActiveText \
+	    -background systemWindowBackgroundColor \
+	    -foreground systemLabelColor \
+	    -selectbackground systemSelectedTextBackgroundColor \
+	    -selectforeground systemSelectedTextColor \
 	    -selectborderwidth 0 \
 	    -insertwidth 1
 
 	ttk::style map . \
-	    -foreground {disabled systemModelessDialogInactiveText
-		    background systemModelessDialogInactiveText} \
-	    -selectbackground {background systemHighlightSecondary
-		    !focus systemHighlightSecondary} \
-	    -selectforeground {background systemModelessDialogInactiveText
-		    !focus systemDialogActiveText}
+	    -foreground { 
+		disabled systemDisabledControlTextColor
+		background systemLabelColor} \
+	    -selectbackground {
+		background systemSelectedTextBackgroundColor
+		!focus systemSelectedTextBackgroundColor} \
+	    -selectforeground {
+		background systemSelectedTextColor
+		!focus systemSelectedTextColor}
+
+	# Button
+	ttk::style configure TButton -anchor center -width -6 \
+	    -foreground systemControlTextColor
+	ttk::style map TButton \
+	    -foreground {
+		pressed white
+	        {alternate !pressed !background} white}
+	ttk::style configure TMenubutton -anchor center -padding {2 0 0 2}
+	ttk::style configure Toolbutton -anchor center
+
+	# Entry
+	ttk::style configure TEntry \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor
+	ttk::style map TEntry \
+	    -foreground {
+		disabled systemDisabledControlTextColor
+	    } \
+	    -selectforeground {
+		background systemTextColor
+	    } \
+	    -selectbackground {
+		background systemTextBackgroundColor
+	    }
+	    
 
 	# Workaround for #1100117:
 	# Actually, on Aqua we probably shouldn't stipple images in
 	# disabled buttons even if it did work...
 	ttk::style configure . -stipple {}
 
-	ttk::style configure TButton -anchor center -width -6
-	ttk::style configure Toolbutton -padding 4
-
+	# Notebook
 	ttk::style configure TNotebook -tabmargins {10 0} -tabposition n
 	ttk::style configure TNotebook -padding {18 8 18 17}
 	ttk::style configure TNotebook.Tab -padding {12 3 12 2}
+	ttk::style configure TNotebook.Tab -foreground systemControlTextColor
+	ttk::style map TNotebook.Tab \
+	    -foreground {
+		background systemControlTextColor
+		disabled systemDisabledControlTextColor
+		selected systemSelectedTabTextColor}
 
 	# Combobox:
-	ttk::style configure TCombobox -postoffset {5 -2 -10 0}
+	ttk::style configure TCombobox \
+	    -foreground systemTextColor \
+	    -background systemTransparent
+	ttk::style map TCombobox \
+	    -foreground {
+		disabled systemDisabledControlTextColor
+	    } \
+	    -selectforeground {
+		background systemTextColor
+	    } \
+	    -selectbackground {
+		background systemTransparent
+	    }
 
+	# Spinbox
+	ttk::style configure TSpinbox \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor \
+	    -selectforeground systemSelectedTextColor \
+	    -selectbackground systemSelectedTextBackgroundColor
+	ttk::style map TSpinbox \
+	    -foreground {
+		disabled systemDisabledControlTextColor
+	    } \
+	    -selectforeground {
+		!active systemTextColor
+	    } \
+	    -selectbackground {
+		!active systemTextBackgroundColor
+		!focus systemTextBackgroundColor
+		focus systemSelectedTextBackgroundColor
+	    }
+	
 	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -rowheight 18 -background White
+	ttk::style configure Heading \
+	    -font TkHeadingFont \
+	    -foreground systemTextColor \
+	    -background systemWindowBackgroundColor
+	ttk::style configure Treeview -rowheight 18 \
+	    -background systemTextBackgroundColor \
+	    -foreground systemTextColor \
+	    -fieldbackground systemTextBackgroundColor
 	ttk::style map Treeview \
-	    -background [list disabled systemDialogBackgroundInactive \
-				{!disabled !selected} systemWindowBody \
-				{selected background} systemHighlightSecondary \
-				selected systemHighlight] \
-	    -foreground [list disabled systemModelessDialogInactiveText \
-				{!disabled !selected} black \
-				selected systemModelessDialogActiveText]
+	    -background {
+		selected systemSelectedTextBackgroundColor
+	    }
 
 	# Enable animation for ttk::progressbar widget:
 	ttk::style configure TProgressbar -period 100 -maxphase 255