diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-04-23 19:09:28 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-04-23 19:09:28 +0000 |
| commit | 7c8f5cc888725d061bcae9d0d5c53ff912639ac4 (patch) | |
| tree | 407d6027b29f1cf30a4a56bd72d2ddb79fd37709 /src/fl_font_xft.cxx | |
| parent | 88c0d727aa89b650611ce8c677d4ed26e2fc1f4a (diff) | |
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
Diffstat (limited to 'src/fl_font_xft.cxx')
| -rw-r--r-- | src/fl_font_xft.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index cf1116843..2ded22247 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -88,14 +88,14 @@ Fl_Fontdesc* fl_fonts = built_in_table; #define current_font (fl_fontsize->font) -int fl_font_ = 0; -int fl_size_ = 0; +Fl_Font fl_font_ = 0; +Fl_Font_Size fl_size_ = 0; XFontStruct* fl_xfont = 0; void *fl_xftfont = 0; const char* fl_encoding_ = "iso8859-1"; Fl_FontSize* fl_fontsize = 0; -void fl_font(int fnum, int size) { +void fl_font(Fl_Font fnum, Fl_Font_Size size) { if (fnum==-1) { // special case to stop font caching fl_font_ = 0; fl_size_ = 0; return; |
