diff options
Diffstat (limited to 'src/FbTk/XFontImp.hh')
-rw-r--r-- | src/FbTk/XFontImp.hh | 6 |
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: | |||
36 | explicit XFontImp(const char *filename = 0); | 36 | explicit XFontImp(const char *filename = 0); |
37 | ~XFontImp(); | 37 | ~XFontImp(); |
38 | bool load(const std::string &filename); | 38 | bool load(const std::string &filename); |
39 | unsigned int textWidth(const char * const text, unsigned int size) const; | 39 | unsigned int textWidth(const FbString &text, unsigned int size) const; |
40 | unsigned int height() const; | 40 | unsigned int height() const; |
41 | int ascent() const; | 41 | int ascent() const; |
42 | int descent() const { return m_fontstruct ? m_fontstruct->descent : 0; } | 42 | int descent() const { return m_fontstruct ? m_fontstruct->descent : 0; } |
43 | void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y, FbTk::Orientation orient) const; | 43 | void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) const; |
44 | 44 | ||
45 | bool validOrientation(FbTk::Orientation orient); | 45 | bool validOrientation(FbTk::Orientation orient); |
46 | 46 | ||
@@ -76,7 +76,7 @@ private: | |||
76 | void rotate(FbTk::Orientation orient); | 76 | void rotate(FbTk::Orientation orient); |
77 | 77 | ||
78 | void freeRotFont(XRotFontStruct * rotfont); | 78 | void freeRotFont(XRotFontStruct * rotfont); |
79 | void drawRotText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y, FbTk::Orientation orient) const; | 79 | void drawRotText(Drawable w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) const; |
80 | 80 | ||
81 | XRotFontStruct *m_rotfonts[4]; ///< rotated font structure (only 3 used) | 81 | XRotFontStruct *m_rotfonts[4]; ///< rotated font structure (only 3 used) |
82 | XFontStruct *m_fontstruct; ///< X font structure | 82 | XFontStruct *m_fontstruct; ///< X font structure |