diff options
| -rw-r--r-- | otk/font.cc | 7 | ||||
| -rw-r--r-- | otk/font.hh | 14 |
2 files changed, 4 insertions, 17 deletions
diff --git a/otk/font.cc b/otk/font.cc index 2d983d0c..519e9386 100644 --- a/otk/font.cc +++ b/otk/font.cc @@ -20,7 +20,6 @@ extern "C" { namespace otk { -std::string Font::_fallback_font = "fixed"; bool Font::_xft_init = false; Font::Font(int screen_num, const std::string &fontstring, @@ -52,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 diff --git a/otk/font.hh b/otk/font.hh index 618d4f6e..53e48c4e 100644 --- a/otk/font.hh +++ b/otk/font.hh @@ -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; |