diff options
author | fluxgen <fluxgen> | 2004-09-11 23:01:34 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-09-11 23:01:34 (GMT) |
commit | 049e40c9eb6e6e8651b171a2a78465398c87f6a1 (patch) | |
tree | 7aef9d57e82336221d6d953617c7a5d53ee95db0 /src/FbTk/XmbFontImp.hh | |
parent | acd2176355876a7bb7afe9d026f9780a3d1c2737 (diff) | |
download | fluxbox_pavel-049e40c9eb6e6e8651b171a2a78465398c87f6a1.zip fluxbox_pavel-049e40c9eb6e6e8651b171a2a78465398c87f6a1.tar.bz2 |
Font::drawText takes reference to FbDrawable instead of X Drawable + some code cleaning
Diffstat (limited to 'src/FbTk/XmbFontImp.hh')
-rw-r--r-- | src/FbTk/XmbFontImp.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/XmbFontImp.hh b/src/FbTk/XmbFontImp.hh index 55383e9..36be627 100644 --- a/src/FbTk/XmbFontImp.hh +++ b/src/FbTk/XmbFontImp.hh | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: XmbFontImp.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $ | 22 | // $Id: XmbFontImp.hh,v 1.5 2004/09/11 22:58:20 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBTK_XMBFONTIMP_HH | 24 | #ifndef FBTK_XMBFONTIMP_HH |
25 | #define FBTK_XMBFONTIMP_HH | 25 | #define FBTK_XMBFONTIMP_HH |
@@ -36,7 +36,7 @@ public: | |||
36 | XmbFontImp(const char *fontname, bool utf8); | 36 | XmbFontImp(const char *fontname, bool utf8); |
37 | ~XmbFontImp(); | 37 | ~XmbFontImp(); |
38 | bool load(const std::string &name); | 38 | bool load(const std::string &name); |
39 | virtual void drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const; | 39 | virtual void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y) const; |
40 | unsigned int textWidth(const char * const text, unsigned int len) const; | 40 | unsigned int textWidth(const char * const text, unsigned int len) const; |
41 | unsigned int height() const; | 41 | unsigned int height() const; |
42 | int ascent() const { return m_setextents ? -m_setextents->max_ink_extent.y : 0; } | 42 | int ascent() const { return m_setextents ? -m_setextents->max_ink_extent.y : 0; } |