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_Item.H b/FL/Fl_Menu_Item.H
index 2d7bc0ad9..f0d78096c 100644
--- a/FL/Fl_Menu_Item.H
+++ b/FL/Fl_Menu_Item.H
@@ -58,8 +58,8 @@ struct FL_EXPORT Fl_Menu_Item {
   void *user_data_;
   int flags;
   uchar labeltype_;
-  uchar labelfont_;
-  uchar labelsize_;
+  Fl_Font labelfont_;
+  Fl_Font_Size labelsize_;
   unsigned labelcolor_;
 
   // advance N items, skipping submenus:
@@ -77,10 +77,10 @@ struct FL_EXPORT Fl_Menu_Item {
   void labeltype(Fl_Labeltype a) {labeltype_ = a;}
   Fl_Color labelcolor() const {return (Fl_Color)labelcolor_;}
   void labelcolor(unsigned a) {labelcolor_ = a;}
-  Fl_Font labelfont() const {return (Fl_Font)labelfont_;}
-  void labelfont(uchar a) {labelfont_ = a;}
-  uchar labelsize() const {return labelsize_;}
-  void labelsize(uchar a) {labelsize_ = a;}
+  Fl_Font labelfont() const {return labelfont_;}
+  void labelfont(Fl_Font a) {labelfont_ = a;}
+  Fl_Font_Size labelsize() const {return labelsize_;}
+  void labelsize(Fl_Font_Size a) {labelsize_ = a;}
   Fl_Callback_p callback() const {return callback_;}
   void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;}
   void callback(Fl_Callback* c) {callback_=c;}