summaryrefslogtreecommitdiffstats
path: root/library/demos/label.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'library/demos/label.tcl')
-rw-r--r--library/demos/label.tcl13
1 files changed, 7 insertions, 6 deletions
diff --git a/library/demos/label.tcl b/library/demos/label.tcl
index c572c2d..a5cab10 100644
--- a/library/demos/label.tcl
+++ b/library/demos/label.tcl
@@ -7,6 +7,8 @@ if {![info exists widgetDemo]} {
error "This script should be run from the \"widget\" demo."
}
+package require Tk
+
set w .label
catch {destroy $w}
toplevel $w
@@ -17,11 +19,9 @@ positionWindow $w
label $w.msg -font $font -wraplength 4i -justify left -text "Five labels are displayed below: three textual ones on the left, and a bitmap label and a text label on the right. Labels are pretty boring because you can't do anything with them."
pack $w.msg -side top
-frame $w.buttons
-pack $w.buttons -side bottom -fill x -pady 2m
-button $w.buttons.dismiss -text Dismiss -command "destroy $w"
-button $w.buttons.code -text "See Code" -command "showCode $w"
-pack $w.buttons.dismiss $w.buttons.code -side left -expand 1
+## See Code / Dismiss buttons
+set btns [addSeeDismiss $w.buttons $w]
+pack $btns -side bottom -fill x
frame $w.left
frame $w.right
@@ -32,7 +32,8 @@ label $w.left.l2 -text "Second label, raised" -relief raised
label $w.left.l3 -text "Third label, sunken" -relief sunken
pack $w.left.l1 $w.left.l2 $w.left.l3 -side top -expand yes -pady 2 -anchor w
+# Main widget program sets variable tk_demoDirectory
label $w.right.bitmap -borderwidth 2 -relief sunken \
- -bitmap @[file join $tk_library demos images face.bmp]
+ -bitmap @[file join $tk_demoDirectory images face.xbm]
label $w.right.caption -text "Tcl/Tk Proprietor"
pack $w.right.bitmap $w.right.caption -side top