summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
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 /generic/tk.h
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 'generic/tk.h')
-rw-r--r--generic/tk.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 62fab06..3b58cdd 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tk.h,v 1.42 2000/05/13 00:39:07 ericm Exp $
+ * RCS: @(#) $Id: tk.h,v 1.43 2000/05/17 21:17:20 ericm Exp $
*/
#ifndef _TK
@@ -204,9 +204,6 @@ typedef struct Tk_OptionSpec {
#define TK_OPTION_NULL_OK (1 << 0)
#define TK_OPTION_DONT_SET_DEFAULT (1 << 3)
-/* This widget allows the link relief */
-#define TK_OPTION_LINK_OK (1 << 6)
-
/*
* Macro to use to fill in "offset" fields of the Tk_OptionSpec.
* struct. Computes number of bytes from beginning of structure
@@ -368,8 +365,6 @@ typedef enum {
#define TK_CONFIG_MONO_ONLY (1 << 2)
#define TK_CONFIG_DONT_SET_DEFAULT (1 << 3)
#define TK_CONFIG_OPTION_SPECIFIED (1 << 4)
-/* This widget allows the link relief */
-#define TK_CONFIG_LINK_OK (1 << 6)
#define TK_CONFIG_USER_BIT 0x100
#endif /* __NO_OLD_CONFIG */
@@ -439,13 +434,13 @@ typedef enum {
* Relief values returned by Tk_GetRelief:
*/
+#define TK_RELIEF_NULL -1
#define TK_RELIEF_FLAT 0
#define TK_RELIEF_GROOVE 1
#define TK_RELIEF_RAISED 2
#define TK_RELIEF_RIDGE 3
#define TK_RELIEF_SOLID 4
#define TK_RELIEF_SUNKEN 5
-#define TK_RELIEF_LINK 6
/*
* "Which" argument values for Tk_3DBorderGC: