diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-10-09 16:27:45 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-10-09 16:27:45 +0000 |
| commit | 8209fcc6a37ab3db2b6e713aa792bd6f756b74ea (patch) | |
| tree | e01b0d26ed9a8a492cc9913f624b88e83eb7cb48 | |
| parent | c0ef4603d4dc920653850dc231c6b9831187e708 (diff) | |
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
| -rw-r--r-- | src/fl_font_mac.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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); |