diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-04-23 19:09:28 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-04-23 19:09:28 +0000 |
| commit | 7c8f5cc888725d061bcae9d0d5c53ff912639ac4 (patch) | |
| tree | 407d6027b29f1cf30a4a56bd72d2ddb79fd37709 /src/Fl_Menu.cxx | |
| parent | 88c0d727aa89b650611ce8c677d4ed26e2fc1f4a (diff) | |
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).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Menu.cxx')
| -rw-r--r-- | src/Fl_Menu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 18a847e12..eeda1bcc2 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -125,8 +125,8 @@ int Fl_Menu_Item::measure(int* hp, const Fl_Menu_* m) const { l.image = 0; l.deimage = 0; l.type = labeltype_; - l.font = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); - l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE; + l.font = labelsize_ || labelfont_ ? labelfont_ : (m ? m->textfont() : FL_HELVETICA); + l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE; l.color = FL_FOREGROUND_COLOR; // this makes no difference? fl_draw_shortcut = 1; int w = 0; int h = 0; @@ -143,8 +143,8 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m, l.image = 0; l.deimage = 0; l.type = labeltype_; - l.font = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); - l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE; + l.font = labelsize_ || labelfont_ ? labelfont_ : (m ? m->textfont() : FL_HELVETICA); + l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE; l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_FOREGROUND_COLOR); if (!active()) l.color = fl_inactive((Fl_Color)l.color); Fl_Color color = m ? m->color() : FL_GRAY; |