Fix STR #2565: initilization of the size field of Fl_Font_Descriptor'…

…s had been removed by mistake when removing global variables. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8423 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Feb 15, 2011 · f397c36 · f397c36
1 parent 884aba6
commit f397c36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Fl_Font.H b/src/Fl_Font.H
@@ -74,7 +74,7 @@ public:
   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);

diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
@@ -131,7 +131,7 @@ static void fl_font(Fl_Font fnum, Fl_Fontsize size, int angle) {
       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 @@ puts("Font Opened"); fflush(stdout);
   }
 } // 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;