mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few more chnaged to get Fl_Font as a new type going 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6114 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2008-04-23 19:32:47 +00:00
parent 7c8f5cc888
commit b812f9701f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FL/Enumerations.H
View File

@ -287,8 +287,8 @@ enum Fl_Align { // align() values
FL_ALIGN_NOWRAP = 0 // for back compatability
};
typedef unsigned int Fl_Font;
typedef unsigned int Fl_Font_Size;
typedef int Fl_Font;
typedef int Fl_Font_Size;
// standard fonts
const Fl_Font FL_HELVETICA = 0;

6
src/Fl_Font.H
View File

@ -70,14 +70,14 @@ public:
# elif USE_XFT
XftFont* font;
const char* encoding;
int size;
Fl_Font_Size size;
FL_EXPORT Fl_FontSize(const char* xfontname);
# else
XFontStruct* font; // X font information
FL_EXPORT Fl_FontSize(const char* xfontname);
# endif
int minsize; // smallest point size that should use this
int maxsize; // largest point size that should use this
Fl_Font_Size minsize; // smallest point size that should use this
Fl_Font_Size maxsize; // largest point size that should use this
# if HAVE_GL
unsigned int listbase;// base of display list, 0 = none
# endif