From 8209fcc6a37ab3db2b6e713aa792bd6f756b74ea Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 9 Oct 2005 16:27:45 +0000 Subject: STR #1044 (Mac only): The font number 12 and 15, usually assigned to the fonts 'Symbol' and 'Webdings', are not translated from ISO to MacRoman anymore. This fixes the problem of not having the correct bullet in the Fl_Help Widget. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4587 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_font_mac.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index 83ecc9147..f37500ce9 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -230,6 +230,10 @@ static int n_iso_buf = 0; // this function must be available for OpenGL character drawing as well const char *fl_iso2macRoman(const char *s, int n) { + // do not do a text lookup for 'Symbol' or 'WebDings'. This fails + // if the user assigns a new font to these numbers though. + if (fl_font_ == 12 || fl_font_ == 15) + return s; if (n>n_iso_buf) { if (iso_buf) free(iso_buf); iso_buf = (char*)malloc(n+500); -- cgit v1.2.3