diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-11-21 17:01:47 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-11-21 17:01:47 (GMT) |
| commit | 8067e30daf1f855a87d4e6fd9e75e7b9dc570b58 (patch) | |
| tree | 8df40ae769015fed75a291fa02409921b0810ef4 | |
| parent | 41749d2f0483a6d2f71f624be6b96faff276f491 (diff) | |
| download | tk-8067e30daf1f855a87d4e6fd9e75e7b9dc570b58.zip tk-8067e30daf1f855a87d4e6fd9e75e7b9dc570b58.tar.gz tk-8067e30daf1f855a87d4e6fd9e75e7b9dc570b58.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | library/msgbox.tcl | 4 | ||||
| -rw-r--r-- | library/tkfbox.tcl | 13 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,7 @@ +2007-11-21 Donal K. Fellows <donal.k.fellows@manchester.ac.uk> + + * library/tkfbox.tcl: Better theming in the file list area. + 2007-11-19 Don Porter <dgp@users.sourceforge.net> *** 8.5b3 TAGGED FOR RELEASE *** diff --git a/library/msgbox.tcl b/library/msgbox.tcl index f163f20..14935d5 100644 --- a/library/msgbox.tcl +++ b/library/msgbox.tcl @@ -3,7 +3,7 @@ # Implements messageboxes for platforms that do not have native # messagebox support. # -# RCS: @(#) $Id: msgbox.tcl,v 1.30.2.3 2007/11/02 14:51:39 dgp Exp $ +# RCS: @(#) $Id: msgbox.tcl,v 1.30.2.4 2007/11/21 17:01:47 dgp Exp $ # # Copyright (c) 1994-1997 Sun Microsystems, Inc. # @@ -247,7 +247,7 @@ proc ::tk::MessageBox {args} { } # There is only one background colour for the whole dialog - set bg [ttk::style lookup $::ttk::currentTheme -background] + set bg [ttk::style lookup . -background] # 3. Create the top-level window and divide it into top # and bottom parts. diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl index 92d45b2..97c0a4e 100644 --- a/library/tkfbox.tcl +++ b/library/tkfbox.tcl @@ -11,7 +11,7 @@ # files by clicking on the file icons or by entering a filename # in the "Filename:" entry. # -# RCS: @(#) $Id: tkfbox.tcl,v 1.59.2.4 2007/11/05 14:24:18 dgp Exp $ +# RCS: @(#) $Id: tkfbox.tcl,v 1.59.2.5 2007/11/21 17:01:47 dgp Exp $ # # Copyright (c) 1994-1998 Sun Microsystems, Inc. # @@ -169,6 +169,10 @@ proc ::tk::IconList_DrawSelection {w} { upvar ::tk::$w:itemList itemList $data(canvas) delete selection + $data(canvas) itemconfigure selectionText -fill black + $data(canvas) dtag selectionText + set cbg [ttk::style lookup TEntry -selectbackground focus] + set cfg [ttk::style lookup TEntry -selectforeground focus] foreach item $data(selection) { set rTag [lindex [lindex $data(list) $item] 2] foreach {iTag tTag text serial} $itemList($rTag) { @@ -176,8 +180,9 @@ proc ::tk::IconList_DrawSelection {w} { } set bbox [$data(canvas) bbox $tTag] - $data(canvas) create rect $bbox -fill \#a0a0ff -outline \#a0a0ff \ + $data(canvas) create rect $bbox -fill $cbg -outline $cbg \ -tags selection + $data(canvas) itemconfigure $tTag -fill $cfg -tags selectionText } $data(canvas) lower selection return @@ -226,9 +231,7 @@ proc ::tk::IconList_Create {w} { set data(sbar) [ttk::scrollbar $w.cHull.sbar -orient horizontal -takefocus 0] catch {$data(sbar) configure -highlightthickness 0} set data(canvas) [canvas $w.cHull.canvas -highlightthick 0 \ - -width 400 -height 120 -takefocus 1] - $data(canvas) configure -background \ - [ttk::style lookup $::ttk::currentTheme -background] + -width 400 -height 120 -takefocus 1 -background white] pack $data(sbar) -side bottom -fill x -padx 2 -in $w.cHull -pady {0 2} pack $data(canvas) -expand yes -fill both -padx 2 -pady {2 0} pack $w.cHull -expand yes -fill both -ipadx 2 -ipady 2 |