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

2 files changed, 10 insertions, 10 deletions

diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index 418b8b90c..407e490df 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_Graphics_Driver.H
@@ -52,6 +52,7 @@ FL_EXPORT extern Fl_Graphics_Driver *fl_graphics_driver;
  */
 typedef void (*Fl_Draw_Image_Cb)(void* data,int x,int y,int w,uchar* buf);
 
+struct Fl_Fontdesc;
 
 #define FL_REGION_STACK_SIZE 10
 #define FL_MATRIX_STACK_SIZE 32
@@ -323,6 +324,15 @@ public:
   virtual void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h);
   virtual Fl_Region XRectangleRegion(int x, int y, int w, int h);
   virtual void XDestroyRegion(Fl_Region r);
+  // font support
+  virtual const char* get_font_name(Fl_Font fnum, int* ap) {return NULL;}
+  virtual int get_font_sizes(Fl_Font fnum, int*& sizep) {return 0;}
+  virtual Fl_Font set_fonts(const char *name) {return 0;}
+  // an implementation which returns NULL may be enough
+  virtual Fl_Fontdesc* calc_fl_fonts(void) {return NULL;}
+  virtual unsigned font_desc_size() {return 0;}
+  virtual const char *font_name(int num) {return NULL;}
+  virtual void font_name(int num, const char *name) {}
 };
 
 #endif // FL_GRAPHICS_DRIVER_H
diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H
index 86474de9e..e857930a7 100644
--- a/FL/Fl_Screen_Driver.H
+++ b/FL/Fl_Screen_Driver.H
@@ -118,16 +118,6 @@ public:
   Fl_Text_Editor::Key_Binding *text_editor_extra_key_bindings;
   // default implementation may be enough
   virtual int text_display_can_leak() { return 0; }
-  // an implementation which returns NULL may be enough
-  virtual struct Fl_Fontdesc *calc_fl_fonts() {return NULL;}
-  // API to the platform-dependent Fl_Fontdesc structure
-  virtual unsigned font_desc_size() {return 0;}
-  virtual const char *font_name(int num) {return NULL;}
-  virtual void font_name(int num, const char *name) {}
-  // to support Fl::set_fonts(), Fl::get_font_sizes(), Fl::get_font_name()
-  virtual Fl_Font set_fonts(const char *name) {return 0;}
-  virtual int get_font_sizes(Fl_Font fnum, int*& sizep) {return 0;}
-  virtual const char* get_font_name(Fl_Font fnum, int* ap) {return NULL;}
 
   // read raw image from a window or an offscreen buffer
 #if defined(FL_PORTING)