From f3f08c2854c564534ad3390b047110b300246eea Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Mon, 12 Oct 2009 00:27:13 +0000 Subject: [PATCH] * nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger where appropriate. (EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use stringWithUTF8String. (EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature. --- src/nsmenu.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nsmenu.m b/src/nsmenu.m index f6603ce8c3..937073f074 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -658,7 +658,7 @@ name_is_separator (name) else [item setState: NSOffState]; - [item setTag: (int)wv->call_data]; + [item setTag: (NSInteger)wv->call_data]; } return item; @@ -1336,7 +1336,7 @@ update_frame_tool_bar (FRAME_PTR f) item = [[[NSToolbarItem alloc] initWithItemIdentifier: identifier] autorelease]; [item setImage: img]; - [item setToolTip: [NSString stringWithCString: help]]; + [item setToolTip: [NSString stringWithUTF8String: help]]; [item setTarget: emacsView]; [item setAction: @selector (toolbarClicked:)]; } @@ -1615,7 +1615,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header) #define TEXTHEIGHT 20.0 #define MINCELLWIDTH 90.0 -- initWithContentRect: (NSRect)contentRect styleMask: (unsigned int)aStyle +- initWithContentRect: (NSRect)contentRect styleMask: (NSUInteger)aStyle backing: (NSBackingStoreType)backingType defer: (BOOL)flag { NSSize spacing = {SPACER, SPACER}; -- 2.20.1