diff options
| -rw-r--r-- | library/ttk/combobox.tcl | 3 | ||||
| -rw-r--r-- | library/ttk/defaults.tcl | 5 | ||||
| -rw-r--r-- | library/ttk/scrollbar.tcl | 2 | ||||
| -rw-r--r-- | library/ttk/sizegrip.tcl | 2 | ||||
| -rw-r--r-- | library/ttk/utils.tcl | 6 | ||||
| -rw-r--r-- | library/ttk/vistaTheme.tcl | 15 | ||||
| -rw-r--r-- | library/ttk/winTheme.tcl | 15 | ||||
| -rw-r--r-- | library/ttk/xpTheme.tcl | 17 |
8 files changed, 25 insertions, 40 deletions
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl index e339f97..31b60db 100644 --- a/library/ttk/combobox.tcl +++ b/library/ttk/combobox.tcl @@ -269,8 +269,7 @@ proc ttk::combobox::PopdownWindow {cb} { -yscrollcommand [list $popdown.sb set] \ -exportselection false \ -selectmode browse \ - -activestyle none \ - ; + -activestyle none bindtags $popdown.l \ [list $popdown.l ComboboxListbox Listbox $popdown all] diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl index ff8047a..66706a3 100644 --- a/library/ttk/defaults.tcl +++ b/library/ttk/defaults.tcl @@ -31,8 +31,7 @@ namespace eval ttk::theme::default { -selectbackground $colors(-selectbg) \ -selectforeground $colors(-selectfg) \ -insertwidth 1 \ - -indicatordiameter 10 \ - ; + -indicatordiameter 10 ttk::style map "." -background \ [list disabled $colors(-frame) active $colors(-activebg)] @@ -116,7 +115,7 @@ namespace eval ttk::theme::default { ttk::style configure Heading -font TkHeadingFont -relief raised ttk::style configure Treeview \ -background $colors(-window) \ - -foreground $colors(-text) ; + -foreground $colors(-text) ttk::style map Treeview \ -background [list disabled $colors(-frame)\ selected $colors(-selectbg)] \ diff --git a/library/ttk/scrollbar.tcl b/library/ttk/scrollbar.tcl index 8be9887..51edadf 100644 --- a/library/ttk/scrollbar.tcl +++ b/library/ttk/scrollbar.tcl @@ -90,7 +90,7 @@ proc ttk::scrollbar::Drag {w x y} { if {![info exists State(first)]} { # Initial buttonpress was not on the thumb, # or something screwy has happened. In either case, ignore: - return; + return } set xDelta [expr {$x - $State(xPress)}] set yDelta [expr {$y - $State(yPress)}] diff --git a/library/ttk/sizegrip.tcl b/library/ttk/sizegrip.tcl index 080ab2d..6be65e8 100644 --- a/library/ttk/sizegrip.tcl +++ b/library/ttk/sizegrip.tcl @@ -54,7 +54,7 @@ proc ttk::sizegrip::Press {W X Y} { # just bail out -- there's no way to handle this cleanly. # if {[scan [wm geometry $top] "%dx%d+%d+%d" width height x y] != 4} { - return; + return } # Account for gridded geometry: diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl index 3d90880..ebb42d0 100644 --- a/library/ttk/utils.tcl +++ b/library/ttk/utils.tcl @@ -37,12 +37,12 @@ proc ttk::GuessTakeFocus {w} { # Allow traversal to widgets with explicit key or focus bindings: # if {[regexp {Key|Focus} [concat [bind $w] [bind [winfo class $w]]]]} { - return 1; + return 1 } # Default is nontraversable: # - return 0; + return 0 } ## ttk::traverseTo $w -- @@ -168,7 +168,7 @@ proc ttk::RestoreGrab {w} { variable Grab if {![info exists Grab($w)]} { # Ignore - return; + return } # The previous grab/focus window may have been destroyed, diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl index 0700353..fe41f60 100644 --- a/library/ttk/vistaTheme.tcl +++ b/library/ttk/vistaTheme.tcl @@ -22,12 +22,10 @@ namespace eval ttk::theme::vista { -selectforeground SystemHighlightText \ -selectbackground SystemHighlight \ -insertcolor SystemWindowText \ - -font TkDefaultFont \ - ; + -font TkDefaultFont ttk::style map "." \ - -foreground [list disabled SystemGrayText] \ - ; + -foreground [list disabled SystemGrayText] ttk::style configure TButton -anchor center -padding {1 1} -width -11 ttk::style configure TRadiobutton -padding 2 @@ -93,8 +91,7 @@ namespace eval ttk::theme::vista { disabled SystemGrayText \ {readonly focus} SystemHighlightText \ ] \ - -focusfill [list {readonly focus} SystemHighlight] \ - ; + -focusfill [list {readonly focus} SystemHighlight] # Entry ttk::style configure TEntry -padding {1 1 1 1} ;# Needs lookup @@ -113,8 +110,7 @@ namespace eval ttk::theme::vista { } ttk::style map TEntry \ -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; + -selectforeground [list !focus SystemWindowText] # Spinbox ttk::style configure TSpinbox -padding 0 @@ -148,8 +144,7 @@ namespace eval ttk::theme::vista { } ttk::style map TSpinbox \ -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; + -selectforeground [list !focus SystemWindowText] # SCROLLBAR elements (Vista includes a state for 'hover') diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl index 775ea91..6b3cce2 100644 --- a/library/ttk/winTheme.tcl +++ b/library/ttk/winTheme.tcl @@ -13,11 +13,10 @@ namespace eval ttk::theme::winnative { -fieldbackground SystemWindow \ -insertcolor SystemWindowText \ -troughcolor SystemScrollbar \ - -font TkDefaultFont \ - ; + -font TkDefaultFont - ttk::style map "." -foreground [list disabled SystemGrayText] ; - ttk::style map "." -embossed [list disabled 1] ; + ttk::style map "." -foreground [list disabled SystemGrayText] + ttk::style map "." -embossed [list disabled 1] ttk::style configure TButton \ -anchor center -width -11 -relief raised -shiftrelief 1 @@ -34,8 +33,7 @@ namespace eval ttk::theme::winnative { -fieldbackground \ [list readonly SystemButtonFace disabled SystemButtonFace] \ -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; + -selectforeground [list !focus SystemWindowText] ttk::style configure TCombobox -padding 2 ttk::style map TCombobox \ @@ -48,8 +46,7 @@ namespace eval ttk::theme::winnative { disabled SystemGrayText \ {readonly focus} SystemHighlightText \ ] \ - -focusfill [list {readonly focus} SystemHighlight] \ - ; + -focusfill [list {readonly focus} SystemHighlight] ttk::style element create ComboboxPopdownFrame.border from default ttk::style configure ComboboxPopdownFrame \ @@ -79,6 +76,6 @@ namespace eval ttk::theme::winnative { selected SystemHighlightText] ttk::style configure TProgressbar \ - -background SystemHighlight -borderwidth 0 ; + -background SystemHighlight -borderwidth 0 } } diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl index da7b422..fb73262 100644 --- a/library/ttk/xpTheme.tcl +++ b/library/ttk/xpTheme.tcl @@ -12,12 +12,10 @@ namespace eval ttk::theme::xpnative { -selectforeground SystemHighlightText \ -selectbackground SystemHighlight \ -insertcolor SystemWindowText \ - -font TkDefaultFont \ - ; + -font TkDefaultFont ttk::style map "." \ - -foreground [list disabled SystemGrayText] \ - ; + -foreground [list disabled SystemGrayText] ttk::style configure TButton -anchor center -padding {1 1} -width -11 ttk::style configure TRadiobutton -padding 2 @@ -34,8 +32,7 @@ namespace eval ttk::theme::xpnative { ttk::style configure TEntry -padding {2 2 2 4} ttk::style map TEntry \ -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; + -selectforeground [list !focus SystemWindowText] ttk::style configure TCombobox -padding 2 ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ @@ -44,14 +41,12 @@ namespace eval ttk::theme::xpnative { disabled SystemGrayText \ {readonly focus} SystemHighlightText \ ] \ - -focusfill [list {readonly focus} SystemHighlight] \ - ; + -focusfill [list {readonly focus} SystemHighlight] ttk::style configure TSpinbox -padding {2 0 14 0} ttk::style map TSpinbox \ -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; + -selectforeground [list !focus SystemWindowText] ttk::style configure Toolbutton -padding {4 4} @@ -62,6 +57,6 @@ namespace eval ttk::theme::xpnative { -background [list disabled SystemButtonFace \ selected SystemHighlight] \ -foreground [list disabled SystemGrayText \ - selected SystemHighlightText]; + selected SystemHighlightText] } } |