commit 1d64b785549fcfe5f329cd7b06547e7bf2687df3
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Sat May 7 15:16:29 2022 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Sat May 7 15:16:29 2022 +0200

    Change protection levels in classes Fl_XXX_Gl_Window_Driver

 src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H     | 2 +-
 src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H | 4 +---
 src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H  | 1 -
 src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H   | 2 +-
 src/drivers/X11/Fl_X11_Gl_Window_Driver.H         | 3 +--
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
index 1f404e6..526cad6 100644
--- src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
+++ src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
@@ -22,7 +22,7 @@
 class Fl_Gl_Choice;
 
 class Fl_Cocoa_Gl_Window_Driver : public Fl_Gl_Window_Driver {
-  friend class Fl_Gl_Window_Driver;
+  friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_Cocoa_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
   virtual float pixels_per_unit();
   virtual void before_show(int& need_after);
diff --git src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H
index 3698551..8a1c4ab 100644
--- src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H
+++ src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H
@@ -34,9 +34,8 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl
 */
 
 class Fl_Wayland_Gl_Window_Driver : public Fl_Gl_Window_Driver {
-  friend class Fl_Gl_Window_Driver;
+  friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   bool egl_resize_in_progress;
-protected:
   Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win);
   virtual float pixels_per_unit();
   virtual void make_current_before();
@@ -54,7 +53,6 @@ protected:
   virtual void gl_start();
   virtual Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h);
   char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs);
-public:
   static EGLDisplay egl_display;
   static EGLint configs_count;
   static struct wl_event_queue *gl_event_queue;
diff --git src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H
index b650fcf..1a15312 100644
--- src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H
+++ src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H
@@ -53,7 +53,6 @@
 
 #include "../Cairo/Fl_Cairo_Graphics_Driver.H"
 #include <stdint.h> // for uint32_t
-typedef struct _PangoLayout  PangoLayout;
 
 struct fl_wld_buffer {
   struct wl_buffer *wl_buffer;
diff --git src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
index 4b48cfd..3b09c73 100644
--- src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
+++ src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
@@ -32,7 +32,7 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl
 */
 
 class Fl_WinAPI_Gl_Window_Driver : public Fl_Gl_Window_Driver {
-  friend class Fl_Gl_Window_Driver;
+  friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_WinAPI_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
   virtual float pixels_per_unit();
   virtual int mode_(int m, const int *a);
diff --git src/drivers/X11/Fl_X11_Gl_Window_Driver.H src/drivers/X11/Fl_X11_Gl_Window_Driver.H
index a123877..8043c04 100644
--- src/drivers/X11/Fl_X11_Gl_Window_Driver.H
+++ src/drivers/X11/Fl_X11_Gl_Window_Driver.H
@@ -25,7 +25,7 @@
 class Fl_Gl_Choice;
 
 class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver {
-  friend class Fl_Gl_Window_Driver;
+  friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
   Fl_X11_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
   virtual float pixels_per_unit();
   virtual void before_show(int& need_after);
@@ -48,7 +48,6 @@ class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver {
 #if !USE_XFT
   virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum);
 #endif
-  public:
   static GLContext create_gl_context(XVisualInfo* vis);
 };