diff options
| author | Manolo Gouy <Manolo> | 2016-09-22 13:22:03 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-09-22 13:22:03 +0000 |
| commit | 0e336558537bd0af1c3bb2434a277091824e637c (patch) | |
| tree | c0ead65b0cd6f0f43f5e0fe514946d6edfb1cb62 /src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | |
| parent | 02535d122296b00a99fa30e0253f83c82f177894 (diff) | |
Fl_Screen_Driver class: its platform dependent member functions should not be static.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11966 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 | 8 |
1 files changed, 4 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 46c1dc925..931316c2a 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -48,7 +48,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_Cocoa_Screen_Driver::get_font_name(Fl_Font fnum, int* ap) { - if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = 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 +200,7 @@ else { int Fl_Cocoa_Screen_Driver::get_font_sizes(Fl_Font fnum, int*& sizep) { static int array[128]; - if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = 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 +416,7 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) return utfWbuf; } // mac_Utf8_to_Utf16 -Fl_Fontdesc* Fl_Screen_Driver::calc_fl_fonts(void) +Fl_Fontdesc* Fl_Cocoa_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 +427,7 @@ Fl_Fontdesc* Fl_Screen_Driver::calc_fl_fonts(void) } static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size) { - if (!fl_fonts) fl_fonts = Fl_Screen_Driver::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; |