diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_Font.H | 70 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Font.H | 76 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 9 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Font.H | 82 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx | 2 | ||||
| -rw-r--r-- | src/fl_font.cxx | 18 | ||||
| -rw-r--r-- | src/fl_set_font.cxx | 17 | ||||
| -rw-r--r-- | src/gl_draw.cxx | 10 | ||||
| -rw-r--r-- | src/makedepend | 10 |
15 files changed, 278 insertions, 34 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca12bfbe3..946c4264b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -199,7 +199,7 @@ if (USE_X11) drivers/Posix/Fl_Posix_System_Driver.H drivers/X11/Fl_X11_Screen_Driver.H drivers/X11/Fl_X11_Window_Driver.H - drivers/Quartz/Fl_Quartz_Graphics_Driver.H + drivers/Xlib/Fl_Font.H ) elseif (USE_SDL) @@ -256,6 +256,7 @@ elseif (APPLE) drivers/Cocoa/Fl_Cocoa_Screen_Driver.H drivers/Cocoa/Fl_Cocoa_Window_Driver.H drivers/Quartz/Fl_Quartz_Graphics_Driver.H + drivers/Quartz/Fl_Font.H ) else () @@ -285,6 +286,7 @@ else () drivers/WinAPI/Fl_WinAPI_Screen_Driver.H drivers/WinAPI/Fl_WinAPI_Window_Driver.H drivers/GDI/Fl_GDI_Graphics_Driver.H + drivers/GDI/Fl_Font.H ) endif (USE_X11) diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 8bff1c8b0..2496dab69 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -61,7 +61,7 @@ void fl_cleanup_dc_list(void); #include <FL/Fl_Paged_Device.H> #include <FL/Fl_Shared_Image.H> #include "flstring.h" -#include "Fl_Font.H" +#include "drivers/GDI/Fl_Font.H" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/src/drivers/GDI/Fl_Font.H b/src/drivers/GDI/Fl_Font.H new file mode 100644 index 000000000..c6d467cc3 --- /dev/null +++ b/src/drivers/GDI/Fl_Font.H @@ -0,0 +1,70 @@ +// +// "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $" +// +// Font definitions for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2011 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +// Two internal fltk data structures: +// +// Fl_Fontdesc: an entry into the fl_font() table. There is one of these +// for each fltk font number. +// +#ifndef FL_FONT_ +#define FL_FONT_ + +#include <config.h> + +/** + This a structure for an actual system font, with junk to + help choose it and info on character sizes. Each Fl_Fontdesc has a + linked list of these. These are created the first time each system + font/size combination is used. +*/ +class Fl_Font_Descriptor { +public: + /** linked list for this Fl_Fontdesc */ + Fl_Font_Descriptor *next; + Fl_Fontsize size; /**< font size */ +#ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. + HFONT fid; + int *width[64]; + TEXTMETRIC metr; + int angle; + FL_EXPORT Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size); +# if HAVE_GL + unsigned int listbase;// base of display list, 0 = none + char glok[64]; +# endif // HAVE_GL + + FL_EXPORT ~Fl_Font_Descriptor(); + +#endif // FL_DOXYGEN +}; + +//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one + +struct Fl_Fontdesc { + const char *name; + char fontname[128]; // "Pretty" font name + Fl_Font_Descriptor *first; // linked list of sizes of this style +}; + +extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table + +#endif + +// +// End of "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $". +// diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 9de668c69..3f1b31223 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -41,7 +41,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/x.H> -#include "../../Fl_Font.H" +#include "Fl_Font.H" #include <stdio.h> #include <stdlib.h> diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H new file mode 100644 index 000000000..8d4b7d23f --- /dev/null +++ b/src/drivers/Quartz/Fl_Font.H @@ -0,0 +1,76 @@ +// +// "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $" +// +// Font definitions for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2011 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +// Two internal fltk data structures: +// +// Fl_Fontdesc: an entry into the fl_font() table. There is one of these +// for each fltk font number. +// +#ifndef FL_FONT_ +#define FL_FONT_ + +#include <config.h> +#include <ApplicationServices/ApplicationServices.h> + +/** + This a structure for an actual system font, with junk to + help choose it and info on character sizes. Each Fl_Fontdesc has a + linked list of these. These are created the first time each system + font/size combination is used. +*/ +class Fl_Font_Descriptor { +public: + /** linked list for this Fl_Fontdesc */ + Fl_Font_Descriptor *next; + Fl_Fontsize size; /**< font size */ +#ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. + Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size); + ATSUTextLayout layout; +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + CTFontRef fontref; + // the unicode span is divided in 512 blocks of 128 characters + float *width[512]; // array of arrays of character widths +# endif + ATSUStyle style; + short ascent, descent, q_width; +# if HAVE_GL + unsigned int listbase;// base of display list, 0 = none +# endif // HAVE_GL + + FL_EXPORT ~Fl_Font_Descriptor(); + +#endif // FL_DOXYGEN +}; + +//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one + +struct Fl_Fontdesc { + const char *name; + char fontname[128]; // "Pretty" font name + Fl_Font_Descriptor *first; // linked list of sizes of this style + char **xlist; // matched X font names + int n; // size of xlist, negative = don't free xlist! +}; + +extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table + +#endif + +// +// End of "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $". +// diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 9e51a97a1..eca6fb5d2 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -25,6 +25,7 @@ #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_utf8.h> +#include <FL/Fl_Screen_Driver.H> Fl_Fontdesc* fl_fonts = NULL; @@ -48,7 +49,7 @@ static const int CoreText_threshold = 100500; // this represents Mac OS 10.5 // turn a stored font name into a pretty name: const char* Fl::get_font_name(Fl_Font fnum, int* ap) { - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc *f = fl_fonts + fnum; if (!f->fontname[0]) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 @@ -200,7 +201,7 @@ else { int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { static int array[128]; - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc *s = fl_fonts+fnum; if (!s->name) s = fl_fonts; // empty slot in table, use entry 0 int cnt = 0; @@ -416,7 +417,7 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) return utfWbuf; } // mac_Utf8_to_Utf16 -Fl_Fontdesc* Fl_X::calc_fl_fonts(void) +Fl_Fontdesc* Fl_Screen_Driver::calc_fl_fonts(void) { if (!fl_mac_os_version) fl_mac_os_version = Fl_Darwin_System_Driver::calc_mac_os_version(); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 @@ -427,7 +428,7 @@ Fl_Fontdesc* Fl_X::calc_fl_fonts(void) } static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size) { - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); Fl_Fontdesc* s = fl_fonts+fnum; if (!s->name) s = fl_fonts; // use 0 if fnum undefined Fl_Font_Descriptor* f; diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index 7cca121db..a0db7bad0 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -526,6 +526,10 @@ int Fl_WinAPI_Screen_Driver::compose(int &del) { return 1; } +struct Fl_Fontdesc *Fl_Screen_Driver::calc_fl_fonts() { + return NULL; +} + // // End of "$Id$". //
\ No newline at end of file diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 530e18e4a..213613ce1 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -636,6 +636,10 @@ int Fl_X11_Screen_Driver::text_display_can_leak() { #endif } +struct Fl_Fontdesc *Fl_Screen_Driver::calc_fl_fonts() { + return NULL; +} + // // End of "$Id$". // diff --git a/src/drivers/Xlib/Fl_Font.H b/src/drivers/Xlib/Fl_Font.H new file mode 100644 index 000000000..d04bc9e33 --- /dev/null +++ b/src/drivers/Xlib/Fl_Font.H @@ -0,0 +1,82 @@ +// +// "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $" +// +// Font definitions for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2011 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +// Two internal fltk data structures: +// +// Fl_Fontdesc: an entry into the fl_font() table. There is one of these +// for each fltk font number. +// +#ifndef FL_FONT_ +#define FL_FONT_ + +#include <config.h> + +#if USE_XFT +typedef struct _XftFont XftFont; +#else +# include "../../Xutf8.h" +#endif // USE_XFT + +/** + This a structure for an actual system font, with junk to + help choose it and info on character sizes. Each Fl_Fontdesc has a + linked list of these. These are created the first time each system + font/size combination is used. +*/ +class Fl_Font_Descriptor { +public: + /** linked list for this Fl_Fontdesc */ + Fl_Font_Descriptor *next; + Fl_Fontsize size; /**< font size */ +#ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. +# if USE_XFT + XftFont* font; + //const char* encoding; + int angle; + FL_EXPORT Fl_Font_Descriptor(const char* xfontname, Fl_Fontsize size, int angle); +# else + XUtf8FontStruct* font; // X UTF-8 font information + FL_EXPORT Fl_Font_Descriptor(const char* xfontname); +# endif +# if HAVE_GL + unsigned int listbase;// base of display list, 0 = none + char glok[64]; +# endif // HAVE_GL + + FL_EXPORT ~Fl_Font_Descriptor(); + +#endif // FL_DOXYGEN +}; + +//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one + +struct Fl_Fontdesc { + const char *name; + char fontname[128]; // "Pretty" font name + Fl_Font_Descriptor *first; // linked list of sizes of this style + char **xlist; // matched X font names + int n; // size of xlist, negative = don't free xlist! +}; + +extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table + +#endif + +// +// End of "$Id: Fl_Font.H 11506 2016-04-02 11:58:13Z manolo $". +// diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx index d364030e5..0d64ee09b 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx @@ -22,7 +22,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/x.H> -#include "../../Fl_Font.H" +#include "Fl_Font.H" #include <stdio.h> #include <stdlib.h> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx index 582870e85..d6563eabe 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx @@ -22,7 +22,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/x.H> -#include "../../Fl_Font.H" +#include "Fl_Font.H" #include <stdio.h> #include <stdlib.h> diff --git a/src/fl_font.cxx b/src/fl_font.cxx index c6ae5ec77..f662b839e 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -22,7 +22,13 @@ #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_draw.H> -#include "Fl_Font.H" +#if defined(__APPLE__) +#include "drivers/Quartz/Fl_Font.H" +#elif defined(WIN32) +#include "drivers/GDI/Fl_Font.H" +#elif USE_X11 +#include "drivers/Xlib/Fl_Font.H" +#endif #include <stdio.h> #include <stdlib.h> @@ -31,16 +37,6 @@ // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx // ----------------------------------------------------------------------------- -#if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Graphics_Driver - platform font stuff -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you need the XFontStruct ?" -#else -XFontStruct *fl_X_core_font() -{ - return fl_xfont.value(); -} -#endif - double fl_width(const char* c) { if (c) return fl_width(c, (int) strlen(c)); else return 0.0f; diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index 0c53e75af..3917f80f3 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -22,8 +22,15 @@ #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_draw.H> +#include <FL/Fl_Screen_Driver.H> #include "flstring.h" -#include "Fl_Font.H" +#if defined(__APPLE__) +#include "drivers/Quartz/Fl_Font.H" +#elif defined(WIN32) +#include "drivers/GDI/Fl_Font.H" +#elif USE_X11 +#include "drivers/Xlib/Fl_Font.H" +#endif #include <stdlib.h> static int table_size; @@ -32,9 +39,7 @@ static int table_size; the string is not copied, so the string must be in static memory. */ void Fl::set_font(Fl_Font fnum, const char* name) { -#ifdef __APPLE__ // PORTME: Fl_Graphics_Driver - platform fonts - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); -#endif + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); while (fnum >= table_size) { int i = table_size; if (!i) { // don't realloc the built-in table @@ -85,9 +90,7 @@ void Fl::set_font(Fl_Font fnum, Fl_Font from) { of this face. */ const char* Fl::get_font(Fl_Font fnum) { -#ifdef __APPLE__ // PORTME: Fl_Graphics_Driver - platform fonts - if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); -#endif + if (!fl_fonts) fl_fonts = Fl_Screen_Driver::calc_fl_fonts(); return fl_fonts[fnum].name; } diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 4e1612c6e..4d680d2e4 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -35,7 +35,13 @@ #include <FL/fl_draw.H> #include <FL/Fl_Device.H> #include "Fl_Gl_Choice.H" -#include "Fl_Font.H" +#if defined(__APPLE__) +#include "drivers/Quartz/Fl_Font.H" +#elif defined(WIN32) +#include "drivers/GDI/Fl_Font.H" +#elif USE_X11 +#include "drivers/Xlib/Fl_Font.H" +#endif #include <FL/fl_utf8.h> #if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Graphics_Driver - platform opengl @@ -92,7 +98,7 @@ void gl_font(int fontid, int size) { * then sorting through them at draw time (for normal X rendering) to find which one can * render the current glyph... But for now, just use the first font in the list for GL... */ - XFontStruct *font = fl_X_core_font(); + XFontStruct *font = fl_xfont.value(); int base = font->min_char_or_byte2; int count = font->max_char_or_byte2-base+1; fl_fontsize->listbase = glGenLists(256); diff --git a/src/makedepend b/src/makedepend index d11b6f7c5..269727555 100644 --- a/src/makedepend +++ b/src/makedepend @@ -944,7 +944,7 @@ fl_font.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H fl_font.o: ../FL/Fl_Window.H ../FL/Enumerations.H ../FL/Fl_Window.H fl_font.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H fl_font.o: ../FL/Fl_Image.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H -fl_font.o: ../FL/Fl_Bitmap.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Font.H +fl_font.o: ../FL/Fl_Bitmap.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H drivers/GDI/Fl_Font.H drivers/Quartz/Fl_Font.H drivers/Xlib/Fl_Font.H fl_gleam.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_gleam.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H fl_gleam.o: ../FL/x.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H @@ -1036,7 +1036,7 @@ fl_set_font.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H fl_set_font.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Graphics_Driver.H fl_set_font.o: ../FL/Fl_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Pixmap.H fl_set_font.o: ../FL/Fl_RGB_Image.H flstring.h ../FL/Fl_Export.H ../config.h -fl_set_font.o: Fl_Font.H +fl_set_font.o: drivers/GDI/Fl_Font.H drivers/Quartz/Fl_Font.H drivers/Xlib/Fl_Font.H fl_scroll_area.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H fl_scroll_area.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h fl_scroll_area.o: ../FL/x.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H @@ -1124,7 +1124,7 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Input_.H -drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H ../src/Fl_Font.H +drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_PostScript.H drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Paged_Device.H drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Widget_Surface.H @@ -1468,7 +1468,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_draw.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Window.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Group.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Bitmap.H Fl_Font.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Font.H forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/fl_utf8.h forms_compatability.o: ../FL/Fl_Export.H ../FL/fl_types.h forms_compatability.o: ../FL/Enumerations.H ../FL/abi-version.h @@ -1658,7 +1658,7 @@ gl_draw.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Window.H gl_draw.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H gl_draw.o: ../FL/Fl_Image.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H gl_draw.o: ../FL/Fl_Bitmap.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H -gl_draw.o: Fl_Gl_Choice.H Fl_Font.H ../FL/fl_utf8.h Xutf8.h +gl_draw.o: Fl_Gl_Choice.H drivers/GDI/Fl_Font.H drivers/Quartz/Fl_Font.H drivers/Xlib/Fl_Font.H ../FL/fl_utf8.h Xutf8.h gl_start.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H gl_start.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h gl_start.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H |