X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e5307c51280792394948716d5e3ecef7d87c295..76fe69e113637a200aafdc2d6dede772706e4b09:/lib/gdi/font.h

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index 0f3bf714..6cc238d7 100644
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -17,6 +17,8 @@
 #include <string>
 #include <lib/base/object.h> 
 
+#include <set>
+
 class FontRenderClass;
 class Font;
 class gDC;
@@ -46,6 +48,9 @@ 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;
+#else
+	fontRenderClass();
+	~fontRenderClass();
 #endif
 public:
 	float getLineHeight(const gFont& font);
@@ -54,9 +59,9 @@ public:
 	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();
+#endif
 };
 
 #ifndef SWIG
@@ -95,6 +100,7 @@ private:
 	int use_kerning;
 	int previous;
 	static std::string replacement_facename;
+	static std::set<int> forced_replaces;
 
 	eRect area;
 	ePoint cursor;
@@ -117,9 +123,10 @@ public:
 	virtual ~eTextPara();
 	
 	static void setReplacementFont(std::string font) { replacement_facename=font; }
+	static void forceReplacementGlyph(int unicode) { forced_replaces.insert(unicode); }
 
 	void setFont(const gFont *font);
-	int renderString(const std::string &string, int flags=0);
+	int renderString(const char *string, int flags=0);
 
 	void clear();