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, 6 insertions, 5 deletions

diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H
index d337d0d67..5246bb6ae 100644
--- a/FL/Fl_Chart.H
+++ b/FL/Fl_Chart.H
@@ -59,7 +59,8 @@ class FL_EXPORT Fl_Chart : public Fl_Widget {
     FL_CHART_ENTRY *entries;
     double min,max;
     uchar autosize_;
-    uchar textfont_,textsize_;
+    Fl_Font textfont_;
+    Fl_Font_Size textsize_;
     unsigned textcolor_;
 protected:
     void draw();
@@ -76,10 +77,10 @@ public:
     void size(int W, int H) { Fl_Widget::size(W, H); }
     int maxsize() const {return maxnumb;}
     void maxsize(int);
-    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;}
     uchar autosize() const {return autosize_;}