# HG changeset patch # User Adrian Robert # Date 1255307233 0 # Node ID 1d9d89f892e9d01d4a771b5c6bea27f703bb2149 # Parent ec0d4464a8975366573ef25a22352af16ee3a1cf * nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger where appropriate. (EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use stringWithUTF8String. (EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature. diff -r ec0d4464a897 -r 1d9d89f892e9 src/nsmenu.m --- a/src/nsmenu.m Mon Oct 12 00:26:45 2009 +0000 +++ b/src/nsmenu.m Mon Oct 12 00:27:13 2009 +0000 @@ -658,7 +658,7 @@ else [item setState: NSOffState]; - [item setTag: (int)wv->call_data]; + [item setTag: (NSInteger)wv->call_data]; } return item; @@ -1336,7 +1336,7 @@ 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 @@ #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};