diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-11-10 23:37:28 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-11-10 23:37:28 +0000 |
| commit | 0e5307c51280792394948716d5e3ecef7d87c295 (patch) | |
| tree | 77b8945f594add538e4e4299f95a23016704d2a0 /lib/gdi | |
| parent | f86ab4565c7746aba49f0c606f8381bffb74f550 (diff) | |
| download | enigma2-0e5307c51280792394948716d5e3ecef7d87c295.tar.gz enigma2-0e5307c51280792394948716d5e3ecef7d87c295.zip | |
some small changes needed for build scroll support in eventview window
Diffstat (limited to 'lib/gdi')
| -rw-r--r-- | lib/gdi/font.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/gdi/font.h b/lib/gdi/font.h index a38454d1..0f3bf714 100644 --- a/lib/gdi/font.h +++ b/lib/gdi/font.h @@ -1,6 +1,8 @@ #ifndef __FONT_H #define __FONT_H +#ifndef SWIG + #include <ft2build.h> #include FT_FREETYPE_H #include FT_CACHE_H @@ -8,7 +10,6 @@ #include FT_CACHE_SMALL_BITMAPS_H #include <vector> - #include <lib/gdi/fb.h> #include <lib/gdi/esize.h> #include <lib/gdi/epoint.h> @@ -22,8 +23,10 @@ class gDC; class gFont; class gRGB; +#endif class fontRenderClass { +#ifndef SWIG friend class Font; friend class eTextPara; fbClass *fb; @@ -43,17 +46,21 @@ class fontRenderClass FTC_FaceID getFaceID(const std::string &face); FT_Error getGlyphBitmap(FTC_Image_Desc *font, FT_ULong glyph_index, FTC_SBit *sbit); static fontRenderClass *instance; +#endif public: float getLineHeight(const gFont& font); - std::string AddFont(const std::string &filename, const std::string &name, int scale); static fontRenderClass *getInstance(); - FT_Error FTC_Face_Requester(FTC_FaceID face_id, - FT_Face* aface); +#ifndef SWIG + std::string AddFont(const std::string &filename, const std::string &name, int scale); + FT_Error FTC_Face_Requester(FTC_FaceID face_id, FT_Face* aface); int getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth=-1); +#endif fontRenderClass(); ~fontRenderClass(); }; +#ifndef SWIG + #define RS_WRAP 1 #define RS_DOT 2 #define RS_DIRECT 4 @@ -178,4 +185,6 @@ public: extern fontRenderClass *font; +#endif // !SWIG + #endif |