commit 4ae905cc9d6e17c0175becb874765071cec56f1d
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Wed Jul 20 08:37:21 2022 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Jul 20 08:37:21 2022 +0200

    Change prototype of virtual Fl_Graphics_Driver::pango_font_description().

 FL/Fl_Graphics_Driver.H                      | 2 +-
 src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H | 5 +++--
 src/drivers/PostScript/Fl_PostScript.cxx     | 2 +-
 src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git FL/Fl_Graphics_Driver.H FL/Fl_Graphics_Driver.H
index 16b39f0..c9c0737 100644
--- FL/Fl_Graphics_Driver.H
+++ FL/Fl_Graphics_Driver.H
@@ -367,7 +367,7 @@ public:
   virtual void overlay_rect(int x, int y, int w , int h);
   virtual float override_scale();
   virtual void restore_scale(float);
-  virtual PangoFontDescription* pango_font_description(Fl_Font) { return NULL; }
+  virtual PangoFontDescription* pango_font_description() { return NULL; }
   virtual void antialias(int state);
   virtual int antialias();
   virtual void delete_bitmask(fl_uintptr_t bm);
diff --git src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index d898427..bae351b 100644
--- src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -175,13 +175,14 @@ public:
   double width(const char *str, int n);
   double width(unsigned c);
   void text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h);
-  virtual PangoFontDescription* pango_font_description(Fl_Font /*fnum*/) {
+  virtual PangoFontDescription* pango_font_description() {
     return ((Fl_Cairo_Font_Descriptor*)font_descriptor())->fontref;
   }
   static void init_built_in_fonts();
   virtual Fl_Font set_fonts(const char* pattern_name);
   virtual const char *font_name(int num);
-  virtual void font_name(int num, const char *name);  virtual const char* get_font_name(Fl_Font fnum, int* ap);
+  virtual void font_name(int num, const char *name);
+  virtual const char* get_font_name(Fl_Font fnum, int* ap);
   virtual int get_font_sizes(Fl_Font fnum, int*& sizep);
   virtual Fl_Region XRectangleRegion(int x, int y, int w, int h);
   virtual void XDestroyRegion(Fl_Region r);
diff --git src/drivers/PostScript/Fl_PostScript.cxx src/drivers/PostScript/Fl_PostScript.cxx
index 1d86a67..e27a91f 100644
--- src/drivers/PostScript/Fl_PostScript.cxx
+++ src/drivers/PostScript/Fl_PostScript.cxx
@@ -1511,7 +1511,7 @@ void Fl_PostScript_Graphics_Driver::transformed_draw(const char* str, int n, dou
     pango_context_ = pango_font_map_create_context(def_font_map); // 1.22
     pango_layout_ = pango_layout_new(pango_context_);
   }
-  PangoFontDescription *pfd = Fl_Graphics_Driver::default_driver().pango_font_description(font());
+  PangoFontDescription *pfd = Fl_Graphics_Driver::default_driver().pango_font_description();
   pango_layout_set_font_description(pango_layout_, pfd);
   int pwidth, pheight;
   cairo_save(cairo_);
diff --git src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
index 9e3c44d..be36049 100644
--- src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
+++ src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -85,7 +85,7 @@ protected:
   static PangoFontMap *pfmap_;
   static PangoLayout *playout_;
 public:
-  virtual PangoFontDescription* pango_font_description(Fl_Font fnum) { return pfd_array[fnum]; }
+  virtual PangoFontDescription* pango_font_description() { return pfd_array[font()]; }
 private:
   static PangoFontDescription **pfd_array; // one array element for each Fl_Font
   static int pfd_array_length;