[Emacs-diffs] emacs/src nsmenu.m

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/10/12 00:27:13

Modified files:
        src            : nsmenu.m 

Log message:
                * nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger
                where appropriate.
                (EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): 
Use
                stringWithUTF8String.
                (EmacsDialogPanel-initWithContentRect:styleMask:): Fix 
signature.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.28&r2=1.29

Patches:
Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- nsmenu.m    27 Sep 2009 15:49:08 -0000      1.28
+++ nsmenu.m    12 Oct 2009 00:27:13 -0000      1.29
@@ -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};