diff options
| author | ericm <ericm> | 2000-05-13 00:39:06 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-05-13 00:39:06 (GMT) |
| commit | bfa082e9202bf219a84a4bb0d997d6cf1f834516 (patch) | |
| tree | b61f779971a9663ee07b65009e60aa206dd22e32 /generic/tk.h | |
| parent | 32c00bd4e54bd4254300852356a6fff59d388d45 (diff) | |
| download | tk-bfa082e9202bf219a84a4bb0d997d6cf1f834516.zip tk-bfa082e9202bf219a84a4bb0d997d6cf1f834516.tar.gz tk-bfa082e9202bf219a84a4bb0d997d6cf1f834516.tar.bz2 | |
* unix/tkUnixButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
* mac/tkMacButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
* win/tkWinButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
Added code for drawing compound buttons.
* tests/button.test: Added configuration tests for -repeatdelay,
-repeatinterval, -compound.
* library/button.tcl: Added support for -repeatedelay,
-repeatinterval options.
* generic/tkOldConfig.c: Changed handling of link relief so that
proper error messages are used.
* generic/tkButton.h: Added -compound, -repeatdelay,
-repeatinterval options.
* generic/tkButton.c: Added event watchers for enter/leave events,
for link relief support.
* generic/tk3d.c: Changed handling of link relief so that proper
error messages are used.
* generic/tk.h: Changed values of
TK_OPTION_LINK_OK/TK_CONFIG_LINK_OK for link relief support.
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/generic/tk.h b/generic/tk.h index cd31a16..62fab06 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.41 2000/05/10 00:09:38 ericm Exp $ + * RCS: @(#) $Id: tk.h,v 1.42 2000/05/13 00:39:07 ericm Exp $ */ #ifndef _TK @@ -201,11 +201,11 @@ typedef struct Tk_OptionSpec { * carefully. */ -#define TK_OPTION_NULL_OK 1 -#define TK_OPTION_DONT_SET_DEFAULT 8 +#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 << 9) +#define TK_OPTION_LINK_OK (1 << 6) /* * Macro to use to fill in "offset" fields of the Tk_OptionSpec. @@ -363,14 +363,14 @@ typedef enum { * tkOldConfig.c (internal-use-only flags are defined there). */ -#define TK_CONFIG_NULL_OK 1 -#define TK_CONFIG_COLOR_ONLY 2 -#define TK_CONFIG_MONO_ONLY 4 -#define TK_CONFIG_DONT_SET_DEFAULT 8 -#define TK_CONFIG_OPTION_SPECIFIED 0x10 -#define TK_CONFIG_USER_BIT 0x100 +#define TK_CONFIG_NULL_OK (1 << 0) +#define TK_CONFIG_COLOR_ONLY (1 << 1) +#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 << 9) +#define TK_CONFIG_LINK_OK (1 << 6) +#define TK_CONFIG_USER_BIT 0x100 #endif /* __NO_OLD_CONFIG */ /* |