From 12679ab7d3c2a210f4123163671b532b8b55d5f9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 15 Mar 2024 03:06:35 +0000 Subject: CTAN sync 202403150306 --- .../tlnet/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl | 33 ++++++++++------------ .../tlnet/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl | 1 + .../tlnet/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl | 13 ++------- .../tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl | 12 ++++---- .../tlnet/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl | 4 +-- 5 files changed, 27 insertions(+), 36 deletions(-) (limited to 'systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk') diff --git a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl index f1f9fa1633..9d1e1aef31 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl @@ -99,23 +99,20 @@ namespace eval ttk { } "aqua" { - if {[package vsatisfies [package provide Tk] 8.5]} { - # appeared 2007-04-23, Tk 8.5a6 - array set Cursors { - standard arrow - text ibeam - link pointinghand - crosshair crosshair - busy watch - forbidden notallowed - - hresize resizeleftright - vresize resizeupdown - nresize resizeup - sresize resizedown - wresize resizeleft - eresize resizeright - } + array set Cursors { + standard arrow + text ibeam + link pointinghand + crosshair crosshair + busy watch + forbidden notallowed + + hresize resizeleftright + vresize resizeupdown + nresize resizeup + sresize resizedown + wresize resizeleft + eresize resizeright } } } @@ -201,7 +198,7 @@ proc ttk::CursorSampler {f} { if {[info exists argv0] && $argv0 eq [info script]} { wm title . "[array size ::ttk::Cursors] cursors" pack [ttk::CursorSampler .f] -expand true -fill both - bind . [list destroy .] + bind . [list destroy .] focus .f } diff --git a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl index 4cdb5acbfb..12080a3bec 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl @@ -141,6 +141,7 @@ bind TEntry {# nothing} # as a Command modifier. if {[tk windowingsystem] eq "aqua"} { bind TEntry {# nothing} + bind TEntry {# nothing} } # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind TEntry <> {# nothing} diff --git a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl index a0f70c99d0..fc0ea023de 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl @@ -82,7 +82,6 @@ if {[tk windowingsystem] eq "aqua"} { set bbh [expr {[winfo height $mb]} + $bevelPad] set mw [winfo reqwidth $menu] set bw [winfo width $mb] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu] - $menuPad}] set entry [::tk::MenuFindName $menu [$mb cget -text]] if {$entry < 0} { set entry 0 @@ -106,7 +105,7 @@ if {[tk windowingsystem] eq "aqua"} { incr y $menuPad incr x $bw } - default { + default { # flush incr y $bbh } } @@ -118,7 +117,6 @@ if {[tk windowingsystem] eq "aqua"} { set bh [expr {[winfo height $mb]}] set mw [expr {[winfo reqwidth $menu]}] set bw [expr {[winfo width $mb]}] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu]}] if {[tk windowingsystem] eq "win32"} { incr mh 6 incr mw 16 @@ -154,13 +152,8 @@ if {[tk windowingsystem] eq "aqua"} { right { incr x $bw } - default { - if {[$mb cget -style] eq ""} { - incr x [expr {([winfo width $mb] - \ - [winfo reqwidth $menu])/ 2}] - } else { - incr y $bh - } + default { # flush + incr x [expr {([winfo width $mb] - [winfo reqwidth $menu])/ 2}] } } return [list $x $y $entry] diff --git a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl index 0fd9bd7563..1989b8955c 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl @@ -45,9 +45,9 @@ proc ttk::panedwindow::Press {w x y} { proc ttk::panedwindow::Drag {w x y} { variable State if {!$State(pressed)} { return } - switch -- [$w cget -orient] { - horizontal { set delta [expr {$x - $State(pressX)}] } - vertical { set delta [expr {$y - $State(pressY)}] } + switch -glob -- [$w cget -orient] { + h* { set delta [expr {$x - $State(pressX)}] } + v* { set delta [expr {$y - $State(pressY)}] } } $w sashpos $State(sash) [expr {$State(sashPos) + $delta}] } @@ -80,9 +80,9 @@ proc ttk::panedwindow::SetCursor {w x y} { set cursor $State(userConfCursor) if {[llength [$w identify $x $y]]} { # Assume we're over a sash. - switch -- [$w cget -orient] { - horizontal { set cursor hresize } - vertical { set cursor vresize } + switch -glob -- [$w cget -orient] { + h* { set cursor hresize } + v* { set cursor vresize } } } ttk::setCursor $w $cursor diff --git a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl index 257191493e..3d90880044 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl @@ -236,8 +236,8 @@ proc ttk::Repeatedly {args} { after cancel $Repeat(timer) set script [uplevel 1 [list namespace code $args]] set Repeat(script) $script - uplevel #0 $script set Repeat(timer) [after $Repeat(delay) ttk::Repeat] + uplevel #0 $script } ## Repeat -- @@ -245,8 +245,8 @@ proc ttk::Repeatedly {args} { # proc ttk::Repeat {} { variable Repeat - uplevel #0 $Repeat(script) set Repeat(timer) [after $Repeat(interval) ttk::Repeat] + uplevel #0 $Repeat(script) } ## ttk::CancelRepeat -- -- cgit v1.2.3