From 0e336558537bd0af1c3bb2434a277091824e637c Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 22 Sep 2016 13:22:03 +0000 Subject: 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 --- src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H | 3 +++ src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index 0fc1e1cbe..6e2d65772 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -80,6 +80,9 @@ public: 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/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index 7d177de98..232750adf 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -511,19 +511,15 @@ int Fl_WinAPI_Screen_Driver::compose(int &del) { return 1; } -struct Fl_Fontdesc *Fl_Screen_Driver::calc_fl_fonts() { - return NULL; -} - -unsigned Fl_Screen_Driver::font_desc_size() { +unsigned Fl_WinAPI_Screen_Driver::font_desc_size() { return (unsigned)sizeof(Fl_Fontdesc); } -const char *Fl_Screen_Driver::font_name(int num) { +const char *Fl_WinAPI_Screen_Driver::font_name(int num) { return fl_fonts[num].name; } -void Fl_Screen_Driver::font_name(int num, const char *name) { +void Fl_WinAPI_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;} -- cgit v1.2.3