Mercurial > emacs

diff src/nsmenu.m @ 102954:b5a34573cf82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* nsselect.m (symbol_to_nsstring, clean_local_selection_data) (ns_string_to_pasteboard_internal): * nsmenu.m (process_dialog): * nsimage.m (ns_load_image): Use SDATA and ASET where appropriate. * nsfont.m (nsfont_open): Use XHASH to make it compile with LISP_UNION. * lisp.h (Fx_load_color_file): Declare.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 13 Apr 2009 18:45:12 +0000
parents 6d9c8e198f1c
children 3321231f9dc2
line wrap: on
line diff
--- a/src/nsmenu.m	Mon Apr 13 17:23:27 2009 +0000
+++ b/src/nsmenu.m	Mon Apr 13 18:45:12 2009 +0000
@@ -1717,11 +1717,11 @@
       item = XCAR (list);
       if (XTYPE (item) == Lisp_String)
         {
-          [window addString: XSTRING (item)->data row: row++];
+          [window addString: SDATA (item) row: row++];
         }
       else if (XTYPE (item) == Lisp_Cons)
         {
-          [window addButton: XSTRING (XCAR (item))->data
+          [window addButton: SDATA (XCAR (item))
                       value: XCDR (item) row: row++];
         }
       else if (NILP (item))
@@ -1811,7 +1811,7 @@
 
   if (XTYPE (head) == Lisp_String)
       [title setStringValue:
-                 [NSString stringWithUTF8String: XSTRING (head)->data]];
+                 [NSString stringWithUTF8String: SDATA (head)]];
   else if (isQ == YES)
       [title setStringValue: @"Question"];
   else