From d011d5b4f060166f87fc44594f7f31ddf6b652e9 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 2 Apr 2016 13:22:48 +0000
Subject: Replace src/Fl_Font.H by one file for each platform.

This file contained nearly only platform-specific code.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11507 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Screen_Driver.H | 2 ++
 FL/mac.H              | 3 +--
 FL/x.H                | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H
index 659caedf7..0ce662287 100644
--- a/FL/Fl_Screen_Driver.H
+++ b/FL/Fl_Screen_Driver.H
@@ -112,6 +112,8 @@ 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
+  static struct Fl_Fontdesc *calc_fl_fonts();
 };
 
 
diff --git a/FL/mac.H b/FL/mac.H
index 82cba2d4f..0a6256967 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -107,7 +107,7 @@ struct flCocoaRegion {
 }; // a region is the union of a series of rectangles
 
 #  include <FL/Fl_Window.H>
-#  include "../src/Fl_Font.H"
+#include "../src/drivers/Quartz/Fl_Font.H"
 
 #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
 #if defined(__LP64__) && __LP64__
@@ -167,7 +167,6 @@ public:
   static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h);
   static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel);
   static void screen_work_area(int &X, int &Y, int &W, int &H, int n); // compute work area of a given screen
-  static Fl_Fontdesc* calc_fl_fonts(void); // computes the fl_fonts global variable
   static void clip_to_rounded_corners(CGContextRef gc, int w, int h);
   static void complete_copy_pdf_and_tiff(CGContextRef gc, CFMutableDataRef pdfdata);
   static void draw_layer_to_context(CALayer *layer, CGContextRef gc, int w, int h);
diff --git a/FL/x.H b/FL/x.H
index 64d444045..7f96b88fe 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -108,7 +108,6 @@ private:
   XFontStruct *ptr;
 };
 extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
-extern FL_EXPORT XFontStruct* fl_X_core_font();
 
 // this object contains all X-specific stuff about a window:
 // Warning: this object is highly subject to change!  
-- 
cgit v1.2.3