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_Menu_.H b/FL/Fl_Menu_.H
index f404816f4..eeba5b1f2 100644
--- a/FL/Fl_Menu_.H
+++ b/FL/Fl_Menu_.H
@@ -42,8 +42,8 @@ protected:
 
   uchar alloc;
   uchar down_box_;
-  uchar textfont_;
-  uchar textsize_;
+  Fl_Font textfont_;
+  Fl_Font_Size textsize_;
   unsigned textcolor_;
 
 public:
@@ -80,10 +80,10 @@ public:
   const char *text() const {return value_ ? value_->text : 0;}
   const char *text(int i) const {return menu_[i].text;}
 
-  Fl_Font textfont() const {return (Fl_Font)textfont_;}
-  void textfont(uchar c) {textfont_=c;}
-  uchar textsize() const {return textsize_;}
-  void textsize(uchar c) {textsize_=c;}
+  Fl_Font textfont() const {return textfont_;}
+  void textfont(Fl_Font c) {textfont_=c;}
+  Fl_Font_Size textsize() const {return textsize_;}
+  void textsize(Fl_Font_Size c) {textsize_=c;}
   Fl_Color textcolor() const {return (Fl_Color)textcolor_;}
   void textcolor(unsigned c) {textcolor_=c;}