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_Browser_.H b/FL/Fl_Browser_.H
index 663eca55e..2a31ef3be 100644
--- a/FL/Fl_Browser_.H
+++ b/FL/Fl_Browser_.H
@@ -53,7 +53,8 @@ class FL_EXPORT Fl_Browser_ : public Fl_Group {
   int offset_;		// how far down top_ item the real_position is
   int max_width;	// widest object seen so far
   uchar has_scrollbar_;	// which scrollbars are enabled
-  uchar textfont_, textsize_;
+  Fl_Font textfont_;
+  Fl_Font_Size textsize_;
   unsigned textcolor_;
   void* top_;		// which item scrolling position is in
   void* selection_;	// which is selected (except for FL_MULTI_BROWSER)
@@ -131,10 +132,10 @@ public:
     BOTH_ALWAYS = 7
   };
 
-  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;}