Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 23:42:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

First attempt at consistently using Fl_Font as a type for the font index and Fl_Font_Size as a type to measure font height (or rather size).

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-04-23 19:09:28 +00:00
parent 88c0d727aa
commit 7c8f5cc888
46 changed files with 203 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Widget.H
+6 -6
View File
@@ -45,8 +45,8 @@ struct FL_EXPORT Fl_Label {
Fl_Image* image;
Fl_Image* deimage;
uchar type;
uchar font;
uchar size;
Fl_Font font;
Fl_Font_Size size;
unsigned color;
void draw(int,int,int,int, Fl_Align) const ;
void measure(int&, int&) const ;
@@ -136,10 +136,10 @@ public:
void labeltype(Fl_Labeltype a) {label_.type = a;}
Fl_Color labelcolor() const {return (Fl_Color)label_.color;}
void labelcolor(unsigned a) {label_.color=a;}
Fl_Font labelfont() const {return (Fl_Font)label_.font;}
void labelfont(uchar a) {label_.font=a;}
uchar labelsize() const {return label_.size;}
void labelsize(uchar a) {label_.size=a;}
Fl_Font labelfont() const {return label_.font;}
void labelfont(Fl_Font a) {label_.font=a;}
Fl_Font_Size labelsize() const {return label_.size;}
void labelsize(Fl_Font_Size a) {label_.size=a;}
Fl_Image* image() {return label_.image;}
void image(Fl_Image* a) {label_.image=a;}
void image(Fl_Image& a) {label_.image=&a;}