summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixMenubu.c
diff options
context:
space:
mode:
Diffstat (limited to 'unix/tkUnixMenubu.c')
-rw-r--r--unix/tkUnixMenubu.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index 7c33033..d8cba87 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.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: tkUnixMenubu.c,v 1.2 1998/09/14 18:23:57 stanton Exp $
+ * RCS: @(#) $Id: tkUnixMenubu.c,v 1.3 1999/04/16 01:51:47 stanton Exp $
*/
#include "tkMenubutton.h"
@@ -84,10 +84,11 @@ TkpDisplayMenuButton(clientData)
return;
}
- if ((mbPtr->state == tkDisabledUid) && (mbPtr->disabledFg != NULL)) {
+ if ((mbPtr->state == STATE_DISABLED) && (mbPtr->disabledFg != NULL)) {
gc = mbPtr->disabledGC;
border = mbPtr->normalBorder;
- } else if ((mbPtr->state == tkActiveUid) && !Tk_StrictMotif(mbPtr->tkwin)) {
+ } else if ((mbPtr->state == STATE_ACTIVE)
+ && !Tk_StrictMotif(mbPtr->tkwin)) {
gc = mbPtr->activeTextGC;
border = mbPtr->activeBorder;
} else {
@@ -142,8 +143,8 @@ TkpDisplayMenuButton(clientData)
* foreground color, generate the stippled effect.
*/
- if ((mbPtr->state == tkDisabledUid)
- && ((mbPtr->disabledFg == NULL) || (mbPtr->image != NULL))) {
+ if (((mbPtr->state == STATE_DISABLED)
+ && (mbPtr->disabledFg == NULL)) || (mbPtr->image != NULL)) {
XFillRectangle(mbPtr->display, pixmap, mbPtr->disabledGC,
mbPtr->inset, mbPtr->inset,
(unsigned) (Tk_Width(tkwin) - 2*mbPtr->inset),
@@ -248,7 +249,7 @@ TkpDestroyMenuButton(mbPtr)
void
TkpComputeMenuButtonGeometry(mbPtr)
- register TkMenuButton *mbPtr; /* Widget record for menu button. */
+ TkMenuButton *mbPtr; /* Widget record for menu button. */
{
int width, height, mm, pixels;