Mercurial > emacs
comparison src/nsfont.m @ 109746:d6fc586a0872
Use const char* for -Wwrite_strings.
* keyboard.h (_widget_value): name, value and key are const char*.
* nsfont.m (ns_descriptor_to_entity): Use const char*.
* nsmenu.m (parseKeyEquiv, addSubmenuWithTitle)
(addDisplayItemWithImage, update_frame_tool_bar): Use const char*.
* nsterm.h (parseKeyEquiv, addSubmenuWithTitle)
(addDisplayItemWithImage): Use const char*.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Wed, 11 Aug 2010 10:58:56 +0200 |
parents | 9cfca8c9fb07 |
children | 4afa0b625189 |
comparison
equal
deleted
inserted
replaced
109745:b9025d71747a | 109746:d6fc586a0872 |
---|---|
159 } | 159 } |
160 | 160 |
161 | 161 |
162 /* Converts NSFont descriptor to FONT_WEIGHT, FONT_SLANT, FONT_WIDTH, etc.. */ | 162 /* Converts NSFont descriptor to FONT_WEIGHT, FONT_SLANT, FONT_WIDTH, etc.. */ |
163 static Lisp_Object | 163 static Lisp_Object |
164 ns_descriptor_to_entity (NSFontDescriptor *desc, Lisp_Object extra, char *style) | 164 ns_descriptor_to_entity (NSFontDescriptor *desc, |
165 Lisp_Object extra, | |
166 const char *style) | |
165 { | 167 { |
166 Lisp_Object font_entity = font_make_entity (); | 168 Lisp_Object font_entity = font_make_entity (); |
167 /* NSString *psName = [desc postscriptName]; */ | 169 /* NSString *psName = [desc postscriptName]; */ |
168 NSString *family = [desc objectForKey: NSFontFamilyAttribute]; | 170 NSString *family = [desc objectForKey: NSFontFamilyAttribute]; |
169 unsigned int traits = [desc symbolicTraits]; | 171 unsigned int traits = [desc symbolicTraits]; |