Remove unused font variable which caused a warning.

[lyx.git] / src / FontLoader.C

diff --git a/src/FontLoader.C b/src/FontLoader.C
index fafb7110b96fd9801d0f8f95e2637301417bb5ae..5113988334a4b7a9db88832afc9e8f65732f990b 100644 (file)
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
@@ -16,14 +15,14 @@
 #pragma implementation "FontLoader.h"
 #endif
 
-#include "gettext.h"
 #include "FontLoader.h"
 #include "FontInfo.h"
+#include "gettext.h"
 #include "debug.h"
 #include "lyxrc.h"     // lyxrc.font_*
 #include "BufferView.h"
 #include "LyXView.h"
-#include "minibuffer.h"
+#include "frontends/GUIRunTime.h"
 
 using std::endl;
 
@@ -40,12 +39,14 @@ FontLoader::FontLoader()
        reset();
 }
 
+
 // Destroy font loader
 FontLoader::~FontLoader()
 {
        unload();
 }
 
+
 // Update fonts after zoom, dpi, font names, or norm change
 // For now, we just ditch all fonts we have. Later, we should
 // reuse the ones that are already loaded.
@@ -54,6 +55,7 @@ void FontLoader::update()
        unload();
 }
 
+
 // Reset font loader
 void FontLoader::reset()
 {
@@ -68,6 +70,7 @@ void FontLoader::reset()
                        }
 }
 
+
 // Unload all fonts
 void FontLoader::unload() 
 {
@@ -81,13 +84,14 @@ void FontLoader::unload()
                                }
                                for (int i4 = 0; i4 < 10; ++i4) {
                                        if (fontstruct[i1][i2][i3][i4]) {
-                                               XFreeFont(fl_get_display(), fontstruct[i1][i2][i3][i4]);
+                                               XFreeFont(GUIRunTime::x11Display(), fontstruct[i1][i2][i3][i4]);
                                                fontstruct[i1][i2][i3][i4] = 0;
                                        }
                                }
                        }
 }
 
+
 // Get font info
 /* Takes care of finding which font that can match the given request. Tries
 different alternatives. */
@@ -204,9 +208,13 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 }
 
 
-// A dummy fontstruct used when there is no gui. 
-static XFontStruct dummyXFontStruct;
-static bool dummyXFontStructisGood = false;
+// A dummy fontstruct used when there is no gui.
+namespace {
+
+XFontStruct dummyXFontStruct;
+bool dummyXFontStructisGood = false;
+
+} // namespace anon
 
 /// Do load font
 XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, 
@@ -242,16 +250,16 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
 
        XFontStruct * fs = 0;
 
-       current_view->owner()->getMiniBuffer()->Store();
-       current_view->owner()->getMiniBuffer()->Set(_("Loading font into X-Server..."));
-       fs = XLoadQueryFont(fl_get_display(), font.c_str());
+       current_view->owner()->messagePush(_("Loading font into X-Server..."));
+
+       fs = XLoadQueryFont(GUIRunTime::x11Display(), font.c_str());
        
        if (fs == 0) {
                if (font == "fixed") {
                        lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
                } else {
                        lyxerr << "Could not get font. Using 'fixed'." << endl;
-                       fs = XLoadQueryFont(fl_get_display(), "fixed");
+                       fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
                }
        } else if (lyxerr.debugging(Debug::FONT)) {
                // Tell user the font matching
@@ -264,13 +272,15 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
                f.setEmph(LyXFont::INHERIT);
                f.setUnderbar(LyXFont::INHERIT);
                f.setNoun(LyXFont::INHERIT);
+#ifndef NO_LATEX
                f.setLatex(LyXFont::INHERIT);
+#endif
                f.setColor(LColor::inherit);
                lyxerr << "Font '" << f.stateText(0) 
                       << "' matched by\n" << font << endl;
        }
 
-       current_view->owner()->getMiniBuffer()->Reset();
+       current_view->owner()->messagePop();
 
        fontstruct[family][series][shape][size] = fs;
        return fs;