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
This commit is contained in:
parent
6a4c701e8f
commit
bf9a09d387
1
CHANGES
1
CHANGES
@ -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.
|
||||
|
@ -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 $"
|
||||
//
|
||||
|
Loading…
Reference in New Issue
Block a user