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 --- FL/Fl_Input_.H | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'FL/Fl_Input_.H') diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index 985d74f99..79038b277 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -61,8 +61,8 @@ class FL_EXPORT Fl_Input_ : public Fl_Widget { int shortcut_; uchar erase_cursor_only; - uchar textfont_; - uchar textsize_; + Fl_Font textfont_; + Fl_Font_Size textsize_; unsigned textcolor_; unsigned cursor_color_; @@ -123,10 +123,10 @@ public: int shortcut() const {return shortcut_;} void shortcut(int s) {shortcut_ = s;} - Fl_Font textfont() const {return (Fl_Font)textfont_;} - void textfont(uchar s) {textfont_ = s;} - uchar textsize() const {return textsize_;} - void textsize(uchar s) {textsize_ = s;} + Fl_Font textfont() const {return textfont_;} + void textfont(Fl_Font s) {textfont_ = s;} + Fl_Font_Size textsize() const {return textsize_;} + void textsize(Fl_Font_Size s) {textsize_ = s;} Fl_Color textcolor() const {return (Fl_Color)textcolor_;} void textcolor(unsigned n) {textcolor_ = n;} Fl_Color cursor_color() const {return (Fl_Color)cursor_color_;} -- cgit v1.2.3