labels are not the size of buttons

[chaz/openbox] / otk / font.cc

diff --git a/otk/font.cc b/otk/font.cc
index 424c13fbf69eead412931234c927d4bb2f2989b4..519e938651defffcc52f6654e579cb5eff86b539 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -2,10 +2,6 @@
 
 #include "config.h"
 
-#include <cstdlib>
-#include <iostream>
-#include <algorithm>
-
 #include "font.hh"
 #include "surface.hh"
 #include "util.hh"
@@ -13,17 +9,17 @@
 #include "screeninfo.hh"
 
 extern "C" {
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
 #include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <algorithm>
+
 namespace otk {
 
-std::string Font::_fallback_font = "fixed";
 bool        Font::_xft_init      = false;
 
 Font::Font(int screen_num, const std::string &fontstring,
@@ -55,13 +51,13 @@ Font::Font(int screen_num, const std::string &fontstring,
     return;
 
   printf(_("Unable to load font: %s\n"), _fontstring.c_str());
-  printf(_("Trying fallback font: %s\n"), _fallback_font.c_str());
+  printf(_("Trying fallback font: %s\n"), "fixed");
 
   if ((_xftfont = XftFontOpenName(**display, _screen_num,
-                                  _fallback_font.c_str())))
+                                  "fixed")))
     return;
 
-  printf(_("Unable to load font: %s\n"), _fallback_font.c_str());
+  printf(_("Unable to load font: %s\n"), "fixed");
   printf(_("Aborting!.\n"));
 
   ::exit(3); // can't continue without a font