diff options
| author | Manolo Gouy <Manolo> | 2016-04-02 13:22:48 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-02 13:22:48 +0000 |
| commit | d011d5b4f060166f87fc44594f7f31ddf6b652e9 (patch) | |
| tree | 45d6edbcd0dcad0abf71a76a146be36716b0a927 /src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | |
| parent | c03f3d8946c3a68aea2c8c11705e04eeff0e02c9 (diff) | |
Replace src/Fl_Font.H by one file for each platform.
This file contained nearly only platform-specific code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11507 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx')
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 9e51a97a1..eca6fb5d2 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -25,6 +25,7 @@ #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_utf8.h> +#include <FL/Fl_Screen_Driver.H> Fl_Fontdesc* fl_fonts = NULL; @@ -48,7 +49,7 @@ static const int CoreText_threshold = 100500; // this represents Mac OS 10.5 // turn a stored font name into a pretty name: const char* Fl::get_font_name(Fl_Font fnum, int* ap) { - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc *f = fl_fonts + fnum; if (!f->fontname[0]) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 @@ -200,7 +201,7 @@ else { int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { static int array[128]; - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc *s = fl_fonts+fnum; if (!s->name) s = fl_fonts; // empty slot in table, use entry 0 int cnt = 0; @@ -416,7 +417,7 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) return utfWbuf; } // mac_Utf8_to_Utf16 -Fl_Fontdesc* Fl_X::calc_fl_fonts(void) +Fl_Fontdesc* Fl_Screen_Driver::calc_fl_fonts(void) { if (!fl_mac_os_version) fl_mac_os_version = Fl_Darwin_System_Driver::calc_mac_os_version(); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 @@ -427,7 +428,7 @@ Fl_Fontdesc* Fl_X::calc_fl_fonts(void) } static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size) { - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc* s = fl_fonts+fnum; if (!s->name) s = fl_fonts; // use 0 if fnum undefined Fl_Font_Descriptor* f; |