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
---
 src/gl_draw.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/gl_draw.cxx')

diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 4e1612c6e..4d680d2e4 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -35,7 +35,13 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl_Device.H>
 #include "Fl_Gl_Choice.H"
-#include "Fl_Font.H"
+#if defined(__APPLE__)
+#include "drivers/Quartz/Fl_Font.H"
+#elif defined(WIN32)
+#include "drivers/GDI/Fl_Font.H"
+#elif USE_X11
+#include "drivers/Xlib/Fl_Font.H"
+#endif
 #include <FL/fl_utf8.h>
 
 #if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Graphics_Driver - platform opengl
@@ -92,7 +98,7 @@ void  gl_font(int fontid, int size) {
  * then sorting through them at draw time (for normal X rendering) to find which one can
  * render the current glyph... But for now, just use the first font in the list for GL...
  */
-    XFontStruct *font = fl_X_core_font();
+    XFontStruct *font = fl_xfont.value();
     int base = font->min_char_or_byte2;
     int count = font->max_char_or_byte2-base+1;
     fl_fontsize->listbase = glGenLists(256);
-- 
cgit v1.2.3