diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-01-11 19:17:13 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-01-11 19:17:13 +0000 |
| commit | 8f8acc24933830d4f5784616b9b0c5896bde0b93 (patch) | |
| tree | e34d995f6ef854e3ac2b365326ffabf3dad265da /otk/font.hh | |
| parent | 684405eec8553918b62e334bffe29eb4712ec95c (diff) | |
rm prefixes for all elements in the otk namepsace
Diffstat (limited to 'otk/font.hh')
| -rw-r--r-- | otk/font.hh | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/otk/font.hh b/otk/font.hh index 8ff1f67d..9091b9bc 100644 --- a/otk/font.hh +++ b/otk/font.hh @@ -1,6 +1,6 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- -#ifndef __Font_hh -#define __Font_hh +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +#ifndef __font_hh +#define __font_hh extern "C" { #include <X11/Xlib.h> @@ -13,12 +13,9 @@ extern "C" { namespace otk { -class BGCCache; -class BGCCacheItem; -class BColor; -class ScreenInfo; +class Color; -class BFont { +class Font { /* * static members */ @@ -51,9 +48,9 @@ private: public: // loads an Xft font - BFont(int screen_num, const std::string &fontstring, bool shadow, + Font(int screen_num, const std::string &fontstring, bool shadow, unsigned char offset, unsigned char tint); - virtual ~BFont(); + virtual ~Font(); inline const std::string &fontstring() const { return _fontstring; } @@ -68,10 +65,10 @@ public: Be Warned: If you use an XftDraw object and a color, or a font from different screens, you WILL have unpredictable results! :) */ - void drawString(XftDraw *d, int x, int y, const BColor &color, + void drawString(XftDraw *d, int x, int y, const Color &color, const std::string &string, bool utf8 = false) const; }; } -#endif // __Font_hh +#endif // __font_hh |