Merge trunk

Author: jan.nijtmans

.github/workflows/linux-build.yml

@@ -111,15 +111,15 @@ jobs:
           echo "VERSION=`ls -d tk* | sed 's/tk//'`" >> $GITHUB_ENV
       - name: Upload Source Distribution
         if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: Tk ${{ env.VERSION }} Source distribution (snapshot)
           path: |
             /tmp/dist/tk*
             !/tmp/dist/tk*/html/**
       - name: Upload Documentation Distribution
         if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: Tk ${{ env.VERSION }} HTML documentation (snapshot)
           path: /tmp/dist/tk*/html

.github/workflows/onefiledist.yml

@@ -65,7 +65,7 @@ jobs:
         env:
           BUILD_NAME: wish${{ env.TCL_PATCHLEVEL }}_snapshot
       - name: Upload
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: Wish ${{ env.TCL_PATCHLEVEL }} Linux single-file build (snapshot)
           path: ${{ env.INST_DIR }}/*.tar
@@ -156,7 +156,7 @@ jobs:
         env:
           BUILD_NAME: wish${{ env.TCL_PATCHLEVEL }}_snapshot
       - name: Upload
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: Wish ${{ env.TCL_PATCHLEVEL }} macOS single-file build (snapshot)
           path: ${{ env.INST_DIR }}/*.dmg
@@ -219,7 +219,7 @@ jobs:
         env:
           BUILD_NAME: wish${{ env.TCL_PATCHLEVEL }}_snapshot
       - name: Upload
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: Wish ${{ env.TCL_PATCHLEVEL }} Windows single-file build (snapshot)
           path: install/combined/wish${{ env.TCL_PATCHLEVEL }}_snapshot.exe

library/demos/mclist.tcl

@@ -40,14 +40,14 @@ grid row    $w.container 0 -weight 1
 set upArrowData {
     <?xml version="1.0" encoding="UTF-8"?>
     <svg width="16" height="4" version="1.1" xmlns="http://www.w3.org/2000/svg">
-     <path d="m4 4 4-4 4 4z" fill="#000000"/>
+     <path d="m4 4 4-4 4 4z" fill="%s"/>
     </svg>
 }
 
 set downArrowData {
     <?xml version="1.0" encoding="UTF-8"?>
     <svg width="16" height="4" version="1.1" xmlns="http://www.w3.org/2000/svg">
-     <path d="m4 0 4 4 4-4z" fill="#000000"/>
+     <path d="m4 0 4 4 4-4z" fill="%s"/>
     </svg>
 }
 
@@ -59,10 +59,7 @@ proc createArrowImages {} {
 
     foreach dir {up down} {
 	upvar ${dir}ArrowData imgData
-	set idx1 [string first "#000000" $imgData]
-	set idx2 [expr {$idx1 + 6}]
-	set data [string replace $imgData $idx1 $idx2 $fgColor]
-
+	set data [format $imgData $fgColor]
 	image create photo ${dir}Arrow -format $::tk::svgFmt -data $data]
     }
 }
@@ -103,7 +100,7 @@ set font [ttk::style lookup Heading -font {} TkDefaultFont]
 set morePx [expr {[image width noArrow] + round(4 * $tk::scalingPct / 100.0)}]
 foreach col {country capital currency} name {Country Capital Currency} {
     $w.tree heading $col -text $name -image noArrow -anchor w \
-	-command [list SortBy $w.tree $col 0]
+	-command [list SortBy $w.tree $col 1]
     $w.tree column $col -width [expr {[font measure $font $name] + $morePx}]
 }
 set font [ttk::style lookup Treeview -font {} TkDefaultFont]
@@ -135,7 +132,7 @@ proc SortBy {tree col direction} {
 	lappend data [list [$tree set $row $col] $row]
     }
 
-    set dir [expr {$direction ? "-decreasing" : "-increasing"}]
+    set dir [expr {$direction ? "-increasing" : "-decreasing"}]
     set r -1
 
     # Now reshuffle the rows into the sorted order

library/demos/tree.tcl

@@ -26,9 +26,9 @@ pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
 ## Code to populate the roots of the tree (can be more than one on Windows)
 proc populateRoots {tree} {
     foreach dir [lsort -dictionary [file volumes]] {
-	populateTree $tree [$tree insert {} end -text $dir  \
-				-image [tk fileicon [file normalize $dir] 16] \
-				-values [list $dir directory]]
+	populateTree $tree [$tree insert {} end -text $dir \
+		-image [tk fileicon [file normalize $dir] 16] \
+		-values [list $dir directory]]
     }
 }
 
@@ -43,12 +43,14 @@ proc populateTree {tree node} {
 	set f [file normalize $f]
 	set type [file type $f]
 	set id [$tree insert $node end -text [file tail $f] \
-		    -image [tk fileicon $f 16]\
-		    -values [list $f $type]]
+		-image [tk fileicon $f 16] \
+		-values [list $f $type]]
 
 	if {$type eq "directory"} {
-	    ## Make it so that this node is openable
-	    $tree insert $id 0 -text dummy ;# a dummy
+	    if {[file readable $f]} {
+		## Make it so that this node is openable
+		$tree insert $id 0 -text dummy ;# a dummy
+	    }
 	    $tree item $id -text [file tail $f]/
 
 	} elseif {$type eq "file"} {