* Merged 8.1 branch into the main trunk

1 files changed, 8 insertions, 10 deletions

diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c
index 6f7c8cb..7c169fe 100644
--- a/mac/tkMacMenubutton.c
+++ b/mac/tkMacMenubutton.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: tkMacMenubutton.c,v 1.2 1998/09/14 18:23:38 stanton Exp $
+ * RCS: @(#) $Id: tkMacMenubutton.c,v 1.3 1999/04/16 01:51:31 stanton Exp $
  */
 
 #include "tkMenubutton.h"
@@ -110,9 +110,10 @@ TkpDisplayMenuButton(
     SetGWorld(destPort, NULL);
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
 
-    if ((mbPtr->state == tkDisabledUid) && (mbPtr->disabledFg != NULL)) {
+    if ((mbPtr->state == STATE_DISABLED) && (mbPtr->disabledFg != NULL)) {
 	gc = mbPtr->disabledGC;
-    } else if ((mbPtr->state == tkActiveUid) && !Tk_StrictMotif(mbPtr->tkwin)) {
+    } else if ((mbPtr->state == STATE_ACTIVE)
+	    && !Tk_StrictMotif(mbPtr->tkwin)) {
 	gc = mbPtr->activeTextGC;
     } else {
 	gc = mbPtr->normalTextGC;
@@ -162,10 +163,10 @@ TkpDisplayMenuButton(
      * foreground color, generate the stippled effect.
      */
 
-    if ((mbPtr->state == tkDisabledUid)
-	    && ((mbPtr->disabledFg == NULL) || (mbPtr->image != NULL))) {
-	XFillRectangle(mbPtr->display, Tk_WindowId(tkwin), mbPtr->disabledGC,
-		mbPtr->inset, mbPtr->inset,
+    if (mbPtr->state == STATE_DISABLED && mbPtr->disabledFg != NULL) {
+            || (mbPtr->image != NULL))) {
+	XFillRectangle(mbPtr->display, Tk_WindowId(tkwin), 
+                mbPtr->disabledGC, mbPtr->inset, mbPtr->inset,
 		(unsigned) (Tk_Width(tkwin) - 2*mbPtr->inset),
 		(unsigned) (Tk_Height(tkwin) - 2*mbPtr->inset));
     }
@@ -221,9 +222,6 @@ TkpDisplayMenuButton(
 	LineTo(r.left + kShadowOffset, r.bottom);
     }
     
-	if (mbPtr->state == tkDisabledUid) {
-	}
-    
     if (mbPtr->highlightWidth != 0) {
 	GC gc;