X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.hh;h=2ffa39a51b2ecd40b483cb68f7d6b935aeb8ce60;hb=805a5dddce6d072c3a3e2485585ee5630688a845;hp=8ff1f67dfd528e11d06d57bfab9fcb250da13938;hpb=c6f228f3ff9ab7087669366a23d2ae61d8e5b9b9;p=chaz%2Fopenbox

diff --git a/otk/font.hh b/otk/font.hh
index 8ff1f67d..2ffa39a5 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; }
 
@@ -61,17 +58,17 @@ public:
   unsigned int maxCharWidth() const;
 
   unsigned int measureString(const std::string &string,
-                             bool utf8 = false) const;
+                             bool utf8 = true) const;
 
   //! Draws a string into an XftDraw object
   /*!
     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,
-                  const std::string &string, bool utf8 = false) const;
+  void drawString(XftDraw *d, int x, int y, const Color &color,
+                  const std::string &string, bool utf8 = true) const;
 };
 
 }
 
-#endif // __Font_hh
+#endif // __font_hh