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

2 files changed, 6 insertions, 7 deletions

diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H
index a38e6ef4f..c3ccadd42 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.H
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.H
@@ -90,6 +90,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/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 05280cd79..703eafeab 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -694,19 +694,15 @@ int Fl_X11_Screen_Driver::text_display_can_leak() {
 #endif
 }
 
-struct Fl_Fontdesc *Fl_Screen_Driver::calc_fl_fonts() {
-  return NULL;
-}
-
-unsigned Fl_Screen_Driver::font_desc_size() {
+unsigned Fl_X11_Screen_Driver::font_desc_size() {
   return (unsigned)sizeof(Fl_Fontdesc);
 }
 
-const char *Fl_Screen_Driver::font_name(int num) {
+const char *Fl_X11_Screen_Driver::font_name(int num) {
   return fl_fonts[num].name;
 }
 
-void Fl_Screen_Driver::font_name(int num, const char *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;}