Author: manolo
Date: 2011-02-15 01:29:43 -0800 (Tue, 15 Feb 2011)
New Revision: 8423
Log:
Fix STR #2565: initilization of the size field of Fl_Font_Descriptor's had been
removed
by mistake when removing global variables.
Modified:
branches/branch-1.3/src/Fl_Font.H
branches/branch-1.3/src/fl_font_xft.cxx
Modified: branches/branch-1.3/src/Fl_Font.H
===================================================================
--- branches/branch-1.3/src/Fl_Font.H 2011-02-14 18:11:15 UTC (rev 8422)
+++ branches/branch-1.3/src/Fl_Font.H 2011-02-15 09:29:43 UTC (rev 8423)
@@ -74,7 +74,7 @@
XftFont* font;
//const char* encoding;
int angle;
- FL_EXPORT Fl_Font_Descriptor(const char* xfontname, int angle);
+ FL_EXPORT Fl_Font_Descriptor(const char* xfontname, Fl_Fontsize size, int
angle);
# else
XUtf8FontStruct* font; // X UTF-8 font information
FL_EXPORT Fl_Font_Descriptor(const char* xfontname);
Modified: branches/branch-1.3/src/fl_font_xft.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_xft.cxx 2011-02-14 18:11:15 UTC (rev
8422)
+++ branches/branch-1.3/src/fl_font_xft.cxx 2011-02-15 09:29:43 UTC (rev
8423)
@@ -131,7 +131,7 @@
break;
}
if (!f) {
- f = new Fl_Font_Descriptor(font->name, angle);
+ f = new Fl_Font_Descriptor(font->name, size, angle);
f->next = font->first;
font->first = f;
}
@@ -335,8 +335,9 @@
}
} // end of fontopen
-Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, int fangle) {
+Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize fsize,
int fangle) {
// encoding = fl_encoding_;
+ size = fsize;
angle = fangle;
#if HAVE_GL
listbase = 0;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
