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 /src/Fl_Font.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 'src/Fl_Font.H')
| -rw-r--r-- | src/Fl_Font.H | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_Font.H b/src/Fl_Font.H index 3aa854780..c6224e3c2 100644 --- a/src/Fl_Font.H +++ b/src/Fl_Font.H @@ -51,15 +51,15 @@ public: HFONT fid; int width[256]; TEXTMETRIC metr; - FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size); + FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size); # elif defined(__APPLE_QD__) - FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size); + FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size); short font, face, size; short ascent, descent; short width[256]; bool knowMetrics; # elif defined(__APPLE_QUARTZ__) - FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size); + FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size); ATSUTextLayout layout; ATSUStyle style; short ascent, descent, q_width; @@ -70,14 +70,14 @@ public: # elif USE_XFT XftFont* font; const char* encoding; - Fl_Font_Size size; + Fl_Fontsize size; FL_EXPORT Fl_FontSize(const char* xfontname); # else XFontStruct* font; // X font information FL_EXPORT Fl_FontSize(const char* xfontname); # endif - Fl_Font_Size minsize; // smallest point size that should use this - Fl_Font_Size maxsize; // largest point size that should use this + Fl_Fontsize minsize; // smallest point size that should use this + Fl_Fontsize maxsize; // largest point size that should use this # if HAVE_GL unsigned int listbase;// base of display list, 0 = none # endif |