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

1 files changed, 7 insertions, 5 deletions

diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H
index 866664be3..63db55564 100644
--- a/FL/Fl_Value_Output.H
+++ b/FL/Fl_Value_Output.H
@@ -33,7 +33,9 @@
 #endif
 
 class FL_EXPORT Fl_Value_Output : public Fl_Valuator {
-  uchar textfont_, textsize_, soft_;
+  Fl_Font textfont_;
+  Fl_Font_Size textsize_;
+  uchar soft_;
   unsigned textcolor_;
 public:
   int handle(int);
@@ -43,10 +45,10 @@ public:
   void soft(uchar s) {soft_ = s;}
   uchar soft() const {return soft_;}
 
-  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;}
 };