Commit 47571310 authored by Jan Djärv's avatar Jan Djärv
Browse files

Add ifdef NS_IMPL_COCOA aound OSX version check (for clang)

* nsfns.m (Fns_popup_font_panel): Ditto.

* nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
parent d7919441
2014-07-11 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
* nsfns.m (Fns_popup_font_panel): Ditto.
2014-07-11 Eli Zaretskii <eliz@gnu.org>
* minibuf.c (read_minibuf_noninteractive): Finish reading on '\r',
......
......@@ -1390,9 +1390,11 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
NSFont *nsfont;
if (EQ (font->driver->type, Qns))
nsfont = ((struct nsfont_info *)font)->nsfont;
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
else
nsfont = (NSFont *) macfont_get_nsctfont (font);
#endif
#endif
[fm setSelectedFont: nsfont isMultiple: NO];
[fm orderFrontFontPanel: NSApp];
......
......@@ -5012,9 +5012,11 @@ - (void)changeFont: (id)sender
if (EQ (font->driver->type, Qns))
nsfont = ((struct nsfont_info *)font)->nsfont;
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
else
nsfont = (NSFont *) macfont_get_nsctfont (font);
#endif
#endif
if ((newFont = [sender convertFont: nsfont]))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment