From 4768ebaf8bd75ac3bab6290f9803a2019af062fd Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 14 Apr 2023 08:58:16 +0200
Subject: test/utf8: improve use of Fl::set_fonts(const char *) across
 platforms

---
 test/utf8.cxx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'test/utf8.cxx')

diff --git a/test/utf8.cxx b/test/utf8.cxx
index 8cd8763eb..5510a84ce 100644
--- a/test/utf8.cxx
+++ b/test/utf8.cxx
@@ -416,16 +416,13 @@ int make_font_chooser(void)
   // create the widget frame
   create_font_widget();
 
-  // Load the systems available fonts - ask for everything
-  //    font_count = Fl::set_fonts("*");
-#ifdef _WIN32
-  font_count = Fl::set_fonts("*");
-#elif defined(__APPLE__)
-  font_count = Fl::set_fonts("*");
-#else
-  // Load the systems available fonts - ask for everything that claims to be
-  // iso10646 compatible
+  // Load the system's available fonts
+#if defined(FLTK_USE_X11) && !defined(FLTK_USE_CAIRO)
+  // ask for everything that claims to be iso10646 compatible
   font_count = Fl::set_fonts("-*-*-*-*-*-*-*-*-*-*-*-*-iso10646-1");
+#else
+  // ask for everything
+  font_count = Fl::set_fonts("*");
 #endif
 
   // allocate space for the sizes and numsizes array, now we know how many
-- 
cgit v1.2.3