summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-03 14:22:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-03 14:22:59 (GMT)
commit37813f8effdab70e2822a129459cd6679ea93c75 (patch)
tree48a1911f9f3b551907fa47cc97ccaf02ff54763b
parente89b89dbe3e7db25998d31e31b905db3dfe37c14 (diff)
parentdcfc048bfc768826800705c75df17091a6b7d185 (diff)
downloadtk-37813f8effdab70e2822a129459cd6679ea93c75.zip
tk-37813f8effdab70e2822a129459cd6679ea93c75.tar.gz
tk-37813f8effdab70e2822a129459cd6679ea93c75.tar.bz2
Merge 8.6
-rw-r--r--.github/workflows/win-build.yml1
-rw-r--r--library/tearoff.tcl2
2 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 53ca190..be18af3 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -23,7 +23,6 @@ jobs:
matrix:
config:
- "OPTS=none"
- - "OPTS=static"
- "OPTS=symbols"
steps:
- name: Checkout Tk
diff --git a/library/tearoff.tcl b/library/tearoff.tcl
index c6cb8ca..1591942 100644
--- a/library/tearoff.tcl
+++ b/library/tearoff.tcl
@@ -138,7 +138,7 @@ proc ::tk::MenuDup {src dst type} {
# Copy the meny entries, if any
set last [$src index last]
- if {$last ne "none" && $last >= 0} {
+ if {$last ne "none"} {
for {set i [$src cget -tearoff]} {$i <= $last} {incr i} {
set cmd [list $dst add [$src type $i] [$src id $i]]
foreach option [$src entryconfigure $i] {