Mercurial > fife-parpg

diff engine/core/gui/base/gui_font.h @ 228:756b895e1dab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged unicode-support back into trunk. Now all GUI/visible strings should be unicode. Internal strings unchanged. Remember to use a font that actually has the desired codepoints. Current default unicode policiy is 'ignore'.
author phoku@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 21 Mar 2009 10:38:11 +0000
parents 90005975cdbb
children 7887f3854862
line wrap: on
line diff
--- a/engine/core/gui/base/gui_font.h	Fri Mar 20 15:17:28 2009 +0000
+++ b/engine/core/gui/base/gui_font.h	Sat Mar 21 10:38:11 2009 +0000
@@ -35,9 +35,8 @@
 
 
 namespace FIFE {
-	class gcn::Graphics;
 
-	class GuiFont : public gcn::Font, public AbstractFont {
+	class GuiFont : public gcn::Font {
 	public:
 		/** Constructor
 		 *  Takes the ownership of given font
@@ -45,7 +44,7 @@
 		GuiFont(AbstractFont* font);
 		virtual ~GuiFont();
 		
-		int getStringIndexAt(const std::string& text, int x);
+		int getStringIndexAt(const std::string& text, int x) const;
 		void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
 		void drawMultiLineString(gcn::Graphics* graphics, const std::string& text, int x, int y);
 		std::string splitTextToWidth (const std::string& text, int render_width);