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_Widget.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Fl_Widget.cxx') diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index 9f33b2cf3..9b4c6415c 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -76,7 +76,7 @@ int Fl_Widget::handle(int) { return 0; } -int FL_NORMAL_SIZE = 14; +Fl_Font_Size FL_NORMAL_SIZE = 14; Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) { @@ -87,7 +87,7 @@ Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) { label_.deimage = 0; label_.type = FL_NORMAL_LABEL; label_.font = FL_HELVETICA; - label_.size = (uchar)FL_NORMAL_SIZE; + label_.size = FL_NORMAL_SIZE; label_.color = FL_FOREGROUND_COLOR; tooltip_ = 0; callback_ = default_callback; -- cgit v1.2.3