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

diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index fa7f0d0c4..380e994e0 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -122,10 +122,10 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group {
     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;}
 
@@ -285,8 +285,8 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group {
 
     int shortcut_;
 
-    uchar textfont_;
-    uchar textsize_;
+    Fl_Font textfont_;
+    Fl_Font_Size textsize_;
     unsigned textcolor_;
 
 	 // The following are not presently used from the original NEdit code,