Use "T item expand" etc instead of "T expand".

3 files changed, 17 insertions, 15 deletions

diff --git a/demos/help.tcl b/demos/help.tcl
index 0607906..0ac2526 100644
--- a/demos/help.tcl
+++ b/demos/help.tcl
@@ -62,7 +62,7 @@ proc DemoHelpContents {} {
 		set item [$T item create]
 		$T item style set $item 0 $style
 		$T item element configure $item 0 e3 -text $text
-		$T collapse $item
+		$T item collapse $item
 		$T item lastchild [lindex $parentList $depth] $item
 		incr depth
 		set parentList [lreplace $parentList $depth $depth $item]
@@ -100,7 +100,7 @@ proc DemoHelpContents {} {
 	}
 	bind TreeCtrlHelp <KeyPress-Return> {
 		if {[llength [%W selection get]] == 1} {
-			%W toggle [%W selection get]
+			%W item toggle [lindex [%W selection get] 0]
 		}
 		break
 	}
@@ -186,7 +186,7 @@ proc DemoHelpContents2 {} {
 		set item [$T item create]
 		$T item style set $item 0 $style
 		$T item element configure $item 0 e3 -text $text
-		$T collapse $item
+		$T item collapse $item
 		$T item lastchild [lindex $parentList $depth] $item
 		incr depth
 		set parentList [lreplace $parentList $depth $depth $item]
@@ -224,7 +224,7 @@ proc DemoHelpContents2 {} {
 	}
 	bind TreeCtrlHelp <KeyPress-Return> {
 		if {[llength [%W selection get]] == 1} {
-			%W toggle [%W selection get]
+			%W item toggle [lindex [%W selection get] 0]
 		}
 		break
 	}
@@ -247,22 +247,24 @@ proc TreeCtrl::HelpButton1 {w x y} {
 		# didn't click an element
 		if {[llength $id] != 6} return
 		if {[$w selection includes $item]} {
-			$w toggle $item
+			$w item toggle $item
 			return
 		}
 		if {[llength [$w selection get]]} {
-			set item2 [$w selection get]
-			$w collapse $item2
+			set item2 [lindex [$w selection get] 0]
+			$w item collapse $item2
 			foreach item2 [$w item ancestors $item2] {
 				if {[$w compare $item != $item2]} {
-					$w collapse $item2
+					$w item collapse $item2
 				}
 			}
 		}
 		$w selection modify $item all
 		$w activate $item
-		eval $w expand [$w item ancestors $item]
-		$w toggle $item
+		foreach item2 [$w item ancestors $item] {
+			$w item expand $item2
+		}
+		$w item toggle $item
 	}
 	return
 }
diff --git a/demos/outlook-newgroup.tcl b/demos/outlook-newgroup.tcl
index b76b0ac..29e1ef3 100644
--- a/demos/outlook-newgroup.tcl
+++ b/demos/outlook-newgroup.tcl
@@ -124,7 +124,7 @@ proc DemoOutlookNewsgroup {} {
 
 			# Collapse some messages
 			if {rand() * 2 > 1} {
-				$T collapse $itemi
+				$T item collapse $itemi
 			}
 		}
 
@@ -352,7 +352,7 @@ proc DemoOutlookNewsgroup2 {} {
 	for {set i 1} {$i < $msgCnt} {incr i} {
 		if {rand() * 2 > 1} {
 			if {[$T item numchildren $i]} {
-				$T collapse $i
+				$T item collapse $i
 			}
 		}
 	}
diff --git a/demos/random.tcl b/demos/random.tcl
index 02f581c..4127dab 100644
--- a/demos/random.tcl
+++ b/demos/random.tcl
@@ -66,7 +66,7 @@ proc DemoRandom {} {
 			if {[$T depth $itemj] < 5} break
 		}
 		if {rand() * 2 > 1} {
-			$T collapse $itemi
+			$T item collapse $itemi
 		}
 		if {rand() * 2 > 1} {
 			$T item lastchild $itemj $itemi
@@ -154,10 +154,10 @@ proc TreeCtrl::RandomButton1 {T x y} {
 		foreach {where item arg1 arg2 arg3 arg4} $id {}
 		switch $arg1 {
 			button {
-				$T toggle $item
+				$T item toggle $item
 			}
 			line {
-				$T toggle $arg2
+				$T item toggle $arg2
 			}
 			column {
 				set ok 0