diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-08-15 21:11:21 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-08-15 21:11:21 +0000 |
| commit | e63c50b2d163bf0d8e110b2f3711d1b74490c483 (patch) | |
| tree | a0c95aa22b79173d5a9ac1f6622c5952d5c23ffd /FL/Enumerations.H | |
| parent | 3d6201a610acd8f0a83b2e985370d455cff57735 (diff) | |
Rename type Fl_Font_Size into Fl_Fontsize to comply with other naming in FLTK.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6161 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Enumerations.H')
| -rw-r--r-- | FL/Enumerations.H | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 12bfd35a9..858a01628 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -517,8 +517,14 @@ const Fl_Align FL_ALIGN_RIGHT_BOTTOM = FL_ALIGN_BOTTOM_RIGHT; const Fl_Align FL_ALIGN_NOWRAP = (Fl_Align)0; // for back compatability /**@}*/ +/** Index into the font table. + */ typedef int Fl_Font; -typedef int Fl_Font_Size; + +/** Size of a font in pixels. + * This is the approximate height of a font in pixels. + */ +typedef int Fl_Fontsize; // standard fonts const Fl_Font FL_HELVETICA = 0; @@ -542,7 +548,7 @@ 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 Fl_Fontsize FL_NORMAL_SIZE; enum Fl_Color { // standard colors |