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_Counter.H | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'FL/Fl_Counter.H') diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H index 23f63661e..2c0781094 100644 --- a/FL/Fl_Counter.H +++ b/FL/Fl_Counter.H @@ -40,7 +40,8 @@ class FL_EXPORT Fl_Counter : public Fl_Valuator { - uchar textfont_, textsize_; + Fl_Font textfont_; + Fl_Font_Size textsize_; unsigned textcolor_; double lstep_; uchar mouseobj; @@ -60,10 +61,10 @@ public: void lstep(double a) {lstep_ = a;} void step(double a,double b) {Fl_Valuator::step(a); lstep_ = b;} void step(double a) {Fl_Valuator::step(a);} - 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 s) {textcolor_ = s;} -- cgit v1.2.3