* w32term.c (w32_initialize): Use standard types.

[gnu-emacs] / src / nsmenu.m

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 190bbb3762400308b8001728659b1c096d4e2558..aab3016e5e80634217eee31e0089ca130594a920 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1439,7 +1439,14 @@ update_frame_tool_bar (FRAME_PTR f)
 {
   NSString *str = [NSString stringWithUTF8String: text];
   NSRect r = [textField frame];
-  r.size.width = [[[textField font] screenFont] widthOfString: str] + 8;
+  NSSize textSize = [str sizeWithAttributes: 
+     [NSDictionary dictionaryWithObject: [[textField font] screenFont]
+                                forKey: NSFontAttributeName]];
+  NSSize padSize = [[[textField font] screenFont] 
+                    boundingRectForFont].size;
+ 
+  r.size.width = textSize.width + padSize.width/2;
+  r.size.height = textSize.height + padSize.height/2;
   [textField setFrame: r];
   [textField setStringValue: str];
 }