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, 26 insertions, 23 deletions

diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 647a89bdf..2744e10c0 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -287,30 +287,33 @@ enum Fl_Align {	// align() values
   FL_ALIGN_NOWRAP		= 0 // for back compatability
 };
 
-enum Fl_Font {	// standard fonts
-  FL_HELVETICA		= 0,
-  FL_HELVETICA_BOLD,
-  FL_HELVETICA_ITALIC,
-  FL_HELVETICA_BOLD_ITALIC,
-  FL_COURIER,
-  FL_COURIER_BOLD,
-  FL_COURIER_ITALIC,
-  FL_COURIER_BOLD_ITALIC,
-  FL_TIMES,
-  FL_TIMES_BOLD,
-  FL_TIMES_ITALIC,
-  FL_TIMES_BOLD_ITALIC,
-  FL_SYMBOL,
-  FL_SCREEN,
-  FL_SCREEN_BOLD,
-  FL_ZAPF_DINGBATS,
-
-  FL_FREE_FONT		= 16,	// first one to allocate
-  FL_BOLD		= 1,	// add this to helvetica, courier, or times
-  FL_ITALIC		= 2	// add this to helvetica, courier, or times
-};
+typedef unsigned int Fl_Font;
+typedef unsigned int Fl_Font_Size;
+
+// standard fonts
+const Fl_Font FL_HELVETICA              = 0;
+const Fl_Font FL_HELVETICA_BOLD         = 1;
+const Fl_Font FL_HELVETICA_ITALIC       = 2;
+const Fl_Font FL_HELVETICA_BOLD_ITALIC  = 3;
+const Fl_Font FL_COURIER                = 4;
+const Fl_Font FL_COURIER_BOLD           = 5;
+const Fl_Font FL_COURIER_ITALIC         = 6;
+const Fl_Font FL_COURIER_BOLD_ITALIC    = 7;
+const Fl_Font FL_TIMES                  = 8;
+const Fl_Font FL_TIMES_BOLD             = 9;
+const Fl_Font FL_TIMES_ITALIC           = 10;
+const Fl_Font FL_TIMES_BOLD_ITALIC      = 11;
+const Fl_Font FL_SYMBOL                 = 12;
+const Fl_Font FL_SCREEN                 = 13;
+const Fl_Font FL_SCREEN_BOLD            = 14;
+const Fl_Font FL_ZAPF_DINGBATS          = 15;
+
+const Fl_Font FL_FREE_FONT              = 16; // first one to allocate
+const Fl_Font FL_BOLD                   = 1;  // add this to helvetica, courier, or times
+const Fl_Font FL_ITALIC                 = 2;  // add this to helvetica, courier, or times
+
+extern FL_EXPORT Fl_Font_Size FL_NORMAL_SIZE;
 
-extern FL_EXPORT int FL_NORMAL_SIZE;
 
 enum Fl_Color {	// standard colors
   // These are used as default colors in widgets and altered as necessary