Patches for the new demos

1 files changed, 7 insertions, 5 deletions

diff --git a/demos/magicLens.tcl b/demos/magicLens.tcl
index f9b8d00..576ffb4 100644
--- a/demos/magicLens.tcl
+++ b/demos/magicLens.tcl
@@ -24,8 +24,8 @@ namespace eval magicLens {
     lp6Eo0Z8kGKpdrNZSLaruHV8e4e/RIYuV2eGT4Ktbr9/kpc7p6Wud4iNAhEAOw==
   }
 
-  font create magfont -family Helvetica -size 13 -weight bold
-  font create nfont -family Helvetica -size 11 -weight normal
+  catch {font create magfont -family Helvetica -size 13 -weight bold}
+  catch {font create nfont -family Helvetica -size 11 -weight normal}
 
   #
   # The basics colors, one per column.
@@ -72,12 +72,14 @@ namespace eval magicLens {
   catch {destroy $w}
   toplevel $w
   wm title $w "Color Magic Lens Demonstration"
-  wm geometry $w "1000x900+0+0"
   wm iconname $w magicLens
+
+  grid [button $w.dismiss -text Dismiss -command "destroy $w"] -row 2 -column 0 -pady 10
+  grid [button $w.code -text "See Code" -command "showCode $w"] -row 2 -column 1 -pady 10
   #
   # Create a Zinc instance
-  pack [zinc $w.zinc -render 1 -width $width -height $height -borderwidth 0 \
-         -tile paper -backcolor {#cccccc}] -expand yes -fill both
+  grid [zinc $w.zinc -render 1 -width $width -height $height -borderwidth 0 \
+         -tile paper -backcolor {#cccccc}] -row 0 -column 0 -columnspan 2 -sticky ew
   #
   # The main view. The unzoomed world is here.
   $w.zinc add group 1 -tags normview