X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.cc;h=4c3a347670b321cb6d4415e06a52d9e4bdd14b03;hb=5072931be0ff28cd9447926d50fe5ea202e2c370;hp=21b9bfb060d505d9cf2e9e66958c01bd197a286a;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/font.cc b/otk/font.cc
index 21b9bfb0..4c3a3476 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -24,7 +24,7 @@ extern "C" {
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
@@ -82,7 +82,7 @@ Font::~Font(void)
 }
 
 
-unsigned int Font::measureString(const ustring &string) const
+int Font::measureString(const ustring &string) const
 {
   XGlyphInfo info;
 
@@ -93,19 +93,19 @@ unsigned int Font::measureString(const ustring &string) const
     XftTextExtents8(**display, _xftfont,
                     (FcChar8*)string.c_str(), string.bytes(), &info);
 
-  return info.xOff + (_shadow ? _offset : 0);
+  return (signed) info.xOff + (_shadow ? _offset : 0);
 }
 
 
-unsigned int Font::height(void) const
+int Font::height(void) const
 {
-  return _xftfont->height + (_shadow ? _offset : 0);
+  return (signed) _xftfont->height + (_shadow ? _offset : 0);
 }
 
 
-unsigned int Font::maxCharWidth(void) const
+int Font::maxCharWidth(void) const
 {
-  return _xftfont->max_advance_width;
+  return (signed) _xftfont->max_advance_width;
 }
 
 }