Remove duplication of Pango standard font names

And move each array of standard font names to appropriate font-related source file

1 files changed, 0 insertions, 96 deletions

diff --git a/src/drivers/X11/fl_X11_platform_init.cxx b/src/drivers/X11/fl_X11_platform_init.cxx
index 477978b97..33ea43bee 100644
--- a/src/drivers/X11/fl_X11_platform_init.cxx
+++ b/src/drivers/X11/fl_X11_platform_init.cxx
@@ -26,7 +26,6 @@
 #include "../Unix/Fl_Unix_System_Driver.H"
 #include "Fl_X11_Window_Driver.H"
 #include "../Xlib/Fl_Xlib_Image_Surface_Driver.H"
-#include "../Xlib/Fl_Font.H"
 
 
 Fl_Copy_Surface_Driver *Fl_Copy_Surface_Driver::newCopySurfaceDriver(int w, int h)
@@ -35,101 +34,6 @@ Fl_Copy_Surface_Driver *Fl_Copy_Surface_Driver::newCopySurfaceDriver(int w, int
 }
 
 
-#if !USE_XFT
-
-// WARNING: if you add to this table, you must redefine FL_FREE_FONT
-// in Enumerations.H & recompile!!
-static Fl_Xlib_Fontdesc built_in_table[] = {
-{"-*-helvetica-medium-r-normal--*"},
-{"-*-helvetica-bold-r-normal--*"},
-{"-*-helvetica-medium-o-normal--*"},
-{"-*-helvetica-bold-o-normal--*"},
-{"-*-courier-medium-r-normal--*"},
-{"-*-courier-bold-r-normal--*"},
-{"-*-courier-medium-o-normal--*"},
-{"-*-courier-bold-o-normal--*"},
-{"-*-times-medium-r-normal--*"},
-{"-*-times-bold-r-normal--*"},
-{"-*-times-medium-i-normal--*"},
-{"-*-times-bold-i-normal--*"},
-{"-*-symbol-*"},
-{"-*-lucidatypewriter-medium-r-normal-sans-*"},
-{"-*-lucidatypewriter-bold-r-normal-sans-*"},
-{"-*-*zapf dingbats-*"}
-};
-
-#else // USE_XFT
-
-#if ! USE_PANGO
-
-// The predefined fonts that FLTK has:
-static Fl_Fontdesc built_in_table[] = {
-#if 1
-  {" sans"},
-  {"Bsans"},
-  {"Isans"},
-  {"Psans"},
-  {" mono"},
-  {"Bmono"},
-  {"Imono"},
-  {"Pmono"},
-  {" serif"},
-  {"Bserif"},
-  {"Iserif"},
-  {"Pserif"},
-  {" symbol"},
-  {" screen"},
-  {"Bscreen"},
-  {" zapf dingbats"},
-#else
-  {" helvetica"},
-  {"Bhelvetica"},
-  {"Ihelvetica"},
-  {"Phelvetica"},
-  {" courier"},
-  {"Bcourier"},
-  {"Icourier"},
-  {"Pcourier"},
-  {" times"},
-  {"Btimes"},
-  {"Itimes"},
-  {"Ptimes"},
-  {" symbol"},
-  {" lucidatypewriter"},
-  {"Blucidatypewriter"},
-  {" zapf dingbats"},
-#endif
-};
-
-#else
-
-// The predefined fonts that FLTK has with Pango:
-static Fl_Fontdesc built_in_table[] = {
-  {"Sans"},
-  {"Sans Bold"},
-  {"Sans Italic"},
-  {"Sans Bold Italic"},
-  {"Monospace"},
-  {"Monospace Bold"},
-  {"Monospace Italic"},
-  {"Monospace Bold Italic"},
-  {"Serif"},
-  {"Serif Bold"},
-  {"Serif Italic"},
-  {"Serif Bold Italic"},
-  {"Sans"},
-  {"Monospace"},
-  {"Monospace Bold"},
-  {"Sans"},
-};
-
-#endif // USE_PANGO
-
-#endif // USE_XFT
-
-FL_EXPORT Fl_Fontdesc* fl_fonts = (Fl_Fontdesc*)built_in_table;
-
-
 Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
 {
 #if FLTK_USE_CAIRO