diff options
| author | Manolo Gouy <Manolo> | 2011-02-07 13:49:34 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-02-07 13:49:34 +0000 |
| commit | cb902eebe3b419e77599fe669bc0cbeb3bce104a (patch) | |
| tree | 97724c741db795181108c27c7db583af7ebf6123 /src/Fl_Font.H | |
| parent | db3e5716372f6118f07c1b9dfed380258bb9e722 (diff) | |
Replaced global variable fl_fontsize by fl_graphics_driver->font_descriptor().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Font.H')
| -rw-r--r-- | src/Fl_Font.H | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Fl_Font.H b/src/Fl_Font.H index 1dd96579b..f3a568e29 100644 --- a/src/Fl_Font.H +++ b/src/Fl_Font.H @@ -51,6 +51,7 @@ class Fl_Font_Descriptor { public: /** linked list for this Fl_Fontdesc */ Fl_Font_Descriptor *next; + Fl_Fontsize size; /**< font size */ #ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. # ifdef WIN32 HFONT fid; @@ -69,19 +70,15 @@ public: ATSUStyle style; short ascent, descent, q_width; char *q_name; - int size; # elif USE_XFT XftFont* font; - const char* encoding; - Fl_Fontsize size; + //const char* encoding; int angle; - FL_EXPORT Fl_Font_Descriptor(const char* xfontname); + FL_EXPORT Fl_Font_Descriptor(const char* xfontname, int angle); # else XUtf8FontStruct* font; // X UTF-8 font information FL_EXPORT Fl_Font_Descriptor(const char* xfontname); # endif - Fl_Fontsize minsize; // smallest point size that should use this - Fl_Fontsize maxsize; // largest point size that should use this # if HAVE_GL unsigned int listbase;// base of display list, 0 = none #ifndef __APPLE_QUARTZ__ |