From 7c8f5cc888725d061bcae9d0d5c53ff912639ac4 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 23 Apr 2008 19:09:28 +0000 Subject: 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 --- src/Fl_Choice.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Fl_Choice.cxx') diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index f9eabde20..469658a07 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -91,7 +91,7 @@ void Fl_Choice::draw() { l.image = 0; l.deimage = 0; l.type = m.labeltype_; - l.font = m.labelsize_ || m.labelfont_ ? m.labelfont_ : uchar(textfont()); + l.font = m.labelsize_ || m.labelfont_ ? m.labelfont_ : textfont(); l.size = m.labelsize_ ? m.labelsize_ : textsize(); l.color= m.labelcolor_ ? m.labelcolor_ : textcolor(); if (!m.active()) l.color = fl_inactive((Fl_Color)l.color); -- cgit v1.2.3