mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the link error sometimes caused by class Fl_XFont_On_Demand not exported from libfltk.so but called

Browse Source 
by function gl_font() of file src/gl_draw.cxx (X11-specific).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10504 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-12-21 10:11:18 +00:00
parent 1a6790b219
commit 27b3376bf4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/x.H
View File

@ -132,6 +132,7 @@ private:
XFontStruct *ptr; XFontStruct *ptr;
}; };
extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
extern FL_EXPORT XFontStruct* fl_X_core_font();
// this object contains all X-specific stuff about a window: // this object contains all X-specific stuff about a window:
// Warning: this object is highly subject to change! // Warning: this object is highly subject to change!

6
src/fl_font.cxx
View File

@ -55,6 +55,12 @@
# include "fl_font_x.cxx" # include "fl_font_x.cxx"
#endif // WIN32 #endif // WIN32
#if ! (defined(WIN32) || defined(__APPLE__))
XFontStruct *fl_X_core_font()
{
return fl_xfont.value();
}
#endif
double fl_width(const char* c) { double fl_width(const char* c) {
if (c) return fl_width(c, (int) strlen(c)); if (c) return fl_width(c, (int) strlen(c));

2
src/gl_draw.cxx
View File

@ -81,7 +81,7 @@ void gl_font(int fontid, int size) {
* then sorting through them at draw time (for normal X rendering) to find which one can * 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... * render the current glyph... But for now, just use the first font in the list for GL...
*/ */
XFontStruct *font = fl_xfont; XFontStruct *font = fl_X_core_font();
int base = font->min_char_or_byte2; int base = font->min_char_or_byte2;
int count = font->max_char_or_byte2-base+1; int count = font->max_char_or_byte2-base+1;
fl_fontsize->listbase = glGenLists(256); fl_fontsize->listbase = glGenLists(256);