summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/biglist.tcl9
-rw-r--r--demos/bitmaps.tcl2
-rw-r--r--demos/demo.tcl2
-rw-r--r--demos/explorer.tcl13
-rw-r--r--demos/firefox.tcl35
-rw-r--r--demos/help.tcl74
-rw-r--r--demos/imovie.tcl2
-rw-r--r--demos/layout.tcl2
-rw-r--r--demos/mailwasher.tcl2
-rw-r--r--demos/outlook-folders.tcl2
-rw-r--r--demos/outlook-newgroup.tcl2
-rw-r--r--demos/random.tcl46
-rw-r--r--demos/style-editor.tcl2
-rw-r--r--demos/textvariable.tcl2
-rw-r--r--demos/www-options.tcl70
15 files changed, 158 insertions, 107 deletions
diff --git a/demos/biglist.tcl b/demos/biglist.tcl
index 64ad227..268c8d4 100644
--- a/demos/biglist.tcl
+++ b/demos/biglist.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: biglist.tcl,v 1.2 2005/07/11 01:59:07 treectrl Exp $
+
proc DemoBigList {} {
global BigList
@@ -272,9 +274,10 @@ puts "reuse window $w"
}
button $w.b3 -text "Anal Probe Wizard..." -command [list tk_messageBox \
- -parent . -message "After abducting and probing these people for\
- 50 years,\nthe only thing we've learned for certain is that\none in\
- ten just doesn't seem to mind." -title "Anal Probe 2.0"]
+ -parent . -message \
+ "After abducting and probing these people over the last\n\
+ 50 years, the only thing we've learned for certain is that\n\
+ one in ten just doesn't seem to mind." -title "Anal Probe 2.0"]
grid $w.label1 -row 0 -column 0 -sticky w -padx {0 8}
grid $w.entry1 -row 0 -column 1 -sticky w -pady 4
diff --git a/demos/bitmaps.tcl b/demos/bitmaps.tcl
index ea063fd..a26fc56 100644
--- a/demos/bitmaps.tcl
+++ b/demos/bitmaps.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: bitmaps.tcl,v 1.7 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: Bitmaps
#
diff --git a/demos/demo.tcl b/demos/demo.tcl
index dfa3008..e31f09c 100644
--- a/demos/demo.tcl
+++ b/demos/demo.tcl
@@ -1,5 +1,7 @@
#!/bin/wish84.exe
+# RCS: @(#) $Id: demo.tcl,v 1.34 2005/07/11 01:59:07 treectrl Exp $
+
set VERSION 2.0.1
package require Tk 8.4
diff --git a/demos/explorer.tcl b/demos/explorer.tcl
index 333d17a..14e4291 100644
--- a/demos/explorer.tcl
+++ b/demos/explorer.tcl
@@ -1,10 +1,15 @@
+# RCS: @(#) $Id: explorer.tcl,v 1.16 2005/07/11 01:59:07 treectrl Exp $
+
set Dir [file dirname [file dirname [info script]]]
set shellicon 0
-catch {
- lappend auto_path $treectrl_library
- package require shellicon $VERSION
- set shellicon 1
+# Might work on other windows versions, but only tested on XP
+if {$tcl_platform(os) eq "Windows NT" && $tcl_platform(osVersion) == 5.1} {
+ catch {
+ lappend auto_path $treectrl_library
+ package require shellicon $VERSION
+ set shellicon 1
+ }
}
proc DemoExplorerAux {scriptDir scriptFile} {
diff --git a/demos/firefox.tcl b/demos/firefox.tcl
index 272e426..af7144d 100644
--- a/demos/firefox.tcl
+++ b/demos/firefox.tcl
@@ -1,5 +1,9 @@
+# RCS: @(#) $Id: firefox.tcl,v 1.9 2005/07/11 01:59:07 treectrl Exp $
+
proc DemoFirefoxPrivacy {} {
+ global FirefoxPrivacy
+
set T .f2.f1.t
#
@@ -295,12 +299,12 @@ proc DemoFirefoxPrivacy {} {
if {[lindex [%W identify %x %y] 0] eq "header"} {
TreeCtrl::DoubleButton1 %W %x %y
} else {
- TreeCtrl::DemoFirefoxPrivacyButton1 %W %x %y
+ DemoFirefoxPrivacyButton1 %W %x %y
}
break
}
bind DemoFirefoxPrivacy <ButtonPress-1> {
- TreeCtrl::DemoFirefoxPrivacyButton1 %W %x %y
+ DemoFirefoxPrivacyButton1 %W %x %y
break
}
bind DemoFirefoxPrivacy <Button1-Motion> {
@@ -310,30 +314,30 @@ proc DemoFirefoxPrivacy {} {
# noop
}
bind DemoFirefoxPrivacy <Motion> {
- TreeCtrl::DemoFirefoxPrivacyMotion %W %x %y
+ DemoFirefoxPrivacyMotion %W %x %y
}
bind DemoFirefoxPrivacy <Leave> {
- TreeCtrl::DemoFirefoxPrivacyMotion %W %x %y
+ DemoFirefoxPrivacyMotion %W %x %y
}
- set ::TreeCtrl::Priv(demo,prev) ""
+ set FirefoxPrivacy(prev) ""
bindtags $T [list $T DemoFirefoxPrivacy TreeCtrl [winfo toplevel $T] all]
return
}
-proc TreeCtrl::DemoFirefoxPrivacyButton1 {w x y} {
- variable Priv
+proc DemoFirefoxPrivacyButton1 {w x y} {
+ variable TreeCtrl::Priv
focus $w
set id [$w identify $x $y]
set Priv(buttonMode) ""
if {[lindex $id 0] eq "header"} {
- ButtonPress1 $w $x $y
+ TreeCtrl::ButtonPress1 $w $x $y
} elseif {[lindex $id 0] eq "item"} {
set item [lindex $id 1]
# click a button
if {[llength $id] != 6} {
- ButtonPress1 $w $x $y
+ TreeCtrl::ButtonPress1 $w $x $y
return
}
if {[lindex $id 5] eq "eText1"} {
@@ -344,22 +348,23 @@ proc TreeCtrl::DemoFirefoxPrivacyButton1 {w x y} {
return
}
-proc TreeCtrl::DemoFirefoxPrivacyMotion {w x y} {
- variable Priv
+proc DemoFirefoxPrivacyMotion {w x y} {
+ variable TreeCtrl::Priv
+ global FirefoxPrivacy
set id [$w identify $x $y]
if {[lindex $id 0] eq "item"} {
set item [lindex $id 1]
if {[llength $id] == 6 && [lindex $id 5] eq "eText1"} {
- if {$item ne $Priv(demo,prev)} {
+ if {$item ne $FirefoxPrivacy(prev)} {
$w configure -cursor hand2
- set Priv(demo,prev) $item
+ set FirefoxPrivacy(prev) $item
}
return
}
}
- if {$Priv(demo,prev) ne ""} {
+ if {$FirefoxPrivacy(prev) ne ""} {
$w configure -cursor ""
- set Priv(demo,prev) ""
+ set FirefoxPrivacy(prev) ""
}
return
}
diff --git a/demos/help.tcl b/demos/help.tcl
index 66840fb..920c7a6 100644
--- a/demos/help.tcl
+++ b/demos/help.tcl
@@ -1,8 +1,12 @@
+# RCS: @(#) $Id: help.tcl,v 1.16 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: Help contents
#
proc DemoHelpContents {} {
+ global HelpContents
+
set T .f2.f1.t
set height [font metrics [$T cget -font] -linespace]
@@ -94,12 +98,12 @@ proc DemoHelpContents {} {
if {[lindex [%W identify %x %y] 0] eq "header"} {
TreeCtrl::DoubleButton1 %W %x %y
} else {
- TreeCtrl::HelpButton1 %W %x %y
+ HelpButton1 %W %x %y
}
break
}
bind DemoHelpContents <ButtonPress-1> {
- TreeCtrl::HelpButton1 %W %x %y
+ HelpButton1 %W %x %y
break
}
bind DemoHelpContents <Button1-Motion> {
@@ -109,10 +113,10 @@ proc DemoHelpContents {} {
# noop
}
bind DemoHelpContents <Motion> {
- TreeCtrl::HelpMotion %W %x %y
+ HelpMotion %W %x %y
}
bind DemoHelpContents <Leave> {
- TreeCtrl::HelpMotion %W %x %y
+ HelpMotion %W %x %y
}
bind DemoHelpContents <KeyPress-Return> {
if {[llength [%W selection get]] == 1} {
@@ -121,7 +125,7 @@ proc DemoHelpContents {} {
break
}
- set ::TreeCtrl::Priv(help,prev) ""
+ set HelpContents(prev) ""
bindtags $T [list $T DemoHelpContents TreeCtrl [winfo toplevel $T] all]
return
@@ -131,6 +135,8 @@ proc DemoHelpContents {} {
# to change the appearance of the item under the cursor.
proc DemoHelpContents_2 {} {
+ global HelpContents
+
set T .f2.f1.t
set height [font metrics [$T cget -font] -linespace]
@@ -232,12 +238,12 @@ proc DemoHelpContents_2 {} {
if {[lindex [%W identify %x %y] 0] eq "header"} {
TreeCtrl::DoubleButton1 %W %x %y
} else {
- TreeCtrl::HelpButton1 %W %x %y
+ HelpButton1 %W %x %y
}
break
}
bind DemoHelpContents <ButtonPress-1> {
- TreeCtrl::HelpButton1 %W %x %y
+ HelpButton1 %W %x %y
break
}
bind DemoHelpContents <Button1-Motion> {
@@ -247,10 +253,10 @@ proc DemoHelpContents_2 {} {
# noop
}
bind DemoHelpContents <Motion> {
- TreeCtrl::HelpMotion_2 %W %x %y
+ HelpMotion_2 %W %x %y
}
bind DemoHelpContents <Leave> {
- TreeCtrl::HelpMotion_2 %W %x %y
+ HelpMotion_2 %W %x %y
}
bind DemoHelpContents <KeyPress-Return> {
if {[llength [%W selection get]] == 1} {
@@ -259,19 +265,19 @@ proc DemoHelpContents_2 {} {
break
}
- set ::TreeCtrl::Priv(help,prev) ""
+ set HelpContents(prev) ""
bindtags $T [list $T DemoHelpContents TreeCtrl [winfo toplevel $T] all]
return
}
-proc TreeCtrl::HelpButton1 {w x y} {
- variable Priv
+proc HelpButton1 {w x y} {
+ variable TreeCtrl::Priv
focus $w
set id [$w identify $x $y]
set Priv(buttonMode) ""
if {[lindex $id 0] eq "header"} {
- ButtonPress1 $w $x $y
+ TreeCtrl::ButtonPress1 $w $x $y
} elseif {[lindex $id 0] eq "item"} {
set item [lindex $id 1]
# didn't click an element
@@ -299,59 +305,61 @@ proc TreeCtrl::HelpButton1 {w x y} {
return
}
-proc TreeCtrl::HelpMotion {w x y} {
- variable Priv
+proc HelpMotion {w x y} {
+ variable TreeCtrl::Priv
+ global HelpContents
set id [$w identify $x $y]
if {$id eq ""} {
} elseif {[lindex $id 0] eq "header"} {
} elseif {[lindex $id 0] eq "item"} {
set item [lindex $id 1]
if {[llength $id] == 6} {
- if {$item ne $Priv(help,prev)} {
- if {$Priv(help,prev) ne ""} {
- $w item state set $Priv(help,prev) !mouseover
+ if {$item ne $HelpContents(prev)} {
+ if {$HelpContents(prev) ne ""} {
+ $w item state set $HelpContents(prev) !mouseover
}
$w item state set $item mouseover
$w configure -cursor hand2
- set Priv(help,prev) $item
+ set HelpContents(prev) $item
}
return
}
}
- if {$Priv(help,prev) ne ""} {
- $w item state set $Priv(help,prev) !mouseover
+ if {$HelpContents(prev) ne ""} {
+ $w item state set $HelpContents(prev) !mouseover
$w configure -cursor ""
- set Priv(help,prev) ""
+ set HelpContents(prev) ""
}
return
}
# Alternate implementation that does not rely on run-time states
-proc TreeCtrl::HelpMotion_2 {w x y} {
- variable Priv
+proc HelpMotion_2 {w x y} {
+ variable TreeCtrl::Priv
+ global HelpContents
set id [$w identify $x $y]
if {[lindex $id 0] eq "header"} {
} elseif {$id ne ""} {
set item [lindex $id 1]
if {[llength $id] == 6} {
- if {$item ne $Priv(help,prev)} {
- if {$Priv(help,prev) ne ""} {
- set style [$w item style set $Priv(help,prev) 0]
+ if {$item ne $HelpContents(prev)} {
+ if {$HelpContents(prev) ne ""} {
+ set style [$w item style set $HelpContents(prev) 0]
set style [string trim $style .f]
- $w item style map $Priv(help,prev) 0 $style {elemTxtOver elemTxt}
+ $w item style map $HelpContents(prev) 0 $style {elemTxtOver elemTxt}
}
set style [$w item style set $item 0]
$w item style map $item 0 $style.f {elemTxt elemTxtOver}
- set Priv(help,prev) $item
+ set HelpContents(prev) $item
}
return
}
}
- if {$Priv(help,prev) ne ""} {
- set style [$w item style set $Priv(help,prev) 0]
+ if {$HelpContents(prev) ne ""} {
+ set style [$w item style set $HelpContents(prev) 0]
set style [string trim $style .f]
- $w item style map $Priv(help,prev) 0 $style {elemTxtOver elemTxt}
- set Priv(help,prev) ""
+ $w item style map $HelpContents(prev) 0 $style {elemTxtOver elemTxt}
+ set HelpContents(prev) ""
}
return
}
diff --git a/demos/imovie.tcl b/demos/imovie.tcl
index 7bb4531..901c0e5 100644
--- a/demos/imovie.tcl
+++ b/demos/imovie.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: imovie.tcl,v 1.10 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: iMovie
#
diff --git a/demos/layout.tcl b/demos/layout.tcl
index 24ddc3c..8d0ba0c 100644
--- a/demos/layout.tcl
+++ b/demos/layout.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: layout.tcl,v 1.10 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: Layout
#
diff --git a/demos/mailwasher.tcl b/demos/mailwasher.tcl
index 435f8e8..146ea59 100644
--- a/demos/mailwasher.tcl
+++ b/demos/mailwasher.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: mailwasher.tcl,v 1.12 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: MailWasher
#
diff --git a/demos/outlook-folders.tcl b/demos/outlook-folders.tcl
index e26c28e..b9be739 100644
--- a/demos/outlook-folders.tcl
+++ b/demos/outlook-folders.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: outlook-folders.tcl,v 1.10 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: Outlook Express folder list
#
diff --git a/demos/outlook-newgroup.tcl b/demos/outlook-newgroup.tcl
index c828990..7fb4f05 100644
--- a/demos/outlook-newgroup.tcl
+++ b/demos/outlook-newgroup.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: outlook-newgroup.tcl,v 1.13 2005/07/11 01:59:07 treectrl Exp $
+
#
# Demo: Outlook Express newsgroup messages
#
diff --git a/demos/random.tcl b/demos/random.tcl
index 3a4e0dc..4aa187c 100644
--- a/demos/random.tcl
+++ b/demos/random.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: random.tcl,v 1.17 2005/07/11 01:59:07 treectrl Exp $
+
set RandomN 500
set RandomDepth 5
@@ -129,25 +131,25 @@ proc DemoRandom {} {
}
bind DemoRandom <Control-ButtonPress-1> {
set TreeCtrl::Priv(selectMode) toggle
- TreeCtrl::RandomButton1 %W %x %y
+ RandomButton1 %W %x %y
break
}
bind DemoRandom <Shift-ButtonPress-1> {
set TreeCtrl::Priv(selectMode) add
- TreeCtrl::RandomButton1 %W %x %y
+ RandomButton1 %W %x %y
break
}
bind DemoRandom <ButtonPress-1> {
set TreeCtrl::Priv(selectMode) set
- TreeCtrl::RandomButton1 %W %x %y
+ RandomButton1 %W %x %y
break
}
bind DemoRandom <Button1-Motion> {
- TreeCtrl::RandomMotion1 %W %x %y
+ RandomMotion1 %W %x %y
break
}
bind DemoRandom <ButtonRelease-1> {
- TreeCtrl::RandomRelease1 %W %x %y
+ RandomRelease1 %W %x %y
break
}
@@ -156,8 +158,8 @@ proc DemoRandom {} {
return
}
-proc TreeCtrl::RandomButton1 {T x y} {
- variable Priv
+proc RandomButton1 {T x y} {
+ variable TreeCtrl::Priv
focus $T
set id [$T identify $x $y]
set Priv(buttonMode) ""
@@ -168,7 +170,7 @@ proc TreeCtrl::RandomButton1 {T x y} {
# Click in header
} elseif {[lindex $id 0] eq "header"} {
- ButtonPress1 $T $x $y
+ TreeCtrl::ButtonPress1 $T $x $y
# Click in item
} else {
@@ -210,11 +212,11 @@ proc TreeCtrl::RandomButton1 {T x y} {
set Priv(drop) ""
if {$Priv(selectMode) eq "add"} {
- BeginExtend $T $item
+ TreeCtrl::BeginExtend $T $item
} elseif {$Priv(selectMode) eq "toggle"} {
- BeginToggle $T $item
+ TreeCtrl::BeginToggle $T $item
} elseif {![$T selection includes $item]} {
- BeginSelect $T $item
+ TreeCtrl::BeginSelect $T $item
}
$T activate $item
@@ -227,23 +229,23 @@ proc TreeCtrl::RandomButton1 {T x y} {
return
}
-proc TreeCtrl::RandomMotion1 {T x y} {
- variable Priv
+proc RandomMotion1 {T x y} {
+ variable TreeCtrl::Priv
switch $Priv(buttonMode) {
"drag" {
set Priv(autoscan,command,$T) {RandomMotion %T %x %y}
- AutoScanCheck $T $x $y
+ TreeCtrl::AutoScanCheck $T $x $y
RandomMotion $T $x $y
}
default {
- Motion1 $T $x $y
+ TreeCtrl::Motion1 $T $x $y
}
}
return
}
-proc TreeCtrl::RandomMotion {T x y} {
- variable Priv
+proc RandomMotion {T x y} {
+ variable TreeCtrl::Priv
switch $Priv(buttonMode) {
"drag" {
if {!$Priv(drag,motion)} {
@@ -332,18 +334,18 @@ proc TreeCtrl::RandomMotion {T x y} {
$T dragimage configure -visible yes
}
default {
- Motion1 $T $x $y
+ TreeCtrl::Motion1 $T $x $y
}
}
return
}
-proc TreeCtrl::RandomRelease1 {T x y} {
- variable Priv
+proc RandomRelease1 {T x y} {
+ variable TreeCtrl::Priv
if {![info exists Priv(buttonMode)]} return
switch $Priv(buttonMode) {
"drag" {
- AutoScanCancel $T
+ TreeCtrl::AutoScanCancel $T
$T dragimage configure -visible no
$T selection modify {} $Priv(drop)
$T configure -cursor ""
@@ -353,7 +355,7 @@ proc TreeCtrl::RandomRelease1 {T x y} {
unset Priv(buttonMode)
}
default {
- Release1 $T $x $y
+ TreeCtrl::Release1 $T $x $y
}
}
return
diff --git a/demos/style-editor.tcl b/demos/style-editor.tcl
index 72ad52d..232a534 100644
--- a/demos/style-editor.tcl
+++ b/demos/style-editor.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: style-editor.tcl,v 1.6 2005/07/11 01:59:07 treectrl Exp $
+
namespace eval StyleEditor {
variable Info
array unset Info
diff --git a/demos/textvariable.tcl b/demos/textvariable.tcl
index c052607..08627d9 100644
--- a/demos/textvariable.tcl
+++ b/demos/textvariable.tcl
@@ -1,3 +1,5 @@
+# RCS: @(#) $Id: textvariable.tcl,v 1.3 2005/07/11 01:59:07 treectrl Exp $
+
proc DemoTextvariable {} {
set T .f2.f1.t
diff --git a/demos/www-options.tcl b/demos/www-options.tcl
index 4dc2bde..112c307 100644
--- a/demos/www-options.tcl
+++ b/demos/www-options.tcl
@@ -1,5 +1,9 @@
+# RCS: @(#) $Id: www-options.tcl,v 1.11 2005/07/11 01:59:07 treectrl Exp $
+
proc DemoInternetOptions {} {
+ global Options
+
set T .f2.f1.t
set height [font metrics [$T cget -font] -linespace]
@@ -73,10 +77,10 @@ proc DemoInternetOptions {} {
set item [$T item create]
$T item style set $item C0 STYLE
$T item element configure $item C0 elemTxt -text $text
- set ::Option(option,$item) $option
- set ::Option(group,$item) $group
+ set Options(option,$item) $option
+ set Options(group,$item) $group
if {($setting eq "on") || ($setting eq "off")} {
- set ::Option(setting,$item) $setting
+ set Options(setting,$item) $setting
if {$group eq ""} {
$T item state set $item check
if {$setting eq "on"} {
@@ -84,7 +88,7 @@ proc DemoInternetOptions {} {
}
} else {
if {$setting eq "on"} {
- set ::Option(current,$group) $item
+ set Options(current,$group) $item
$T item state set $item on
}
$T item state set $item radio
@@ -101,7 +105,7 @@ proc DemoInternetOptions {} {
TreeCtrl::DoubleButton1 %W %x %y
}
bind DemoInternetOptions <ButtonPress-1> {
- TreeCtrl::OptionButton1 %W %x %y
+ OptionButton1 %W %x %y
break
}
@@ -109,12 +113,14 @@ proc DemoInternetOptions {} {
return
}
-proc TreeCtrl::OptionButton1 {T x y} {
- variable Priv
+
+proc OptionButton1 {T x y} {
+ variable TreeCtrl::Priv
+ global Options
focus $T
set id [$T identify $x $y]
if {[lindex $id 0] eq "header"} {
- ButtonPress1 $T $x $y
+ TreeCtrl::ButtonPress1 $T $x $y
} elseif {$id eq ""} {
set Priv(buttonMode) ""
} else {
@@ -122,25 +128,25 @@ proc TreeCtrl::OptionButton1 {T x y} {
set item [lindex $id 1]
$T selection modify $item all
$T activate $item
- if {$::Option(option,$item) eq ""} return
- set group $::Option(group,$item)
+ if {$Options(option,$item) eq ""} return
+ set group $Options(group,$item)
# a checkbutton
if {$group eq ""} {
$T item state set $item ~on
- if {$::Option(setting,$item) eq "on"} {
+ if {$Options(setting,$item) eq "on"} {
set setting off
} else {
set setting on
}
- set ::Option(setting,$item) $setting
+ set Options(setting,$item) $setting
# a radiobutton
} else {
- set current $::Option(current,$group)
+ set current $Options(current,$group)
if {$current eq $item} return
$T item state set $current !on
$T item state set $item on
- set ::Option(setting,$item) on
- set ::Option(current,$group) $item
+ set Options(setting,$item) on
+ set Options(current,$group) $item
}
}
return
@@ -150,6 +156,8 @@ proc TreeCtrl::OptionButton1 {T x y} {
# Alternate implementation that does not rely on run-time states
proc DemoInternetOptions_2 {} {
+ global Options
+
set T .f2.f1.t
set height [font metrics [$T cget -font] -linespace]
@@ -212,16 +220,16 @@ proc DemoInternetOptions_2 {} {
set item [$T item create]
$T item style set $item 0 STYLE
$T item element configure $item 0 elemTxt -text $text
- set ::Option(option,$item) $option
- set ::Option(group,$item) $group
+ set Options(option,$item) $option
+ set Options(group,$item) $group
if {$setting eq "on" || $setting eq "off"} {
- set ::Option(setting,$item) $setting
+ set Options(setting,$item) $setting
if {$group eq ""} {
set img internet-check-$setting
$T item element configure $item 0 elemImg -image $img
} else {
if {$setting eq "on"} {
- set ::Option(current,$group) $item
+ set Options(current,$group) $item
}
set img internet-radio-$setting
$T item element configure $item 0 elemImg -image $img
@@ -238,7 +246,7 @@ proc DemoInternetOptions_2 {} {
TreeCtrl::DoubleButton1 %W %x %y
}
bind DemoInternetOptions <ButtonPress-1> {
- TreeCtrl::OptionButton1 %W %x %y
+ OptionButton1 %W %x %y
break
}
@@ -246,12 +254,14 @@ proc DemoInternetOptions_2 {} {
return
}
-proc TreeCtrl::OptionButton1_2 {T x y} {
- variable Priv
+
+proc OptionButton1_2 {T x y} {
+ variable TreeCtrl::Priv
+ global Options
focus $T
set id [$T identify $x $y]
if {[lindex $id 0] eq "header"} {
- ButtonPress1 $T $x $y
+ TreeCtrl::ButtonPress1 $T $x $y
} elseif {$id eq ""} {
set Priv(buttonMode) ""
} else {
@@ -259,25 +269,25 @@ proc TreeCtrl::OptionButton1_2 {T x y} {
set item [lindex $id 1]
$T selection modify $item all
$T activate $item
- if {$::Option(option,$item) eq ""} return
- set group $::Option(group,$item)
+ if {$Options(option,$item) eq ""} return
+ set group $Options(group,$item)
# a checkbutton
if {$group eq ""} {
- if {$::Option(setting,$item) eq "on"} {
+ if {$Options(setting,$item) eq "on"} {
set setting off
} else {
set setting on
}
$T item element configure $item 0 elemImg -image internet-check-$setting
- set ::Option(setting,$item) $setting
+ set Options(setting,$item) $setting
# a radiobutton
} else {
- set current $::Option(current,$group)
+ set current $Options(current,$group)
if {$current eq $item} return
$T item element configure $current 0 elemImg -image internet-radio-off
$T item element configure $item 0 elemImg -image internet-radio-on
- set ::Option(setting,$item) on
- set ::Option(current,$group) $item
+ set Options(setting,$item) on
+ set Options(current,$group) $item
}
}
return
generated by cgit v0.12 at 2024-06-28 19:39:23 (GMT)