diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/fl_font_xft.cxx | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.2 + - FLTK should now compile with Xft 2.0. - Some versions of Tru64 4.0 have snprintf and vnsprintf, but don't have the prototypes for those functions. diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index 1fa30cff5..74aaa7c4c 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_xft.cxx,v 1.4.2.7 2002/06/08 13:07:19 easysw Exp $" +// "$Id: fl_font_xft.cxx,v 1.4.2.8 2002/11/09 22:59:06 easysw Exp $" // // Xft font code for the Fast Light Tool Kit (FLTK). // @@ -110,7 +110,9 @@ void fl_font(int fnum, int size) { font->first = f; } fl_fontsize = f; +#if XFT_MAJOR < 2 fl_xfont = f->font->u.core.font; +#endif // XFT_MAJOR < 2 } static XftFont* fontopen(const char* name, bool core) { @@ -226,5 +228,5 @@ void fl_draw(const char *str, int n, int x, int y) { } // -// End of "$Id: fl_font_xft.cxx,v 1.4.2.7 2002/06/08 13:07:19 easysw Exp $" +// End of "$Id: fl_font_xft.cxx,v 1.4.2.8 2002/11/09 22:59:06 easysw Exp $" // |