diff options
| author | Manolo Gouy <Manolo> | 2016-09-24 06:21:37 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-09-24 06:21:37 +0000 |
| commit | b3c16b49113529a6ab9c42df8f237edc0c6352f9 (patch) | |
| tree | 37416ec8e30c353f235c2cc27ffd39710e312461 /src/drivers/Quartz/Fl_Font.H | |
| parent | cccb475fa8feffba1e89aca8638d77fd8ac33adf (diff) | |
Mac OS platform: restore usability with SDK 10.3 and 10.4
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11973 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Quartz/Fl_Font.H')
| -rw-r--r-- | src/drivers/Quartz/Fl_Font.H | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H index 2a7c10232..00a96370c 100644 --- a/src/drivers/Quartz/Fl_Font.H +++ b/src/drivers/Quartz/Fl_Font.H @@ -25,6 +25,7 @@ #define FL_FONT_ #include <config.h> +#include "Fl_Quartz_Graphics_Driver.H" #include <ApplicationServices/ApplicationServices.h> /** @@ -40,19 +41,20 @@ public: 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); - ATSUTextLayout layout; -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + FL_EXPORT ~Fl_Font_Descriptor(); + short ascent, descent, q_width; +# 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 float *width[512]; // array of arrays of character widths -# endif +# endif +# if HAS_ATSU + ATSUTextLayout layout; ATSUStyle style; - short ascent, descent, q_width; -# if HAVE_GL +# endif +# if HAVE_GL unsigned int listbase;// base of display list, 0 = none -# endif // HAVE_GL - - FL_EXPORT ~Fl_Font_Descriptor(); +# endif // HAVE_GL #endif // FL_DOXYGEN }; |