From 02535d122296b00a99fa30e0253f83c82f177894 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 22 Sep 2016 07:44:34 +0000 Subject: Rewrite Fl::set_fonts(), Fl::get_font_sizes(), Fl::get_font_name() under the driver model. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11965 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/drivers/Quartz') diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 2d951cc8c..46c1dc925 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -21,18 +21,16 @@ #include "Fl_Quartz_Graphics_Driver.h" #include "../Darwin/Fl_Darwin_System_Driver.H" +#include "../Cocoa/Fl_Cocoa_Screen_Driver.H" #include "Fl_Font.H" #include #include #include -#include +#include // for fl_utf8toUtf16() #include Fl_Fontdesc* fl_fonts = NULL; -/* from fl_utf.c */ -extern unsigned fl_utf8toUtf16(const char* src, unsigned srclen, unsigned short* dst, unsigned dstlen); - static CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 static CFMutableDictionaryRef attributes = NULL; @@ -49,7 +47,7 @@ static const int CoreText_threshold = 100500; // this represents Mac OS 10.5 #define ENDOFBUFFER sizeof(fl_fonts->fontname)-1 // turn a stored font name into a pretty name: -const char* Fl::get_font_name(Fl_Font fnum, int* ap) { +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(); Fl_Fontdesc *f = fl_fonts + fnum; if (!f->fontname[0]) { @@ -121,7 +119,7 @@ static int fl_free_font = FL_FREE_FONT; // and to sort them so the first 4 in a family are normal, bold, italic, // and bold italic. -Fl_Font Fl::set_fonts(const char* xstarname) { +Fl_Font Fl_Cocoa_Screen_Driver::set_fonts(const char* xstarname) { #pragma unused ( xstarname ) if (fl_free_font > FL_FREE_FONT) return (Fl_Font)fl_free_font; // if already called @@ -200,7 +198,7 @@ else { return 0; } -int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { +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(); Fl_Fontdesc *s = fl_fonts+fnum; -- cgit v1.2.3