* doc/SetOptions.3: Added information about TK_OPTION_NULL_OK with

TK_OPTION_RELIEF.

* win/tkWinButton.c: Removed bits about TK_RELIEF_LINK.

* tests/button.test: Added tests for -overrelief; removed tests
for -relief link.

* mac/tkMacButton.c: Removed bits about TK_RELIEF_LINK.

* generic/tkOldConfig.c: Removed bits about TK_RELIEF_LINK.

* generic/tkConfig.c: Removed bits about TK_RELIEF_LINK; added
support for TK_OPTION_NULL_OK for TK_OPTION_RELIEF.

* library/button.tcl: Added binding support for -overrelief.

* generic/tk3d.c (Tk_GetRelief): Added branch for TK_RELIEF_NULL.

* generic/tkButton.c: Added -overrelief option; removed
Enter/Leave EventProc masks and handlers.

* generic/tk.h: Added TK_RELIEF_NULL definition, removed
TK_RELIEF_LINK.

* mac/tkMacDefault.h (DEF_BUTTON_OVER_RELIEF):
* win/tkWinDefault.h (DEF_BUTTON_OVER_RELIEF):
* unix/tkUnixDefault.h (DEF_BUTTON_OVER_RELIEF): Added default
value for the -overrelief option.

1 files changed, 3 insertions, 16 deletions

diff --git a/tests/button.test b/tests/button.test
index 67e0a3b..1c34c5c 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: button.test,v 1.7 2000/05/13 00:39:09 ericm Exp $
+# RCS: @(#) $Id: button.test,v 1.8 2000/05/17 21:17:22 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -87,10 +87,12 @@ foreach test {
     {-justify right right bogus {bad justification "bogus": must be left, right, or center} {1 1 1 1}}
     {-offvalue lousy lousy {} {} {0 0 1 0}}
     {-offvalue fantastic fantastic {} {} {0 0 1 0}}
+    {-overrelief "" "" 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken} {0 1 0 0}}
     {-padx 12m 12m 420x {bad screen distance "420x"} {1 1 1 1}}
     {-pady 12m 12m 420x {bad screen distance "420x"} {1 1 1 1}}
     {-repeatdelay 100 100 foo {expected integer but got "foo"} {0 1 0 0}}
     {-repeatinterval 100 100 foo {expected integer but got "foo"} {0 1 0 0}}
+    {-relief flat flat 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken} {1 1 1 1}}
     {-selectcolor #110022 #110022 bogus {unknown color name "bogus"} {0 0 1 1}}
     {-selectimage image1 image1 bogus {image "bogus" doesn't exist} {0 0 1 1}}
     {-state normal normal bogus {bad state "bogus": must be active, disabled, or normal} {1 1 1 1}}
@@ -128,21 +130,6 @@ foreach test {
 test button-1.$i {configuration options} {
     .c configure -selectcolor {}
 } {}
-test button-1.[incr i] {configuration options} {
-    list [catch {.l configure -relief 1.5} msg] $msg
-} [list 1 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}]
-test button-1.[incr i] {configuration options} {
-    list [catch {.c configure -relief 1.5} msg] $msg
-} [list 1 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}]
-test button-1.[incr i] {configuration options} {
-    list [catch {.r configure -relief 1.5} msg] $msg
-} [list 1 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}]
-test button-1.[incr i] {configuration options} {
-    list [catch {.b configure -relief 1.5} msg] $msg
-} [list 1 {bad relief "1.5": must be flat, groove, link, raised, ridge, solid, or sunken}]
-test button-1.[incr i] {configuration options} {
-    list [catch {.b configure -relief link} msg] $msg [.b cget -relief]
-} [list 0 {} link]
 
 test button-3.1 {ButtonCreate - not enough cd ../unix
 } {