summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorericm <ericm>2000-05-17 21:17:19 (GMT)
committerericm <ericm>2000-05-17 21:17:19 (GMT)
commit54e6352675121c47a41ffafce8b02911986cac96 (patch)
treecc806cc6c8cbd3daf45e4f418ada919e3ab812e0 /unix
parent2adfe2dab62fa99750852c0a35ff3dbedb810adc (diff)
downloadtk-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 'unix')
-rw-r--r--unix/tkUnixButton.c16
-rw-r--r--unix/tkUnixDefault.h3
2 files changed, 3 insertions, 16 deletions
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index ce9ffac..bad8d8a 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixButton.c,v 1.5 2000/05/13 00:39:09 ericm Exp $
+ * RCS: @(#) $Id: tkUnixButton.c,v 1.6 2000/05/17 21:17:22 ericm Exp $
*/
#include "tkButton.h"
@@ -125,20 +125,6 @@ TkpDisplayButton(clientData)
: TK_RELIEF_RAISED;
}
- /*
- * LINK relief means that the button has a raised relief when it is
- * active, and a flat relief otherwise (like toolbar buttons). It
- * is supported for true buttons only.
- */
-
- if ((butPtr->type == TYPE_BUTTON) && butPtr->relief == TK_RELIEF_LINK) {
- if ((butPtr->flags & MOUSE_IN_BUTTON) == MOUSE_IN_BUTTON) {
- relief = TK_RELIEF_RAISED;
- } else {
- relief = TK_RELIEF_FLAT;
- }
- }
-
offset = (butPtr->type == TYPE_BUTTON) && !Tk_StrictMotif(butPtr->tkwin);
/*
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index 345b943..312e579 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixDefault.h,v 1.6 2000/05/14 20:45:39 ericm Exp $
+ * RCS: @(#) $Id: tkUnixDefault.h,v 1.7 2000/05/17 21:17:22 ericm Exp $
*/
#ifndef _TKUNIXDEFAULT
@@ -70,6 +70,7 @@
#define DEF_BUTTON_JUSTIFY "center"
#define DEF_BUTTON_OFF_VALUE "0"
#define DEF_BUTTON_ON_VALUE "1"
+#define DEF_BUTTON_OVER_RELIEF ""
#define DEF_BUTTON_PADX "3m"
#define DEF_LABCHKRAD_PADX "1"
#define DEF_BUTTON_PADY "1m"