handle utf-8 strings properly.

use utf8 internally

1 files changed, 3 insertions, 3 deletions

diff --git a/src/FbTk/XFontImp.hh b/src/FbTk/XFontImp.hh
index 0312fb5..02f17ee 100644
--- a/src/FbTk/XFontImp.hh
+++ b/src/FbTk/XFontImp.hh
@@ -36,11 +36,11 @@ public:
     explicit XFontImp(const char *filename = 0);
     ~XFontImp();
     bool load(const std::string &filename);
-    unsigned int textWidth(const char * const text, unsigned int size) const;
+    unsigned int textWidth(const FbString &text, unsigned int size) const;
     unsigned int height() const;
     int ascent() const;
     int descent() const { return m_fontstruct ? m_fontstruct->descent : 0; }
-    void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y, FbTk::Orientation orient) const;
+    void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) const;
 
     bool validOrientation(FbTk::Orientation orient);
 
@@ -76,7 +76,7 @@ private:
     void rotate(FbTk::Orientation orient);
 
     void freeRotFont(XRotFontStruct * rotfont);
-    void drawRotText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y, FbTk::Orientation orient) const;
+    void drawRotText(Drawable w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) const;
 
     XRotFontStruct *m_rotfonts[4]; ///< rotated font structure (only 3 used)
     XFontStruct *m_fontstruct; ///< X font structure