summaryrefslogtreecommitdiff
path: root/tk/generic/tkButton.h
diff options
context:
space:
mode:
Diffstat (limited to 'tk/generic/tkButton.h')
-rw-r--r--tk/generic/tkButton.h39
1 files changed, 32 insertions, 7 deletions
diff --git a/tk/generic/tkButton.h b/tk/generic/tkButton.h
index d0e28822c16..e9a78c32f84 100644
--- a/tk/generic/tkButton.h
+++ b/tk/generic/tkButton.h
@@ -25,6 +25,15 @@
#endif
/*
+ * Legal values for the "compound" field of TkButton records.
+ */
+
+enum compound {
+ COMPOUND_BOTTOM, COMPOUND_CENTER, COMPOUND_LEFT, COMPOUND_NONE,
+ COMPOUND_RIGHT, COMPOUND_TOP
+};
+
+/*
* Legal values for the "state" field of TkButton records.
*/
@@ -107,6 +116,15 @@ typedef struct {
int relief; /* Value of -relief option: specifies 3-d
* effect for border, such as
* TK_RELIEF_RAISED. */
+ int overRelief; /* Value of -overrelief option: specifies a 3-d
+ * effect for the border, such as
+ * TK_RELIEF_RAISED, to be used when the mouse
+ * is over the button. */
+ int offRelief; /* Value of -offrelief option: specifies a 3-d
+ * effect for the border, such as
+ * TK_RELIEF_RAISED, to be used when a
+ * checkbutton or radiobutton without
+ * indicator is off */
Tcl_Obj *highlightWidthPtr; /* Value of -highlightthickness option:
* specifies width in pixels of highlight to
* draw around widget when it has the focus.
@@ -226,6 +244,15 @@ typedef struct {
* to execute when button is invoked. If
* widget is label or has no command, this
* is NULL. */
+ int compound; /* Value of -compound option; specifies whether
+ * the button should show both an image and
+ * text, and, if so, how. */
+ int repeatDelay; /* Value of -repeatdelay option; specifies
+ * the number of ms after which the button will
+ * start to auto-repeat its command. */
+ int repeatInterval; /* Value of -repeatinterval option; specifies
+ * the number of ms between auto-repeat
+ * invocataions of the button command. */
int flags; /* Various flags; see below for
* definitions. */
} TkButton;
@@ -257,16 +284,15 @@ typedef struct {
* deleted.
*/
-#define REDRAW_PENDING 1
-#define SELECTED 2
-#define GOT_FOCUS 4
-#define BUTTON_DELETED 0x8
-
+#define REDRAW_PENDING (1 << 0)
+#define SELECTED (1 << 1)
+#define GOT_FOCUS (1 << 2)
+#define BUTTON_DELETED (1 << 3)
/*
* Declaration of variables shared between the files in the button module.
*/
-extern TkClassProcs tkpButtonProcs;
+extern Tk_ClassProcs tkpButtonProcs;
/*
* Declaration of procedures used in the implementation of the button
@@ -294,4 +320,3 @@ EXTERN int TkInvokeButton _ANSI_ARGS_((TkButton *butPtr));
# define TCL_STORAGE_CLASS DLLIMPORT
#endif /* _TKBUTTON */
-