diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-27 18:37:15 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-27 18:37:15 +0000 |
| commit | 469ba78d902baabba77811ada54020370418b386 (patch) | |
| tree | 313613f51646806479ff0df946838885af2ba9db | |
| parent | a0021b31ef2c5d15d2b4f6a5fa16adb7d9f7fef6 (diff) | |
Fix font enumeration bug reported by Paul Sydney.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2117 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | src/fl_set_fonts_mac.cxx | 19 |
2 files changed, 20 insertions, 5 deletions
@@ -1,7 +1,9 @@ CHANGES IN FLTK 1.1.0rc1 - - Now show a "lock" icon next to static/private elements - in FLUID. + - Fixed a bug in the MacOS font enumeration code. + - Now show a "locked" icon next to static/private + elements in FLUID, and "unlocked" icon next to + global/public elements. - Implemented Fl_Menu_Item image labels using older 1.0.x labeltype method. - Updated the PNG library check to support both png.h diff --git a/src/fl_set_fonts_mac.cxx b/src/fl_set_fonts_mac.cxx index fe08805e1..40502aff8 100644 --- a/src/fl_set_fonts_mac.cxx +++ b/src/fl_set_fonts_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts_mac.cxx,v 1.1.2.4 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_set_fonts_mac.cxx,v 1.1.2.5 2002/04/27 18:37:15 easysw Exp $" // // MacOS font utilities for the Fast Light Tool Kit (FLTK). // @@ -114,7 +114,20 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { sizep = array; FMFont font; FMFontStyle style, fStyle; - switch ( s->name[0] ) { case ' ':fStyle=0; break; case 'B':fStyle=1; break; case 'I':fStyle=2; break; case 'P':fStyle=3; break; } + switch ( s->name[0] ) { + default : + fStyle=0; + break; + case 'B' : + fStyle=1; + break; + case 'I' : + fStyle=2; + break; + case 'P' : + fStyle=3; + break; + } FMFontSize size, pSize = -1; FMFontFamilyInstanceIterator ffiIterator; FMCreateFontFamilyInstanceIterator( family, &ffiIterator ); @@ -139,5 +152,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { } // -// End of "$Id: fl_set_fonts_mac.cxx,v 1.1.2.4 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_set_fonts_mac.cxx,v 1.1.2.5 2002/04/27 18:37:15 easysw Exp $". // |