From ddc2bc56d36ab7adfd22fe2b85a21c234cb5862d Mon Sep 17 00:00:00 2001
From: das <das>
Date: Wed, 17 Oct 2007 18:55:05 +0000
Subject: more GOOBE

---
 ChangeLog                | 2 ++
 library/demos/entry3.tcl | 4 +---
 library/demos/msgbox.tcl | 5 +++--
 library/demos/widget     | 5 ++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12b7d20..c8c996b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* library/demos/widget:		Aqua GOOBE, cleanup icons.
 	* library/demos/ttkbut.tcl:
+	* library/demos/entry3.tcl:
+	* library/demos/msgbox.tcl:
 
 	* library/demos/button.tcl:	restore setting of button
 					highlightbackground on Aqua.
diff --git a/library/demos/entry3.tcl b/library/demos/entry3.tcl
index b11e127..c8dd1ab 100644
--- a/library/demos/entry3.tcl
+++ b/library/demos/entry3.tcl
@@ -4,7 +4,7 @@
 # permitted input is constrained in some way.  It also shows off a
 # password entry.
 #
-# RCS: @(#) $Id: entry3.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
+# RCS: @(#) $Id: entry3.tcl,v 1.5 2007/10/17 18:55:05 das Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -19,7 +19,6 @@ wm title $w "Constrained Entry Demonstration"
 wm iconname $w "entry3"
 positionWindow $w
 
-
 label $w.msg -font $font -wraplength 5i -justify left -text "Four different\
 	entries are displayed below.  You can add characters by pointing,\
 	clicking and typing, though each is constrained in what it will\
@@ -183,5 +182,4 @@ grid $w.l1 $w.l2 -in $w.mid -padx 3m -pady 1m -sticky ew
 grid $w.l3 $w.l4 -in $w.mid -padx 3m -pady 1m -sticky ew
 grid columnconfigure $w.mid {0 1} -uniform 1
 pack $w.msg -side top
-pack $w.buttons -side bottom -fill x -pady 2m
 pack $w.mid -fill both -expand 1
diff --git a/library/demos/msgbox.tcl b/library/demos/msgbox.tcl
index 92728e3..52e6e30 100644
--- a/library/demos/msgbox.tcl
+++ b/library/demos/msgbox.tcl
@@ -2,13 +2,14 @@
 #
 # This demonstration script creates message boxes of various type
 #
-# RCS: @(#) $Id: msgbox.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.5 2007/10/17 18:55:05 das Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
 }
 
 package require Tk
+package require Ttk
 
 set w .msgbox
 catch {destroy $w}
@@ -21,7 +22,7 @@ label $w.msg -font $font -wraplength 4i -justify left -text "Choose the icon and
 pack $w.msg -side top
 
 pack [addSeeDismiss $w.buttons $w {} {
-    button $w.buttons.vars -text "Message Box" -command "showMessageBox $w"
+    ttk::button $w.buttons.vars -text "Message Box" -command "showMessageBox $w"
 }] -side bottom -fill x
 #pack $w.buttons.dismiss $w.buttons.code $w.buttons.vars -side left -expand 1
 
diff --git a/library/demos/widget b/library/demos/widget
index af5dbd6..04b1b2b 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -10,7 +10,7 @@ exec wish "$0" "$@"
 # separate ".tcl" files is this directory, which are sourced by this script as
 # needed.
 #
-# RCS: @(#) $Id: widget,v 1.34 2007/10/17 18:21:49 das Exp $
+# RCS: @(#) $Id: widget,v 1.35 2007/10/17 18:55:05 das Exp $
 
 package require Tcl	8.5
 package require Tk	8.5
@@ -548,6 +548,9 @@ proc showCode w {
 	    -highlightthickness 0 -orient horizontal -bd 1
 	scrollbar $t.yscroll -command [list $t.text yview] \
 	    -highlightthickness 0 -orient vertical -bd 1
+	if {[tk windowingsystem] eq "aqua"} {
+	    foreach i [list $t.text $t.xscroll $t.yscroll] {$i configure -bd 0}
+	}
 
 	grid $t.text $t.yscroll -sticky news
 	#grid $t.xscroll
-- 
cgit v0.12