touched all tk files to ease next import

[pf3gnuchains/pf3gnuchains3x.git] / tk / mac / tkMacMenubutton.c

diff --git a/tk/mac/tkMacMenubutton.c b/tk/mac/tkMacMenubutton.c
index 6ba9f19..b7ffe5d 100644 (file)
--- a/tk/mac/tkMacMenubutton.c
+++ b/tk/mac/tkMacMenubutton.c
@@ -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,19 +222,18 @@ TkpDisplayMenuButton(
        LineTo(r.left + kShadowOffset, r.bottom);
     }
     
-       if (mbPtr->state == tkDisabledUid) {
-       }
-    
     if (mbPtr->highlightWidth != 0) {
-       GC gc;
+       GC fgGC, bgGC;
 
+       bgGC = Tk_GCForColor(mbPtr->highlightBgColorPtr, Tk_WindowId(tkwin));
        if (mbPtr->flags & GOT_FOCUS) {
-           gc = Tk_GCForColor(mbPtr->highlightColorPtr, Tk_WindowId(tkwin));
+           fgGC = Tk_GCForColor(mbPtr->highlightColorPtr, Tk_WindowId(tkwin));
+           TkpDrawHighlightBorder(tkwin, fgGC, bgGC, mbPtr->highlightWidth,
+                   Tk_WindowId(tkwin));
        } else {
-           gc = Tk_GCForColor(mbPtr->highlightBgColorPtr, Tk_WindowId(tkwin));
+           TkpDrawHighlightBorder(tkwin, bgGC, bgGC, mbPtr->highlightWidth,
+                   Tk_WindowId(tkwin));
        }
-       Tk_DrawFocusHighlight(tkwin, gc, mbPtr->highlightWidth,
-               Tk_WindowId(tkwin));
     }
 
     SetGWorld(saveWorld, saveDevice);
@@ -337,3 +337,4 @@ TkpComputeMenuButtonGeometry(mbPtr)
            (int) (height + 2*mbPtr->inset));
     Tk_SetInternalBorder(mbPtr->tkwin, mbPtr->inset);
 }
+