diff options
Diffstat (limited to 'src/drivers/Quartz/Fl_Font.H')
| -rw-r--r-- | src/drivers/Quartz/Fl_Font.H | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H index 00a96370c..e6c56a75c 100644 --- a/src/drivers/Quartz/Fl_Font.H +++ b/src/drivers/Quartz/Fl_Font.H @@ -3,7 +3,7 @@ // // Font definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2011 by Bill Spitzak and others. +// Copyright 1998-2018 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -28,21 +28,10 @@ #include "Fl_Quartz_Graphics_Driver.H" #include <ApplicationServices/ApplicationServices.h> -/** - This a structure for an actual system font, with junk to - help choose it and info on character sizes. Each Fl_Fontdesc has a - linked list of these. These are created the first time each system - font/size combination is used. -*/ -class Fl_Font_Descriptor { +class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor { public: - /** linked list for this Fl_Fontdesc */ - Fl_Font_Descriptor *next; - Fl_Fontsize size; /**< font size */ -#ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. - Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size); - FL_EXPORT ~Fl_Font_Descriptor(); - short ascent, descent, q_width; + Fl_Quartz_Font_Descriptor(const char* fontname, Fl_Fontsize size); + FL_EXPORT ~Fl_Quartz_Font_Descriptor(); # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 CTFontRef fontref; // the unicode span is divided in 512 blocks of 128 characters @@ -52,19 +41,6 @@ public: ATSUTextLayout layout; ATSUStyle style; # endif -# if HAVE_GL - unsigned int listbase;// base of display list, 0 = none -# endif // HAVE_GL - -#endif // FL_DOXYGEN -}; - -//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one - -struct Fl_Fontdesc { - const char *name; - char fontname[128]; // "Pretty" font name - Fl_Font_Descriptor *first; // linked list of sizes of this style }; extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table |