diff options
author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-10-12 00:27:13 +0000 |
---|---|---|
committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-10-12 00:27:13 +0000 |
commit | f3f08c2854c564534ad3390b047110b300246eea (patch) | |
tree | 0208f99f8ea03134d13ac76f828fe681bd805b39 /src/nsmenu.m | |
parent | 3c46399248132d63c4662855c504ea7b0518de4a (diff) | |
download | emacs-f3f08c2854c564534ad3390b047110b300246eea.tar.gz |
* nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger
where appropriate.
(EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use
stringWithUTF8String.
(EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature.
Diffstat (limited to 'src/nsmenu.m')
-rw-r--r-- | src/nsmenu.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index f6603ce8c37..937073f074b 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}; |