aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FontImp.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
committerfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
commit049e40c9eb6e6e8651b171a2a78465398c87f6a1 (patch)
tree7aef9d57e82336221d6d953617c7a5d53ee95db0 /src/FbTk/FontImp.hh
parentacd2176355876a7bb7afe9d026f9780a3d1c2737 (diff)
downloadfluxbox_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/FontImp.hh')
-rw-r--r--src/FbTk/FontImp.hh8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh
index 1e0f55f..cf28baf 100644
--- a/src/FbTk/FontImp.hh
+++ b/src/FbTk/FontImp.hh
@@ -1,5 +1,5 @@
1// FontImp.cc for FbTk 1// FontImp.cc for FbTk
2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net) 2// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -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: FontImp.hh,v 1.3 2003/04/20 13:52:29 fluxgen Exp $ 22// $Id: FontImp.hh,v 1.4 2004/09/11 22:58:20 fluxgen Exp $
23 23
24#ifndef FBTK_FONTIMP_HH 24#ifndef FBTK_FONTIMP_HH
25#define FBTK_FONTIMP_HH 25#define FBTK_FONTIMP_HH
@@ -32,6 +32,8 @@
32 32
33namespace FbTk { 33namespace FbTk {
34 34
35class FbDrawable;
36
35/** 37/**
36 FontImp, second part of the bridge pattern for fonts 38 FontImp, second part of the bridge pattern for fonts
37 pure interface class. 39 pure interface class.
@@ -41,7 +43,7 @@ class FontImp {
41public: 43public:
42 virtual ~FontImp() { } 44 virtual ~FontImp() { }
43 virtual bool load(const std::string &name) = 0; 45 virtual bool load(const std::string &name) = 0;
44 virtual void drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const = 0; 46 virtual void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y) const = 0;
45 virtual unsigned int textWidth(const char * const text, unsigned int size) const = 0; 47 virtual unsigned int textWidth(const char * const text, unsigned int size) const = 0;
46 virtual int ascent() const = 0; 48 virtual int ascent() const = 0;
47 virtual int descent() const = 0; 49 virtual int descent() const = 0;