X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=68c035a64d0c4b2d34c6b207b67641d8dadb6e4f;hb=c3b6098d0ca039fed7dc714a64c369e6f6d07e5a;hp=3178a4c2717ed2f64d6d4e2c72bb413b84056a60;hpb=80aac2618536baaa99b92629be6931363c49c4de;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 3178a4c2..68c035a6 100644
--- a/source/font.h
+++ b/source/font.h
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/datafile/collection.h>
-#include <msp/strings/codec.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -49,10 +49,8 @@ public:
 	float get_default_size() const { return default_size; }
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
-	float get_string_width(const std::string &) const;
 	float get_string_width(const std::string &, Codecs::Decoder &) const;
 	void  draw_glyph(unsigned);
-	void  draw_string(const std::string &) const;
 	void  draw_string(const std::string &, Codecs::Decoder &) const;
 	void  draw_multiline(const std::string &) const;
 
@@ -63,12 +61,19 @@ public:
 		return get_string_width(str, dec);
 	}
 
+	float get_string_width(const std::string &str) const
+	{ return get_string_width<Codecs::Utf8>(str); }
+
 	template<class C>
 	void draw_string(const std::string &str) const
 	{
 		typename C::Decoder dec;
 		draw_string(str, dec);
 	}
+
+	void draw_string(const std::string &str) const
+	{ draw_string<Codecs::Utf8>(str); }
+
 private:
 	struct Glyph
 	{