diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-09 22:59:06 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-09 22:59:06 +0000 |
| commit | bf9a09d387da05741be44239ade4c1ca0b3dade4 (patch) | |
| tree | 6fd4c3bd0365daacb383a6bb7ceef866ebf47a24 | |
| parent | 6a4c701e8f9f1f5f70983921c251da1119da37ec (diff) | |
Patch from Steve Davies for Xft 2.x.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2833 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -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 $" // |