diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-10-19 14:35:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-10-19 14:35:32 (GMT) |
| commit | 1716dd0b177db2823c1a9db54804b2ff72749534 (patch) | |
| tree | 36fc0a7bdb7e9433c54d3c4b3e435ed70fac1b7e /library/ttk/fonts.tcl | |
| parent | ce96825d6f9fd7fa85283e2e57577ff202bc872e (diff) | |
| download | tk-1716dd0b177db2823c1a9db54804b2ff72749534.zip tk-1716dd0b177db2823c1a9db54804b2ff72749534.tar.gz tk-1716dd0b177db2823c1a9db54804b2ff72749534.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'library/ttk/fonts.tcl')
| -rw-r--r-- | library/ttk/fonts.tcl | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl index 8cb6c33..8aa898d 100644 --- a/library/ttk/fonts.tcl +++ b/library/ttk/fonts.tcl @@ -1,5 +1,5 @@ # -# $Id: fonts.tcl,v 1.4 2007/05/04 21:29:22 patthoyts Exp $ +# $Id: fonts.tcl,v 1.4.2.1 2007/10/19 14:35:33 dgp Exp $ # # Font specifications. # @@ -81,6 +81,10 @@ catch {font create TkTextFont} catch {font create TkHeadingFont} catch {font create TkCaptionFont} catch {font create TkTooltipFont} +catch {font create TkFixedFont} +catch {font create TkIconFont} +catch {font create TkMenuFont} +catch {font create TkSmallCaptionFont} variable F ;# miscellaneous platform-specific font parameters switch -- [tk windowingsystem] { @@ -108,13 +112,19 @@ switch -- [tk windowingsystem] { font configure TkCaptionFont -family $F(family) -size $F(size) \ -weight bold font configure TkTooltipFont -family $F(family) -size $F(size) + font configure TkFixedFont -family Courier -size 10 + font configure TkIconFont -family $F(family) -size $F(size) + font configure TkMenuFont -family $F(family) -size $F(size) + font configure TkSmallCaptionFont -family $F(family) -size $F(size) } } aqua { set F(family) "Lucida Grande" + set F(fixed) "Monaco" set F(size) 13 set F(viewsize) 12 set F(smallsize) 11 + set F(fixedsize) 9 font configure TkDefaultFont -family $F(family) -size $F(size) font configure TkTextFont -family $F(family) -size $F(size) @@ -122,17 +132,24 @@ switch -- [tk windowingsystem] { font configure TkCaptionFont -family $F(family) -size $F(size) \ -weight bold font configure TkTooltipFont -family $F(family) -size $F(viewsize) + font configure TkFixedFont -family $F(fixed) -size $F(fixedsize) + font configure TkIconFont -family $F(family) -size $F(size) + font configure TkMenuFont -family $F(family) -size $F(size) + font configure TkSmallCaptionFont -family $F(family) -size $F(fixedsize) } default - x11 { if {![catch {tk::pkgconfig get fontsystem} F(fs)] && $F(fs) eq "xft"} { set F(family) "sans-serif" + set F(fixed) "monospace" } else { set F(family) "Helvetica" + set F(fixed) "courier" } set F(size) -12 set F(ttsize) -10 set F(capsize) -14 + set F(fixedsize) -10 font configure TkDefaultFont -family $F(family) -size $F(size) font configure TkTextFont -family $F(family) -size $F(size) @@ -141,6 +158,10 @@ switch -- [tk windowingsystem] { font configure TkCaptionFont -family $F(family) -size $F(capsize) \ -weight bold font configure TkTooltipFont -family $F(family) -size $F(ttsize) + font configure TkFixedFont -family $F(fixed) -size $F(fixedsize) + font configure TkIconFont -family $F(family) -size $F(size) + font configure TkMenuFont -family $F(family) -size $F(size) + font configure TkSmallCaptionFont -family $F(family) -size $F(ttsize) } } unset -nocomplain F |