From 0250c5a98af506f2f107f8bd2e9e2c2c87a10c10 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Fri, 23 Sep 2016 13:56:07 +0000 Subject: Move font-related member functions from Fl_Screen_Driver to Fl_Graphics_Driver. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11968 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H | 7 ------- src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 23 ----------------------- 2 files changed, 30 deletions(-) (limited to 'src/drivers/Cocoa') diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index 0223c252c..29ae7570e 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -94,13 +94,6 @@ public: virtual void enable_im(); virtual void disable_im(); virtual void open_display(); - virtual Fl_Font set_fonts(const char *name); - virtual int get_font_sizes(Fl_Font fnum, int*& sizep); - virtual const char* get_font_name(Fl_Font fnum, int* ap); - virtual const char *font_name(int num); - virtual void font_name(int num, const char *name); - virtual unsigned font_desc_size(); - virtual struct Fl_Fontdesc *calc_fl_fonts(); }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index e9641879b..9882fa3e9 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -279,29 +279,6 @@ int Fl_Cocoa_Screen_Driver::compose(int &del) { return 1; } -unsigned Fl_Cocoa_Screen_Driver::font_desc_size() { - return (unsigned)sizeof(Fl_Fontdesc); -} - -const char *Fl_Cocoa_Screen_Driver::font_name(int num) { - if (!fl_fonts) fl_fonts = calc_fl_fonts(); - return fl_fonts[num].name; -} - -void Fl_Cocoa_Screen_Driver::font_name(int num, const char *name) { - Fl_Fontdesc *s = fl_fonts + num; - if (s->name) { - if (!strcmp(s->name, name)) {s->name = name; return;} - for (Fl_Font_Descriptor* f = s->first; f;) { - Fl_Font_Descriptor* n = f->next; delete f; f = n; - } - s->first = 0; - } - s->name = name; - s->fontname[0] = 0; - s->first = 0; -} - uchar * // O - Pixel buffer or NULL if failed Fl_Cocoa_Screen_Driver::read_image(uchar *p, // I - Pixel buffer or NULL to allocate int x, // I - Left position -- cgit v1.2.3