From b812f9701f92fe1676504c8f36a75b68c4453903 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 23 Apr 2008 19:32:47 +0000 Subject: A few more chnaged to get Fl_Font as a new type going git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6114 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Enumerations.H | 4 ++-- src/Fl_Font.H | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 2744e10c0..9c43bfc36 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -287,8 +287,8 @@ enum Fl_Align { // align() values FL_ALIGN_NOWRAP = 0 // for back compatability }; -typedef unsigned int Fl_Font; -typedef unsigned int Fl_Font_Size; +typedef int Fl_Font; +typedef int Fl_Font_Size; // standard fonts const Fl_Font FL_HELVETICA = 0; diff --git a/src/Fl_Font.H b/src/Fl_Font.H index 8ba70c905..3aa854780 100644 --- a/src/Fl_Font.H +++ b/src/Fl_Font.H @@ -70,14 +70,14 @@ public: # elif USE_XFT XftFont* font; const char* encoding; - int size; + Fl_Font_Size size; FL_EXPORT Fl_FontSize(const char* xfontname); # else XFontStruct* font; // X font information FL_EXPORT Fl_FontSize(const char* xfontname); # endif - int minsize; // smallest point size that should use this - int maxsize; // largest point size that should use this + Fl_Font_Size minsize; // smallest point size that should use this + Fl_Font_Size maxsize; // largest point size that should use this # if HAVE_GL unsigned int listbase;// base of display list, 0 = none # endif -- cgit v1.2.3