From a2183809c46a4db1f67ad0275d12ff3780af1cb6 Mon Sep 17 00:00:00 2001
From: treectrl <treectrl>
Date: Tue, 12 Jul 2005 02:47:06 +0000
Subject: Use [item element perstate] instead of [item element actual] (it was
 renamed) plus set font to treectrl's -font option if result is "".

---
 library/filelist-bindings.tcl | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/library/filelist-bindings.tcl b/library/filelist-bindings.tcl
index eb91a39..ce143e9 100644
--- a/library/filelist-bindings.tcl
+++ b/library/filelist-bindings.tcl
@@ -477,7 +477,10 @@ proc ::TreeCtrl::EntryOpen {T item column element} {
     scan [$T item bbox $item $column $element] "%d %d" x y
 
     # Get the font used by the Element
-    set font [$T item element actual $item $column $element -font]
+    set font [$T item element perstate $item $column $element -font]
+    if {$font eq ""} {
+	set font [$T cget -font]
+    }
 
     # Get the text used by the Element. Could check master Element too.
     set text [$T item element cget $item $column $element -text]
@@ -563,7 +566,10 @@ proc ::TreeCtrl::EntryExpanderOpen {T item column element} {
     scan [$T item bbox $item $column $element] "%d %d" x y
 
     # Get the font used by the Element
-    set font [$T item element actual $item $column $element -font]
+    set font [$T item element perstate $item $column $element -font]
+    if {$font eq ""} {
+	set font [$T cget -font]
+    }
 
     set Priv(entry,$T,font) $font
 
@@ -689,7 +695,10 @@ proc ::TreeCtrl::TextOpen {T item column element {width 0} {height 0}} {
     scan [$T item bbox $item $column $element] "%d %d %d %d" x1 y1 x2 y2
 
     # Get the font used by the Element
-    set font [$T item element actual $item $column $element -font]
+    set font [$T item element perstate $item $column $element -font]
+    if {$font eq ""} {
+	set font [$T cget -font]
+    }
 
     # Get the text used by the Element. Could check master Element too.
     set text [$T item element cget $item $column $element -text]
@@ -761,7 +770,10 @@ proc ::TreeCtrl::TextExpanderOpen {T item column element width} {
     set Priv(text,$T,center) [expr {$x1 + ($x2 - $x1) / 2}]
 
     # Get the font used by the Element
-    set font [$T item element actual $item $column $element -font]
+    set font [$T item element perstate $item $column $element -font]
+    if {$font eq ""} {
+	set font [$T cget -font]
+    }
 
     # Get the text used by the Element. Could check master Element too.
     set text [$T item element cget $item $column $element -text]
-- 
cgit v0.12