diff options
| author | Manolo Gouy <Manolo> | 2016-09-23 13:56:07 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-09-23 13:56:07 +0000 |
| commit | 0250c5a98af506f2f107f8bd2e9e2c2c87a10c10 (patch) | |
| tree | 161771fa546b05f2d7fad1f5d67d831e00c6425c /src/drivers/X11 | |
| parent | 63e33b1be3e2af253cd8adf10a5eac7e72a5fc7e (diff) | |
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
Diffstat (limited to 'src/drivers/X11')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.H | 6 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 23 |
2 files changed, 0 insertions, 29 deletions
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H index c3ccadd42..8f3638718 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.H +++ b/src/drivers/X11/Fl_X11_Screen_Driver.H @@ -87,12 +87,6 @@ public: virtual void disable_im(); virtual void open_display(); virtual void close_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(); }; diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 703eafeab..d28859949 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -694,29 +694,6 @@ int Fl_X11_Screen_Driver::text_display_can_leak() { #endif } -unsigned Fl_X11_Screen_Driver::font_desc_size() { - return (unsigned)sizeof(Fl_Fontdesc); -} - -const char *Fl_X11_Screen_Driver::font_name(int num) { - return fl_fonts[num].name; -} - -void Fl_X11_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;} - if (s->xlist && s->n >= 0) XFreeFontNames(s->xlist); - 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->xlist = 0; - s->first = 0; -} // // 'fl_subimage_offsets()' - Calculate subimage offsets for an axis |
