diff options
| author | ericm <ericm> | 2000-05-17 21:17:19 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-05-17 21:17:19 (GMT) |
| commit | 54e6352675121c47a41ffafce8b02911986cac96 (patch) | |
| tree | cc806cc6c8cbd3daf45e4f418ada919e3ab812e0 /generic/tkOldConfig.c | |
| parent | 2adfe2dab62fa99750852c0a35ff3dbedb810adc (diff) | |
| download | tk-54e6352675121c47a41ffafce8b02911986cac96.zip tk-54e6352675121c47a41ffafce8b02911986cac96.tar.gz tk-54e6352675121c47a41ffafce8b02911986cac96.tar.bz2 | |
* 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.
Diffstat (limited to 'generic/tkOldConfig.c')
| -rw-r--r-- | generic/tkOldConfig.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index 3a373c0..61b1258 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkOldConfig.c,v 1.8 2000/05/13 00:39:07 ericm Exp $ + * RCS: @(#) $Id: tkOldConfig.c,v 1.9 2000/05/17 21:17:21 ericm Exp $ */ #include "tkPort.h" @@ -483,32 +483,9 @@ DoConfig(interp, tkwin, specPtr, value, valueIsUid, widgRec) } case TK_CONFIG_RELIEF: uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value); - /* - * In order that error messages be handled properly, we let - * GetRelief do the first pass check on the relief - * string. If it fails there, and the option spec doesn't - * allow for LINK relief, return an error. If the option spec - * does allow LINK relief, see if the string matches "link". - */ - if (Tk_GetRelief(interp, uid, (int *) ptr) != TCL_OK) { - if ((specPtr->specFlags & TK_CONFIG_LINK_OK) == 0) { - return TCL_ERROR; - } else { - if (uid[0] == 'l' && strcmp(uid, "link") == 0) { - *ptr = TK_RELIEF_LINK; - Tcl_ResetResult(interp); - } else { - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, "bad relief \"", - uid, "\": must be flat, groove, link, " - "raised, ridge, solid, or sunken", - (char *)NULL); - return TCL_ERROR; - } - } + return TCL_ERROR; } - break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: { |