X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.hh;h=53e48c4ebad194546cdd99e1716f98b7f4966a36;hb=9a3459e983a11d74ec9f5dc415ce0af551c4b74e;hp=afc36deafa06f4599e19e049cc7c745ee41f3d17;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/font.hh b/otk/font.hh
index afc36dea..53e48c4e 100644
--- a/otk/font.hh
+++ b/otk/font.hh
@@ -11,7 +11,7 @@ extern "C" {
 #include <X11/Xft/Xft.h>
 }
 
-#include <assert.h>
+#include <cassert>
 
 namespace otk {
 
@@ -23,20 +23,8 @@ class Font {
    * static members
    */
 private:
-  static std::string  _fallback_font;
-  static bool         _xft_init;
+  static bool       _xft_init;
 
-public:
-  // the fallback is only used for X fonts, not for Xft fonts, since it is
-  // assumed that X fonts will be the fallback from Xft.
-  inline static std::string fallbackFont(void) { return _fallback_font; }
-  inline static void setFallbackFont(const std::string &f)
-    { _fallback_font = f; }
-
-  /*
-   * instance members
-   */
-private:
   int               _screen_num;
 
   std::string       _fontstring;
@@ -57,10 +45,10 @@ public:
 
   inline const std::string &fontstring() const { return _fontstring; }
 
-  unsigned int height() const;
-  unsigned int maxCharWidth() const;
+  int height() const;
+  int maxCharWidth() const;
 
-  unsigned int measureString(const ustring &string) const;
+  int measureString(const ustring &string) const;
 
   // The RenderControl classes use the internal data to render the fonts, but
   // noone else needs it, so its private.