Fix bug [70e531918e]: geometry issues with menubuttons on macOS

5 files changed, 142 insertions, 174 deletions

diff --git a/library/menu.tcl b/library/menu.tcl
index ba66b92..a406ae3 100644
--- a/library/menu.tcl
+++ b/library/menu.tcl
@@ -274,8 +274,13 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
     if {[tk windowingsystem] ne "aqua"} {
 	set Priv(relief) [$w cget -relief]
 	$w configure -relief raised
+	set xoffset {0 0 0 0 0}
+	set yoffset {0 0 0 0 0}
     } else {
 	$w configure -state active
+	# Compensate for offsets created by the macOS window manager.
+	set xoffset {9 9 18 9 0}
+	set yoffset {6 13 13 13 9}
     }
 
     set Priv(postedMb) $w
@@ -291,22 +296,26 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
     if {[catch {
 	switch [$w cget -direction] {
 	    above {
-		set x [winfo rootx $w]
+		set x [expr {[winfo rootx $w]}]
 		set y [expr {[winfo rooty $w] - [winfo reqheight $menu]}]
 		# if we go offscreen to the top, show as 'below'
 		if {$y < [winfo vrooty $w]} {
 		    set y [expr {[winfo vrooty $w] + [winfo rooty $w] + [winfo reqheight $w]}]
 		}
+		incr x [lindex $xoffset 0]
+		incr y [lindex $yoffset 0]
 		PostOverPoint $menu $x $y
 	    }
 	    below {
-		set x [winfo rootx $w]
+		set x [expr {[winfo rootx $w]}]
 		set y [expr {[winfo rooty $w] + [winfo height $w]}]
 		# if we go offscreen to the bottom, show as 'above'
 		set mh [winfo reqheight $menu]
 		if {($y + $mh) > ([winfo vrooty $w] + [winfo vrootheight $w])} {
 		    set y [expr {[winfo vrooty $w] + [winfo vrootheight $w] + [winfo rooty $w] - $mh}]
 		}
+		incr x [lindex $xoffset 1]
+		incr y [lindex $yoffset 1]
 		PostOverPoint $menu $x $y
 	    }
 	    left {
@@ -325,6 +334,8 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
 			        + [$menu yposition [expr {$entry+1}]])/2}]
 		    }
 		}
+		incr x [lindex $xoffset 2]
+		incr y [lindex $yoffset 2]
 		PostOverPoint $menu $x $y
 		if {$entry ne "" \
 			&& [$menu entrycget $entry -state] ne "disabled"} {
@@ -348,6 +359,8 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
 			        + [$menu yposition [expr {$entry+1}]])/2}]
 		    }
 		}
+		incr x [lindex $xoffset 3]
+		incr y [lindex $yoffset 3]
 		PostOverPoint $menu $x $y
 		if {$entry ne "" \
 			&& [$menu entrycget $entry -state] ne "disabled"} {
@@ -356,6 +369,8 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
 		}
 	    }
 	    default {
+		incr x [lindex $xoffset 4]
+		incr y [lindex $yoffset 4]
 		if {[$w cget -indicatoron]} {
 		    if {$y eq ""} {
 			set x [expr {[winfo rootx $w] + [winfo width $w]/2}]
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index b749673..48ddd66 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -334,7 +334,7 @@
  * Defaults for menubuttons:
  */
 
-#define DEF_MENUBUTTON_ANCHOR		"center"
+#define DEF_MENUBUTTON_ANCHOR		"w"
 #define DEF_MENUBUTTON_ACTIVE_BG_COLOR	ACTIVE_BG
 #define DEF_MENUBUTTON_ACTIVE_BG_MONO	BLACK
 #define DEF_MENUBUTTON_ACTIVE_FG_COLOR	ACTIVE_FG
@@ -342,7 +342,7 @@
 #define DEF_MENUBUTTON_BG_COLOR		NORMAL_BG
 #define DEF_MENUBUTTON_BG_MONO		WHITE
 #define DEF_MENUBUTTON_BITMAP		""
-#define DEF_MENUBUTTON_BORDER_WIDTH	"2"
+#define DEF_MENUBUTTON_BORDER_WIDTH	"0"
 #define DEF_MENUBUTTON_CURSOR		""
 #define DEF_MENUBUTTON_DIRECTION	"below"
 #define DEF_MENUBUTTON_DISABLED_FG_COLOR DISABLED
@@ -358,8 +358,8 @@
 #define DEF_MENUBUTTON_INDICATOR	"1"
 #define DEF_MENUBUTTON_JUSTIFY		"left"
 #define DEF_MENUBUTTON_MENU		""
-#define DEF_MENUBUTTON_PADX		"4"
-#define DEF_MENUBUTTON_PADY		"3"
+#define DEF_MENUBUTTON_PADX		"0"
+#define DEF_MENUBUTTON_PADY		"0"
 #define DEF_MENUBUTTON_RELIEF		"flat"
 #define DEF_MENUBUTTON_STATE		"normal"
 #define DEF_MENUBUTTON_TAKE_FOCUS	"0"
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index ec32a78..6315638 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -799,7 +799,7 @@ TkpPostMenu(
 
     int oldMode = Tcl_SetServiceMode(TCL_SERVICE_NONE);
     NSView *view = [win contentView];
-    NSRect frame = NSMakeRect(x + 9, tkMacOSXZeroScreenHeight - y - 9, 1, 1);
+    NSRect frame = NSMakeRect(x, tkMacOSXZeroScreenHeight - y, 1, 1);
 
     frame.origin = [view convertPoint:
 	    [win tkConvertPointFromScreen:frame.origin] fromView:nil];
@@ -1092,9 +1092,9 @@ TkpComputeStandardMenuGeometry(
     int modifierCharWidth, menuModifierCharWidth;
     int x, y, modifierWidth, labelWidth, indicatorSpace;
     int windowWidth, windowHeight, accelWidth;
-    int i, j, lastColumnBreak, maxWidth;
+    int i, maxWidth;
     int entryWidth, maxIndicatorSpace, borderWidth, activeBorderWidth;
-    TkMenuEntry *mePtr, *columnEntryPtr;
+    TkMenuEntry *mePtr;
     int haveAccel = 0;
 
     if (menuPtr->tkwin == NULL) {
@@ -1106,7 +1106,7 @@ TkpComputeStandardMenuGeometry(
     Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr,
 	    &activeBorderWidth);
     x = y = borderWidth;
-    windowHeight = maxWidth = lastColumnBreak = 0;
+    windowHeight = maxWidth = 0;
     maxIndicatorSpace = 0;
 
     /*
@@ -1130,9 +1130,12 @@ TkpComputeStandardMenuGeometry(
 	    break;
 	}
     }
-
+    
     for (i = 0; i < menuPtr->numEntries; i++) {
 	mePtr = menuPtr->entries[i];
+	if (mePtr->type == TEAROFF_ENTRY) {
+	    continue;
+	}
 	if (mePtr->fontPtr == NULL) {
 	    tkfont = menuFont;
 	    fmPtr = &menuMetrics;
@@ -1143,26 +1146,8 @@ TkpComputeStandardMenuGeometry(
 	    fmPtr = &entryMetrics;
 	    modifierCharWidth = ModifierCharWidth(tkfont);
 	}
-
-	if ((i > 0) && mePtr->columnBreak) {
-	    if (maxIndicatorSpace != 0) {
-		maxIndicatorSpace += 2;
-	    }
-	    for (j = lastColumnBreak; j < i; j++) {
-		columnEntryPtr = menuPtr->entries[j];
-		columnEntryPtr->indicatorSpace = maxIndicatorSpace;
-		columnEntryPtr->width = maxIndicatorSpace + maxWidth
-			+ 2 * activeBorderWidth;
-		columnEntryPtr->x = x;
-		columnEntryPtr->entryFlags &= ~ENTRY_LAST_COLUMN;
-	    }
-	    x += maxIndicatorSpace + maxWidth + 2 * activeBorderWidth;
-	    maxWidth = maxIndicatorSpace = 0;
-	    lastColumnBreak = i;
-	    y = borderWidth;
-	}
 	accelWidth = modifierWidth = indicatorSpace = 0;
-	if (mePtr->type == SEPARATOR_ENTRY || mePtr->type == TEAROFF_ENTRY) {
+	if (mePtr->type == SEPARATOR_ENTRY) {
 	    mePtr->height = menuSeparatorHeight;
 	} else {
 	    /*
@@ -1176,16 +1161,16 @@ TkpComputeStandardMenuGeometry(
 
 	    NSMenuItem *menuItem = (NSMenuItem *) mePtr->platformEntryData;
 	    int haveImage = 0, width = 0, height = 0;
-
 	    if (mePtr->image) {
 		Tk_SizeOfImage(mePtr->image, &width, &height);
 		haveImage = 1;
+		height += 2; /* tweak */
 	    } else if (mePtr->bitmapPtr) {
 		Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin,
 			mePtr->bitmapPtr);
-
 		Tk_SizeOfBitmap(menuPtr->display, bitmap, &width, &height);
 		haveImage = 1;
+		height += 2; /* tweak */
 	    }
 	    if (!haveImage || (mePtr->compound != COMPOUND_NONE)) {
 		NSAttributedString *attrTitle = [menuItem attributedTitle];
@@ -1197,11 +1182,8 @@ TkpComputeStandardMenuGeometry(
 		    size = [[menuItem title] sizeWithAttributes:
 			TkMacOSXNSFontAttributesForFont(tkfont)];
 		}
-		size.width += menuTextLeadingEdgeMargin +
-			menuTextTrailingEdgeMargin;
-		if (size.height < fmPtr->linespace) {
-		    size.height = fmPtr->linespace;
-		}
+		size.width += menuTextLeadingEdgeMargin + menuTextTrailingEdgeMargin;
+		size.height -= 1; /* tweak */
 		if (haveImage && (mePtr->compound != COMPOUND_NONE)) {
 		    int margin = width + menuIconTrailingEdgeMargin;
 
@@ -1219,7 +1201,6 @@ TkpComputeStandardMenuGeometry(
 	    }
 	    labelWidth = width + menuItemExtraWidth;
 	    mePtr->height = height + menuItemExtraHeight;
-
 	    if (mePtr->type == CASCADE_ENTRY) {
 		modifierWidth = modifierCharWidth;
 	    } else if (mePtr->accelLength == 0) {
@@ -1250,8 +1231,10 @@ TkpComputeStandardMenuGeometry(
 	    if (entryWidth > maxWidth) {
 		maxWidth = entryWidth;
 	    }
+	    menuPtr->entries[i]->width = entryWidth;
 	    mePtr->height += 2 * activeBorderWidth;
 	}
+	mePtr->x = x;
 	mePtr->y = y;
 	y += menuPtr->entries[i]->height + borderWidth;
 	if (y > windowHeight) {
@@ -1259,14 +1242,6 @@ TkpComputeStandardMenuGeometry(
 	}
     }
 
-    for (j = lastColumnBreak; j < menuPtr->numEntries; j++) {
-	columnEntryPtr = menuPtr->entries[j];
-	columnEntryPtr->indicatorSpace = maxIndicatorSpace;
-	columnEntryPtr->width = maxIndicatorSpace + maxWidth
-		+ 2 * activeBorderWidth;
-	columnEntryPtr->x = x;
-	columnEntryPtr->entryFlags |= ENTRY_LAST_COLUMN;
-    }
     windowWidth = x + maxIndicatorSpace + maxWidth
 	    + 2 * activeBorderWidth + borderWidth;
     windowHeight += borderWidth;
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 1acefe5..4df23b4 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -47,17 +47,23 @@ typedef struct MacMenuButton {
 } MacMenuButton;
 
 /*
- * Forward declarations for procedures defined later in this file:
+ * Forward declarations for static functions defined later in this file:
  */
 
 static void MenuButtonEventProc(ClientData clientData, XEvent *eventPtr);
-static void MenuButtonBackgroundDrawCB ( MacMenuButton *ptr, SInt16 depth, Boolean isColorDev);
-static void MenuButtonContentDrawCB ( ThemeButtonKind kind, const HIThemeButtonDrawInfo * info, MacMenuButton *ptr, SInt16 depth, Boolean isColorDev);
+static void MenuButtonBackgroundDrawCB (MacMenuButton *ptr, SInt16 depth,
+					Boolean isColorDev);
+static void MenuButtonContentDrawCB (ThemeButtonKind kind,
+				     const HIThemeButtonDrawInfo * info,
+				     MacMenuButton *ptr, SInt16 depth,
+				     Boolean isColorDev);
 static void MenuButtonEventProc ( ClientData clientData, XEvent *eventPtr);
-static void TkMacOSXComputeMenuButtonParams (TkMenuButton * butPtr, ThemeButtonKind* btnkind, HIThemeButtonDrawInfo* drawinfo);
-static int TkMacOSXComputeMenuButtonDrawParams (TkMenuButton * butPtr, DrawParams * dpPtr);
-static void TkMacOSXDrawMenuButton (MacMenuButton *butPtr,
-       GC gc, Pixmap pixmap);
+static void TkMacOSXComputeMenuButtonParams (TkMenuButton * butPtr,
+					     ThemeButtonKind* btnkind,
+					     HIThemeButtonDrawInfo* drawinfo);
+static void TkMacOSXComputeMenuButtonDrawParams (TkMenuButton * butPtr,
+						 DrawParams * dpPtr);
+static void TkMacOSXDrawMenuButton (MacMenuButton *butPtr, GC gc, Pixmap pixmap);
 static void DrawMenuButtonImageAndText(TkMenuButton* butPtr);
 
 /*
@@ -70,11 +76,46 @@ Tk_ClassProcs tkpMenubuttonClass = {
     TkMenuButtonWorldChanged,	/* worldChangedProc */
 };
 
+/*
+ * We use Apple's Pop-Up Button widget to represent the Tk Menubutton.
+ * However, we do not use the NSPopUpButton class for this control.  Instead we
+ * render the Pop-Up Button using the HITheme library.  This imposes some
+ * constraints on what can be done.  The HITheme renderer allows only specific
+ * dimensions for the button.
+ *
+ * The HITheme library allows drawing a Pop-Up Button with an arbitrary bounds
+ * rectangle.  However the button is always drawn as a rounded box which is 22
+ * pixels high.  If the bounds rectangle is less than 22 pixels high, the
+ * button is drawn at the top of the rectangle and the bottom of the button is
+ * clipped away.  So we set a minimum height of 22 pixels for a Menubutton.  If
+ * the bounds rectangle is more than 22 pixels high, then the button is drawn
+ * centered vertically in the bounds rectangle.
+ *
+ * The content rectangle of the button is inset by 14 pixels on the left and 28
+ * pixels on the right.  The rightmost part of the button contains the blue
+ * double-arrow symbol which is 28 pixels wide.
+ *
+ * To maintain compatibility with code that runs on multiple operating systems,
+ * the width and height of the content rectangle includes the borderWidth, the
+ * highlightWidth and the padX and padY dimensions of the Menubutton.  However,
+ * to be consistent with the standard Apple appearance, the content is always
+ * be drawn at the left side of the content rectangle.  All of the excess space
+ * appears on the right side of the content, and the anchor property is
+ * ignored.  The easiest way to comply with Apple's Human Interface Guidelines
+ * would be to set bd = highlightthickness = padx = 0 and to specify an
+ * explicit width for the button.  Apple also recommends using the same width
+ * for all Pop-Up Buttons in a given window.
+ */
+
+#define LEFT_INSET 8
+#define RIGHT_INSET 28
+#define MIN_HEIGHT 22
+
 
 /*
  *----------------------------------------------------------------------
  *
- * TkpCreateMenuButton --
+ * TkpCreateMenuButton  --
  *
  *	Allocate a new TkMenuButton structure.
  *
@@ -93,13 +134,12 @@ TkpCreateMenuButton(
 {
     MacMenuButton *mbPtr = (MacMenuButton *) ckalloc(sizeof(MacMenuButton));
 
-    Tk_CreateEventHandler(tkwin, ActivateMask,
-	    MenuButtonEventProc, (ClientData) mbPtr);
+    Tk_CreateEventHandler(tkwin, ActivateMask, MenuButtonEventProc,
+			  (ClientData) mbPtr);
     mbPtr->flags = FIRST_DRAW;
     mbPtr->btnkind = kThemePopupButton;
     bzero(&mbPtr->drawinfo, sizeof(mbPtr->drawinfo));
     bzero(&mbPtr->lastdrawinfo, sizeof(mbPtr->lastdrawinfo));
-
     return (TkMenuButton *) mbPtr;
 }
 
@@ -165,12 +205,13 @@ TkpDisplayMenuButton(
  * TkpDestroyMenuButton --
  *
  *	Free data structures associated with the menubutton control.
+ *      This is a no-op on the Mac.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Restores the default control state.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
@@ -204,15 +245,12 @@ TkpComputeMenuButtonGeometry(butPtr)
     register TkMenuButton *butPtr;	/* Widget record for menu button. */
 {
     int width, height, avgWidth, haveImage = 0, haveText = 0;
-    MacMenuButton *mbPtr = (MacMenuButton*)butPtr;
     int txtWidth, txtHeight;
     Tk_FontMetrics fm;
-    DrawParams drawParams;
-    int paddingx = 0;
-    int paddingy = 0;
+    int highlightWidth = butPtr->highlightWidth > 0 ? butPtr->highlightWidth : 0;
 
     /*
-     * First figure out the size of the contents of the button.
+     * First compute the size of the contents of the button.
      */
 
     width = 0;
@@ -221,8 +259,6 @@ TkpComputeMenuButtonGeometry(butPtr)
     txtHeight = 0;
     avgWidth = 0;
 
-    TkMacOSXComputeMenuButtonParams(butPtr, &mbPtr->btnkind, &mbPtr->drawinfo);
-
     if (butPtr->image != NULL) {
         Tk_SizeOfImage(butPtr->image, &width, &height);
         haveImage = 1;
@@ -241,7 +277,7 @@ TkpComputeMenuButtonGeometry(butPtr)
         txtHeight = butPtr->textHeight;
         avgWidth = Tk_TextWidth(butPtr->tkfont, "0", 1);
         Tk_GetFontMetrics(butPtr->tkfont, &fm);
-        haveText = (txtWidth != 0 && txtHeight != 0);
+        haveText = (txtWidth != 0 && txtHeight != 2);
     }
 
     /*
@@ -304,65 +340,18 @@ TkpComputeMenuButtonGeometry(butPtr)
             width = txtWidth;
             height = txtHeight;
             if (butPtr->width > 0) {
-                width = butPtr->width * avgWidth;
+                width = butPtr->width * avgWidth + 2*butPtr->padX;
             }
             if (butPtr->height > 0) {
-                height = butPtr->height * fm.linespace;
+                height = butPtr->height * fm.linespace + 2*butPtr->padY;
             }
         }
     }
-    width  += 2 * butPtr->padX - 2;
-    height += 2 * butPtr->padY - 2;
-
-    /*Add padding for button arrows.*/
-    width += 22;
-
-    /*
-     * Now figure out the size of the border decorations for the button.
-     */
-
-    if (butPtr->highlightWidth < 0) {
-        butPtr->highlightWidth = 0;
-    }
-    butPtr->inset = 0;
-    butPtr->inset += butPtr->highlightWidth;
-
-    TkMacOSXComputeMenuButtonDrawParams(butPtr,&drawParams);
-
-        HIRect tmpRect;
-	HIRect contBounds;
-
-	tmpRect = CGRectMake(0, 0, width, height);
-
-	HIThemeGetButtonContentBounds(&tmpRect, &mbPtr->drawinfo, &contBounds);
-
-
-
-        /* If the content region has a minimum height, match it. */
-        if (height < contBounds.size.height) {
-	  height = contBounds.size.height;
-        }
-
-        /* If the content region has a minimum width, match it. */
-        if (width < contBounds.size.width) {
-	  width = contBounds.size.width;
-        }
-
-        /* Pad to fill difference between content bounds and button bounds. */
-        paddingx = tmpRect.origin.x - contBounds.origin.x;
-        paddingy = tmpRect.origin.y - contBounds.origin.y;
-
-    if (paddingx > 0) {
-        width += paddingx;
-    }
-    if (paddingy > 0) {
-        height += paddingy;
-    }
-
-    width += butPtr->inset*2;
-    height += butPtr->inset*2;
-
-
+    
+    butPtr->inset = highlightWidth + butPtr->borderWidth;
+    width  += LEFT_INSET + RIGHT_INSET + 2*butPtr->inset;
+	height += 2*butPtr->inset;
+    height = height < MIN_HEIGHT ? MIN_HEIGHT : height;
     Tk_GeometryRequest(butPtr->tkwin, width, height);
     Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset);
 }
@@ -446,8 +435,8 @@ DrawMenuButtonImageAndText(
                     imageYOffset = butPtr->textHeight + butPtr->padY;
                 }
                 fullHeight = height + butPtr->textHeight + butPtr->padY;
-                fullWidth = (width > butPtr->textWidth ? width :
-                        butPtr->textWidth);
+                fullWidth = (width > butPtr->textWidth ?
+			     width : butPtr->textWidth);
                 textXOffset = (fullWidth - butPtr->textWidth)/2;
                 imageXOffset = (fullWidth - width)/2;
                 break;
@@ -489,10 +478,10 @@ DrawMenuButtonImageAndText(
 	}
 
         TkComputeAnchor(butPtr->anchor, tkwin,
-                butPtr->padX + butPtr->borderWidth,
-                butPtr->padY + butPtr->borderWidth,
+                butPtr->padX + butPtr->inset,
+                butPtr->padY + butPtr->inset,
                 fullWidth, fullHeight, &x, &y);
-        imageXOffset += x;
+        imageXOffset = LEFT_INSET;
         imageYOffset += y;
         textYOffset -= 1;
 
@@ -517,36 +506,32 @@ DrawMenuButtonImageAndText(
                 butPtr->underline);
     } else {
         if (haveImage) {
-            int x = 0;
-            int y;
+            int x, y;
             TkComputeAnchor(butPtr->anchor, tkwin,
                     butPtr->padX + butPtr->borderWidth,
                     butPtr->padY + butPtr->borderWidth,
                     width, height, &x, &y);
-	        imageXOffset += x;
-	    	imageYOffset += y;
-
-               if (butPtr->image != NULL) {
-		     Tk_RedrawImage(butPtr->image, 0, 0, width, height,
-		         pixmap, imageXOffset, imageYOffset);
+	    imageXOffset = LEFT_INSET;
+	    imageYOffset += y;
+	    if (butPtr->image != NULL) {
+		Tk_RedrawImage(butPtr->image, 0, 0, width, height,
+			       pixmap, imageXOffset, imageYOffset);
             } else {
                 XSetClipOrigin(butPtr->display, dpPtr->gc, x, y);
                 XCopyPlane(butPtr->display, butPtr->bitmap,
-                        pixmap, dpPtr->gc,
-                        0, 0, (unsigned int) width,
-                        (unsigned int) height,
-                        imageXOffset, imageYOffset, 1);
+			   pixmap, dpPtr->gc,
+			   0, 0, (unsigned int) width,
+			   (unsigned int) height,
+			   imageXOffset, imageYOffset, 1);
                 XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
             }
         } else {
-	  /*Move x back by eight pixels to give the menubutton arrows room.*/
-	  int x = 0;
-	  int y;
-	  textXOffset = 8;
+	    int x, y;
+	    textXOffset = LEFT_INSET;
 	    TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
 			    butPtr->textWidth, butPtr->textHeight, &x, &y);
 	    Tk_DrawTextLayout(butPtr->display, pixmap, dpPtr->gc,
-			      butPtr->textLayout, x - textXOffset, y, 0, -1);
+			      butPtr->textLayout, textXOffset, y, 0, -1);
 	    y += butPtr->textHeight/2;
 	  }
    }
@@ -578,7 +563,6 @@ TkMacOSXDrawMenuButton(
                            * the bevel button */
     Pixmap pixmap)        /* The pixmap we are drawing into - needed
                            * for the bevel button */
-
 {
     TkMenuButton * butPtr = ( TkMenuButton *)mbPtr;
     TkWindow * winPtr;
@@ -591,10 +575,9 @@ TkMacOSXDrawMenuButton(
 
     TkMacOSXComputeMenuButtonParams(butPtr, &mbPtr->btnkind, &mbPtr->drawinfo);
 
-    cntrRect = CGRectMake(winPtr->privatePtr->xOff, winPtr->privatePtr->yOff, Tk_Width(butPtr->tkwin),Tk_Height(butPtr->tkwin));
-
-     cntrRect = CGRectInset(cntrRect,  butPtr->inset, butPtr->inset);
-
+    cntrRect = CGRectMake(winPtr->privatePtr->xOff, winPtr->privatePtr->yOff,
+			  Tk_Width(butPtr->tkwin),
+			  Tk_Height(butPtr->tkwin));
 
     if (useNewerHITools == 1) {
         HIRect contHIRec;
@@ -618,16 +601,12 @@ TkMacOSXDrawMenuButton(
         }
 
         HIThemeDrawButton(&cntrRect, &hiinfo, dc.context, kHIThemeOrientationNormal, &contHIRec);
-
 	TkMacOSXRestoreDrawingContext(&dc);
-
         MenuButtonContentDrawCB( mbPtr->btnkind, &mbPtr->drawinfo, (MacMenuButton *)mbPtr, 32, true);
     } else {
 	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
 	    return;
 	}
-
-
 	TkMacOSXRestoreDrawingContext(&dc);
     }
     mbPtr->lastdrawinfo = mbPtr->drawinfo;
@@ -696,8 +675,7 @@ MenuButtonContentDrawCB (
     if (tkwin == NULL || !Tk_IsMapped(tkwin)) {
         return;
     }
-
-    DrawMenuButtonImageAndText( butPtr);
+    DrawMenuButtonImageAndText(butPtr);
 }
 
 /*
@@ -812,24 +790,22 @@ TkMacOSXComputeMenuButtonParams(TkMenuButton * butPtr, ThemeButtonKind* btnkind,
  *
  * TkMacOSXComputeMenuButtonDrawParams --
  *
- *        This procedure computes the various parameters used
- *        when drawing a button
- *      These are determined by the various tk button parameters
+ *        This procedure selects an appropriate drawing context for
+ *        drawing a menubutton.
  *
  * Results:
- *        1 if control will be used, 0 otherwise.
+ *        None.
  *
  * Side effects:
- *        Sets the button draw parameters
+ *        Sets the button draw parameters.
  *
  *----------------------------------------------------------------------
  */
 
-static int
+static void
 TkMacOSXComputeMenuButtonDrawParams(TkMenuButton * butPtr, DrawParams * dpPtr)
 {
-    dpPtr->hasImageOrBitmap = ((butPtr->image != NULL)
-            || (butPtr->bitmap != None));
+    dpPtr->hasImageOrBitmap = ((butPtr->image != NULL) || (butPtr->bitmap != None));
     dpPtr->border = butPtr->normalBorder;
     if ((butPtr->state == STATE_DISABLED) && (butPtr->disabledFg != NULL)) {
         dpPtr->gc = butPtr->disabledGC;
@@ -839,8 +815,6 @@ TkMacOSXComputeMenuButtonDrawParams(TkMenuButton * butPtr, DrawParams * dpPtr)
     } else {
         dpPtr->gc = butPtr->normalTextGC;
     }
-
-    return 1;
 }
 
 /*
diff --git a/tests/menubut.test b/tests/menubut.test
index 6efdb0f..88f4330 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -542,7 +542,11 @@ test menubutton-6.1 {MenuButtonCmdDeletedProc procedure} -setup {
     deleteWindows
 } -result {{} {}}
 
-
+if {[tk windowingsystem] == "aqua"} {
+    set extraWidth 36
+} else {
+    set extraWidth 0
+}
 test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType 
 } -setup {
@@ -555,33 +559,33 @@ test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {38 23}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType 
 } -setup {
     deleteWindows
     image create test image1
 } -body {
-    menubutton .mb -image image1 -bd 1 -highlightthickness 2
+    menubutton .mb -image image1 -bd 3 -highlightthickness 1
     pack .mb
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {36 21}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType 
 } -setup {
     deleteWindows
     image create test image1
 } -body {
-    menubutton .mb -image image1 -bd 0 -highlightthickness 2 -padx 5 -pady 5
+    menubutton .mb -image image1 -bd 1 -highlightthickness 3 -padx 5 -pady 5
     pack .mb
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {34 19}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType 
 } -setup {
@@ -595,7 +599,7 @@ test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {48 23}
+} -result [list [expr {48 + $extraWidth}] 23]
 test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType 
 } -setup {
@@ -609,7 +613,7 @@ test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {38 38}
+} -result [list [expr {38 + $extraWidth}] 38]
 test menubutton-7.6 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -619,7 +623,7 @@ test menubutton-7.6 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {25 35}
+} -result [list [expr {25 + $extraWidth}] 35]
 test menubutton-7.7 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -629,7 +633,7 @@ test menubutton-7.7 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {46 33}
+} -result [list [expr {46 + $extraWidth}] 33]
 test menubutton-7.8 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -639,7 +643,7 @@ test menubutton-7.8 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {23 56}
+} -result [list [expr {23 + $extraWidth}] 56]
 test menubutton-7.9 {ComputeMenuButtonGeometry procedure} -constraints {
     fonts
 } -setup {