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

diff --git a/otk/font.hh b/otk/font.hh
index afc36dea..618d4f6e 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 {
 
@@ -57,10 +57,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.