summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--library/ttk/vistaTheme.tcl5
-rw-r--r--library/ttk/winTheme.tcl10
-rw-r--r--library/ttk/xpTheme.tcl7
4 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8483cb1..0412582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-02 Joe English <jenglish@users.sourceforge.net>
+
+ * library/ttk/winTheme.tcl, library/ttk/xpTheme.tcl,
+ library/ttk/vistaTheme.tcl: Specify disabled combobox text
+ foreground color [Bug#3057573].
+
2010-09-01 Don Porter <dgp@users.sourceforge.net>
*** 8.5.9 TAGGED FOR RELEASE ***
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index 107f227..811a1a4 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -92,7 +92,10 @@ namespace eval ttk::theme::vista {
ttk::style map TCombobox \
-selectbackground [list !focus SystemWindow] \
-selectforeground [list !focus SystemWindowText] \
- -foreground [list {readonly focus} SystemHighlightText] \
+ -foreground [list \
+ disabled SystemGrayText \
+ {readonly focus} SystemHighlightText \
+ ] \
-focusfill [list {readonly focus} SystemHighlight] \
;
diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl
index 9ccb98e..3062294 100644
--- a/library/ttk/winTheme.tcl
+++ b/library/ttk/winTheme.tcl
@@ -1,5 +1,5 @@
#
-# $Id: winTheme.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $
+# $Id: winTheme.tcl,v 1.6.2.2 2010/09/02 17:46:11 jenglish Exp $
#
# Settings for 'winnative' theme.
#
@@ -41,7 +41,13 @@ namespace eval ttk::theme::winnative {
ttk::style map TCombobox \
-selectbackground [list !focus SystemWindow] \
-selectforeground [list !focus SystemWindowText] \
- -foreground [list {readonly focus} SystemHighlightText] \
+ -fieldbackground [list \
+ readonly SystemButtonFace \
+ disabled SystemButtonFace] \
+ -foreground [list \
+ disabled SystemGrayText \
+ {readonly focus} SystemHighlightText \
+ ] \
-focusfill [list {readonly focus} SystemHighlight] \
;
diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl
index edf5fa4..6eeb3e0 100644
--- a/library/ttk/xpTheme.tcl
+++ b/library/ttk/xpTheme.tcl
@@ -1,5 +1,5 @@
#
-# $Id: xpTheme.tcl,v 1.6.2.4 2010/08/26 02:06:10 hobbs Exp $
+# $Id: xpTheme.tcl,v 1.6.2.5 2010/09/02 17:46:11 jenglish Exp $
#
# Settings for 'xpnative' theme
#
@@ -48,7 +48,10 @@ namespace eval ttk::theme::xpnative {
ttk::style map TCombobox \
-selectbackground [list !focus SystemWindow] \
-selectforeground [list !focus SystemWindowText] \
- -foreground [list {readonly focus} SystemHighlightText] \
+ -foreground [list \
+ disabled SystemGrayText \
+ {readonly focus} SystemHighlightText \
+ ] \
-focusfill [list {readonly focus} SystemHighlight] \
;