Coding style improvements for the widget demo. [FRQ 815118]

45 files changed, 136 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ccd58e..0103d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* library/demos/*.tcl: Add [package require Tk] to all the widget
+	demo scripts so they follow standard practice better. [FRQ 815118]
+
 2004-12-20  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* generic/tkFileFilter.c:
diff --git a/library/demos/anilabel.tcl b/library/demos/anilabel.tcl
index 43bbf13..dadf52e 100644
--- a/library/demos/anilabel.tcl
+++ b/library/demos/anilabel.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several animated label widgets.
 #
-# RCS: @(#) $Id: anilabel.tcl,v 1.1 2004/11/07 17:28:21 dkf Exp $
+# RCS: @(#) $Id: anilabel.tcl,v 1.2 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .anilabel
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/aniwave.tcl b/library/demos/aniwave.tcl
index 824388c..fd2b1ec 100644
--- a/library/demos/aniwave.tcl
+++ b/library/demos/aniwave.tcl
@@ -4,12 +4,14 @@
 # coordinates in a way that does something fairly similar to waveform
 # display.
 #
-# RCS: @(#) $Id: aniwave.tcl,v 1.1 2004/11/07 22:41:11 dkf Exp $
+# RCS: @(#) $Id: aniwave.tcl,v 1.2 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .aniwave
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/arrow.tcl b/library/demos/arrow.tcl
index b41c11f..8137473 100644
--- a/library/demos/arrow.tcl
+++ b/library/demos/arrow.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas widget that displays a
 # large line with an arrowhead whose shape can be edited interactively.
 #
-# RCS: @(#) $Id: arrow.tcl,v 1.5 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: arrow.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # arrowSetup --
 # This procedure regenerates all the text and graphics in the canvas
 # window.  It's called when the canvas is initially created, and also
diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl
index 81ad642..5e67834 100644
--- a/library/demos/bind.tcl
+++ b/library/demos/bind.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a text widget with bindings set
 # up for hypertext-like effects.
 #
-# RCS: @(#) $Id: bind.tcl,v 1.4 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: bind.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .bind
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/bitmap.tcl b/library/demos/bitmap.tcl
index fffea45..e439d09 100644
--- a/library/demos/bitmap.tcl
+++ b/library/demos/bitmap.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window that displays
 # all of Tk's built-in bitmaps.
 #
-# RCS: @(#) $Id: bitmap.tcl,v 1.4 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: bitmap.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # bitmapRow --
 # Create a row of bitmap items in a window.
 #
diff --git a/library/demos/button.tcl b/library/demos/button.tcl
index 8211f4b..c13fbbd 100644
--- a/library/demos/button.tcl
+++ b/library/demos/button.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several button widgets.
 #
-# RCS: @(#) $Id: button.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: button.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .button
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/check.tcl b/library/demos/check.tcl
index ef8c5c3..3e3ddc4 100644
--- a/library/demos/check.tcl
+++ b/library/demos/check.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several checkbuttons.
 #
-# RCS: @(#) $Id: check.tcl,v 1.4 2004/02/18 00:40:24 hobbs Exp $
+# RCS: @(#) $Id: check.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .check
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/clrpick.tcl b/library/demos/clrpick.tcl
index 0f97ad0..c20b98f 100644
--- a/library/demos/clrpick.tcl
+++ b/library/demos/clrpick.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script prompts the user to select a color.
 #
-# RCS: @(#) $Id: clrpick.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: clrpick.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .clrpick
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/colors.tcl b/library/demos/colors.tcl
index 9f48837..abd9fb0 100644
--- a/library/demos/colors.tcl
+++ b/library/demos/colors.tcl
@@ -4,12 +4,14 @@
 # many of the colors from the X color database.  You can click on
 # a color to change the application's palette.
 #
-# RCS: @(#) $Id: colors.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: colors.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .colors
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 573bdeb..9e6600c 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a simple canvas that can be
 # scrolled in two dimensions.
 #
-# RCS: @(#) $Id: cscroll.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: cscroll.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .cscroll
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index d016ef8..b65635b 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas widget with a text
 # item that can be edited and reconfigured in various ways.
 #
-# RCS: @(#) $Id: ctext.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: ctext.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .ctext
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/entry1.tcl b/library/demos/entry1.tcl
index 58f8b36..f7faf69 100644
--- a/library/demos/entry1.tcl
+++ b/library/demos/entry1.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates several entry widgets without
 # scrollbars.
 #
-# RCS: @(#) $Id: entry1.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: entry1.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .entry1
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/entry2.tcl b/library/demos/entry2.tcl
index c40f451..3459591 100644
--- a/library/demos/entry2.tcl
+++ b/library/demos/entry2.tcl
@@ -3,12 +3,14 @@
 # This demonstration script is the same as the entry1.tcl script
 # except that it creates scrollbars for the entries.
 #
-# RCS: @(#) $Id: entry2.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: entry2.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .entry2
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/entry3.tcl b/library/demos/entry3.tcl
index 281714e..b11e127 100644
--- a/library/demos/entry3.tcl
+++ b/library/demos/entry3.tcl
@@ -4,12 +4,14 @@
 # permitted input is constrained in some way.  It also shows off a
 # password entry.
 #
-# RCS: @(#) $Id: entry3.tcl,v 1.3 2004/06/28 22:36:18 dkf Exp $
+# RCS: @(#) $Id: entry3.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .entry3
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/filebox.tcl b/library/demos/filebox.tcl
index 3fae38d..e27974b 100644
--- a/library/demos/filebox.tcl
+++ b/library/demos/filebox.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script prompts the user to select a file.
 #
-# RCS: @(#) $Id: filebox.tcl,v 1.5 2004/09/10 20:46:19 dkf Exp $
+# RCS: @(#) $Id: filebox.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .filebox
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl
index 3bd0f7a..5784db3 100644
--- a/library/demos/floor.tcl
+++ b/library/demos/floor.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas widet that displays the
 # floorplan for DEC's Western Research Laboratory.
 #
-# RCS: @(#) $Id: floor.tcl,v 1.5 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: floor.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # floorDisplay --
 # Recreate the floorplan display in the canvas given by "w".  The
 # floor given by "active" is displayed on top with its office structure
diff --git a/library/demos/form.tcl b/library/demos/form.tcl
index b3e8f23..999c7cf 100644
--- a/library/demos/form.tcl
+++ b/library/demos/form.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a simple form with a bunch
 # of entry widgets.
 #
-# RCS: @(#) $Id: form.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: form.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .form
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/goldberg.tcl b/library/demos/goldberg.tcl
index 674217a..97fed22 100644
--- a/library/demos/goldberg.tcl
+++ b/library/demos/goldberg.tcl
@@ -36,11 +36,11 @@
 # I could comment on the code, but it's just 26 state machines with
 # lots of canvas create and move calls.
 
-if 0 {
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
-}
+
+package require Tk
 
 set w .goldberg
 catch {destroy $w}
diff --git a/library/demos/hscale.tcl b/library/demos/hscale.tcl
index 8c73695..1498902 100644
--- a/library/demos/hscale.tcl
+++ b/library/demos/hscale.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script shows an example with a horizontal scale.
 #
-# RCS: @(#) $Id: hscale.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: hscale.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .hscale
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/icon.tcl b/library/demos/icon.tcl
index 26c15a1..e8a7ab2 100644
--- a/library/demos/icon.tcl
+++ b/library/demos/icon.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # buttons that display bitmaps instead of text.
 #
-# RCS: @(#) $Id: icon.tcl,v 1.5 2004/10/19 15:25:06 dkf Exp $
+# RCS: @(#) $Id: icon.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .icon
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/image1.tcl b/library/demos/image1.tcl
index d6327f8..95a2c71 100644
--- a/library/demos/image1.tcl
+++ b/library/demos/image1.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script displays two image widgets.
 #
-# RCS: @(#) $Id: image1.tcl,v 1.4 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: image1.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .image1
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/image2.tcl b/library/demos/image2.tcl
index 6bdb17d..916551e 100644
--- a/library/demos/image2.tcl
+++ b/library/demos/image2.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a simple collection of widgets
 # that allow you to select and view images in a Tk label.
 #
-# RCS: @(#) $Id: image2.tcl,v 1.8 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: image2.tcl,v 1.9 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # loadDir --
 # This procedure reloads the directory listbox from the directory
 # named in the demo's entry.
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index 0ca7371..11aa32f 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas that displays the
 # canvas item types.
 #
-# RCS: @(#) $Id: items.tcl,v 1.6 2004/10/19 15:25:06 dkf Exp $
+# RCS: @(#) $Id: items.tcl,v 1.7 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .items
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/label.tcl b/library/demos/label.tcl
index 4bcfc18..cb26e6d 100644
--- a/library/demos/label.tcl
+++ b/library/demos/label.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several label widgets.
 #
-# RCS: @(#) $Id: label.tcl,v 1.5 2004/10/19 15:25:06 dkf Exp $
+# RCS: @(#) $Id: label.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 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
diff --git a/library/demos/labelframe.tcl b/library/demos/labelframe.tcl
index 53832d4..65411b1 100644
--- a/library/demos/labelframe.tcl
+++ b/library/demos/labelframe.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several labelframe widgets.
 #
-# RCS: @(#) $Id: labelframe.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: labelframe.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .labelframe
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl
index 91eb654..55bee0e 100644
--- a/library/demos/menu.tcl
+++ b/library/demos/menu.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a window with a bunch of menus
 # and cascaded menus using menubars.
 #
-# RCS: @(#) $Id: menu.tcl,v 1.7 2004/10/19 15:25:07 dkf Exp $
+# RCS: @(#) $Id: menu.tcl,v 1.8 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .menu
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/menubu.tcl b/library/demos/menubu.tcl
index e298741..e235fae 100644
--- a/library/demos/menubu.tcl
+++ b/library/demos/menubu.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a window with a bunch of menus
 # and cascaded menus using menubuttons.
 #
-# # RCS: @(#) $Id: menubu.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# # RCS: @(#) $Id: menubu.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .menubutton
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/msgbox.tcl b/library/demos/msgbox.tcl
index 837205a..92728e3 100644
--- a/library/demos/msgbox.tcl
+++ b/library/demos/msgbox.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script creates message boxes of various type
 #
-# RCS: @(#) $Id: msgbox.tcl,v 1.3 2003/08/22 22:44:15 dkf Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .msgbox
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/paned1.tcl b/library/demos/paned1.tcl
index 607ec9f..1c9e3e6 100644
--- a/library/demos/paned1.tcl
+++ b/library/demos/paned1.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # a paned window that separates two windows horizontally.
 #
-# RCS: @(#) $Id: paned1.tcl,v 1.2 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: paned1.tcl,v 1.3 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .paned1
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/paned2.tcl b/library/demos/paned2.tcl
index b7d9adf..9e72139 100644
--- a/library/demos/paned2.tcl
+++ b/library/demos/paned2.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # a paned window that separates two windows vertically.
 #
-# RCS: @(#) $Id: paned2.tcl,v 1.2 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: paned2.tcl,v 1.3 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .paned2
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/pendulum.tcl b/library/demos/pendulum.tcl
index 7c5bd55..cb31b33 100644
--- a/library/demos/pendulum.tcl
+++ b/library/demos/pendulum.tcl
@@ -3,12 +3,14 @@
 # This demonstration illustrates how Tcl/Tk can be used to construct
 # simulations of physical systems.
 #
-# RCS: @(#) $Id: pendulum.tcl,v 1.1 2004/11/07 22:41:11 dkf Exp $
+# RCS: @(#) $Id: pendulum.tcl,v 1.2 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .pendulum
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/plot.tcl b/library/demos/plot.tcl
index c4032fd..82a2c60 100644
--- a/library/demos/plot.tcl
+++ b/library/demos/plot.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas widget showing a 2-D
 # plot with data points that can be dragged with the mouse.
 #
-# RCS: @(#) $Id: plot.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: plot.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .plot
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/puzzle.tcl b/library/demos/puzzle.tcl
index 61d8a80..8b1a888 100644
--- a/library/demos/puzzle.tcl
+++ b/library/demos/puzzle.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a 15-puzzle game using a collection
 # of buttons.
 #
-# RCS: @(#) $Id: puzzle.tcl,v 1.5 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: puzzle.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # puzzleSwitch --
 # This procedure is invoked when the user clicks on a particular button;
 # if the button is next to the empty space, it moves the button into th
diff --git a/library/demos/radio.tcl b/library/demos/radio.tcl
index f637865..be8a0cc 100644
--- a/library/demos/radio.tcl
+++ b/library/demos/radio.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a toplevel window containing
 # several radiobutton widgets.
 #
-# RCS: @(#) $Id: radio.tcl,v 1.6 2004/02/18 00:40:24 hobbs Exp $
+# RCS: @(#) $Id: radio.tcl,v 1.7 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .radio
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/ruler.tcl b/library/demos/ruler.tcl
index 39fdb57..45881cd 100644
--- a/library/demos/ruler.tcl
+++ b/library/demos/ruler.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a canvas widget that displays a ruler
 # with tab stops that can be set, moved, and deleted.
 #
-# RCS: @(#) $Id: ruler.tcl,v 1.6 2004/10/19 15:25:07 dkf Exp $
+# RCS: @(#) $Id: ruler.tcl,v 1.7 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # rulerMkTab --
 # This procedure creates a new triangular polygon in a canvas to
 # represent a tab stop.
diff --git a/library/demos/sayings.tcl b/library/demos/sayings.tcl
index f6262ff..c6066ce 100644
--- a/library/demos/sayings.tcl
+++ b/library/demos/sayings.tcl
@@ -4,12 +4,14 @@
 # both horizontally and vertically.  It displays a collection of
 # well-known sayings.
 #
-# RCS: @(#) $Id: sayings.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: sayings.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .sayings
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/search.tcl b/library/demos/search.tcl
index b72b4ac..3a792c4 100644
--- a/library/demos/search.tcl
+++ b/library/demos/search.tcl
@@ -4,12 +4,14 @@
 # allow you to load a file into a text widget, then perform searches
 # on that file.
 #
-# RCS: @(#) $Id: search.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: search.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 # textLoadFile --
 # This procedure below loads a file into a text widget, discarding
 # the previous contents of the widget. Tags for the old widget are
diff --git a/library/demos/spin.tcl b/library/demos/spin.tcl
index 20bb336..512515d 100644
--- a/library/demos/spin.tcl
+++ b/library/demos/spin.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script creates several spinbox widgets.
 #
-# RCS: @(#) $Id: spin.tcl,v 1.2 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: spin.tcl,v 1.3 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .spin
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/states.tcl b/library/demos/states.tcl
index d60c658..443fea5 100644
--- a/library/demos/states.tcl
+++ b/library/demos/states.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a listbox widget that displays
 # the names of the 50 states in the United States of America.
 #
-# RCS: @(#) $Id: states.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: states.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .states
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/style.tcl b/library/demos/style.tcl
index 035e2b3..ff31fc6 100644
--- a/library/demos/style.tcl
+++ b/library/demos/style.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a text widget that illustrates the
 # various display styles that may be set for tags.
 #
-# RCS: @(#) $Id: style.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: style.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .style
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/text.tcl b/library/demos/text.tcl
index 0cc4870..4bb1155 100644
--- a/library/demos/text.tcl
+++ b/library/demos/text.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a text widget that describes
 # the basic editing functions.
 #
-# RCS: @(#) $Id: text.tcl,v 1.5 2004/03/17 18:15:45 das Exp $
+# RCS: @(#) $Id: text.tcl,v 1.6 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .text
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/twind.tcl b/library/demos/twind.tcl
index 31fdc6f..7510776 100644
--- a/library/demos/twind.tcl
+++ b/library/demos/twind.tcl
@@ -3,12 +3,14 @@
 # This demonstration script creates a text widget with a bunch of
 # embedded windows.
 #
-# RCS: @(#) $Id: twind.tcl,v 1.7 2004/10/19 15:25:07 dkf Exp $
+# RCS: @(#) $Id: twind.tcl,v 1.8 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .twind
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index a0b2677..d9f0fef 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -3,12 +3,14 @@
 # This demonstration script shows how you can produce output (in label
 # widgets) using many different alphabets.
 #
-# RCS: @(#) $Id: unicodeout.tcl,v 1.3 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: unicodeout.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .unicodeout
 catch {destroy $w}
 toplevel $w
diff --git a/library/demos/vscale.tcl b/library/demos/vscale.tcl
index 52979a5..599329c 100644
--- a/library/demos/vscale.tcl
+++ b/library/demos/vscale.tcl
@@ -2,12 +2,14 @@
 #
 # This demonstration script shows an example with a vertical scale.
 #
-# RCS: @(#) $Id: vscale.tcl,v 1.4 2003/08/20 23:02:18 hobbs Exp $
+# RCS: @(#) $Id: vscale.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
+package require Tk
+
 set w .vscale
 catch {destroy $w}
 toplevel $w