From 86fa089ec05c413bb2c30dd06cce852ec917bc51 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 13 Apr 2009 18:45:12 +0000 Subject: * 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. --- src/nsmenu.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nsmenu.m') diff --git a/src/nsmenu.m b/src/nsmenu.m index 9a97492e751..190bbb37624 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1717,11 +1717,11 @@ void process_dialog (id window, Lisp_Object list) 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 @@ void process_dialog (id window, Lisp_Object list) if (XTYPE (head) == Lisp_String) [title setStringValue: - [NSString stringWithUTF8String: XSTRING (head)->data]]; + [NSString stringWithUTF8String: SDATA (head)]]; else if (isQ == YES) [title setStringValue: @"Question"]; else -- cgit v1.2.1