gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove USE_OksiD_style_GL_font_selection preprocessor variable because it is equivalent to !USE_XFT

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12164 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-01-19 09:38:12 +00:00
parent ebae29222d
commit 898d2580d3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gl_draw.cxx
View File

@ -46,7 +46,6 @@
#if USE_XFT
# define GENLISTSIZE 256
#else
# define USE_OksiD_style_GL_font_selection 1 // Most X11 hosts except XFT
# define GENLISTSIZE 0x10000
#endif // USE_XFT
@ -252,7 +251,7 @@ void gl_color(Fl_Color i) {
void Fl_X11_Gl_Window_Driver::gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) {
if (!fl_fontsize->listbase) {
#ifdef USE_OksiD_style_GL_font_selection
#if !USE_XFT
fl_fontsize->listbase = glGenLists(GENLISTSIZE);
#else // Fltk-1.1.8 style GL font selection
// FIXME: warning Ideally, for XFT, we really need a glXUseXftFont implementation here...
@ -266,7 +265,7 @@ void Fl_X11_Gl_Window_Driver::gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) {
int count = font->max_char_or_byte2-base+1;
fl_fontsize->listbase = glGenLists(GENLISTSIZE);
glXUseXFont(font->fid, base, count, fl_fontsize->listbase+base);
#endif // USE_OksiD_style_GL_font_selection
#endif // !USE_XFT
}
glListBase(fl_fontsize->listbase);
}