From 043bac6f8d01e84881dcf90411bca931afd228ca Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 9 May 2025 09:51:36 +0200
Subject: Remove declaration of Fl_Scalable_Graphics_Driver from
 FL/Fl_Graphics_Driver.H

and declare it in non-public header src/Fl_Scalable_Graphics_Driver.H which also
declares classes Fl_Font_Descriptor and Fl_Fontdesc.
---
 src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H     | 1 +
 src/drivers/GDI/Fl_Font.H                        | 1 +
 src/drivers/GDI/Fl_GDI_Graphics_Driver.H         | 2 +-
 src/drivers/Quartz/Fl_Font.H                     | 1 +
 src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 1 +
 src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx   | 1 -
 src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx      | 1 +
 src/drivers/X11/Fl_X11_Screen_Driver.cxx         | 1 +
 src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H       | 1 +
 9 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index 5045790cc..eee10900d 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -22,6 +22,7 @@
 # define FL_CAIRO_GRAPHICS_DRIVER_H
 
 #include <FL/Fl_Graphics_Driver.H>
+#include "../../Fl_Scalable_Graphics_Driver.H" // Fl_Font_Descriptor
 #include <cairo/cairo.h>
 
 typedef struct _PangoLayout  PangoLayout;
diff --git a/src/drivers/GDI/Fl_Font.H b/src/drivers/GDI/Fl_Font.H
index d160c55e9..3e8b1296f 100644
--- a/src/drivers/GDI/Fl_Font.H
+++ b/src/drivers/GDI/Fl_Font.H
@@ -23,6 +23,7 @@
 #define FL_FONT_
 
 #include <config.h>
+#include "../../Fl_Scalable_Graphics_Driver.H"
 
 class Fl_GDI_Font_Descriptor : public Fl_Font_Descriptor {
 public:
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index 01ecf9531..336fa1ebc 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -23,7 +23,7 @@
 #ifndef FL_GDI_GRAPHICS_DRIVER_H
 #define FL_GDI_GRAPHICS_DRIVER_H
 
-#include <FL/Fl_Graphics_Driver.H>
+#include "../../Fl_Scalable_Graphics_Driver.H"
 #include <windows.h>
 #include <stdlib.h>
 #include <config.h>
diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H
index be571ece1..c700568a2 100644
--- a/src/drivers/Quartz/Fl_Font.H
+++ b/src/drivers/Quartz/Fl_Font.H
@@ -24,6 +24,7 @@
 
 #include <config.h>
 #include "Fl_Quartz_Graphics_Driver.H"
+#include "../../Fl_Scalable_Graphics_Driver.H" // Fl_Font_Descriptor
 #include <ApplicationServices/ApplicationServices.h>
 
 class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor {
diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
index 8cb90d995..e6f4ad65f 100644
--- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
@@ -17,6 +17,7 @@
 #include "Fl_Wayland_Screen_Driver.H"
 #include "Fl_Wayland_Window_Driver.H"
 #include "Fl_Wayland_Graphics_Driver.H"
+#include "../../Fl_Scalable_Graphics_Driver.H"
 #include <wayland-cursor.h>
 #include "../../../libdecor/build/fl_libdecor.h"
 #include "xdg-shell-client-protocol.h"
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
index a3a7ccf47..b1ddc9f91 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
@@ -20,7 +20,6 @@
 #include "../GDI/Fl_Font.H"
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include "../GDI/Fl_GDI_Graphics_Driver.H"
 #include <FL/Fl_RGB_Image.H>
 #include <FL/fl_ask.H>
 #include <stdio.h>
diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
index 938c61a7b..a1b998b8e 100644
--- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
@@ -20,6 +20,7 @@
 #include "../../Fl_Gl_Choice.H"
 #include "../../Fl_Screen_Driver.H"
 #include "Fl_X11_Gl_Window_Driver.H"
+#include "Fl_Scalable_Graphics_Driver.H" // Fl_Font_Descriptor
 #include <GL/glx.h>
 #if ! (USE_XFT || FLTK_USE_CAIRO)
 #  include "../Xlib/Fl_Font.H"
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index f9cff395d..ad2958a36 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -18,6 +18,7 @@
 #include <config.h>
 #include "Fl_X11_Screen_Driver.H"
 #include "Fl_X11_Window_Driver.H"
+#include "../../Fl_Scalable_Graphics_Driver.H"
 #include "../Posix/Fl_Posix_System_Driver.H"
 #include <FL/Fl.H>
 #include <FL/platform.H>
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
index b3e9ad444..83146aef0 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -24,6 +24,7 @@
 
 #include <config.h>
 #include <FL/Fl_Graphics_Driver.H>
+#include "../../Fl_Scalable_Graphics_Driver.H"
 #include <FL/platform.H>
 
 #if HAVE_X11_XREGION_H
-- 
cgit v1.2.3