diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-04-13 18:45:12 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-04-13 18:45:12 +0000 |
| commit | 86fa089ec05c413bb2c30dd06cce852ec917bc51 (patch) | |
| tree | 7c45b99ca3cce7923b7e17ea6953db13a41fee08 /src/nsmenu.m | |
| parent | 96d98c408ae64c98f71ef34a9d91797fac71c13e (diff) | |
| download | emacs-86fa089ec05c413bb2c30dd06cce852ec917bc51.tar.gz | |
* 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.
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 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 |