Yet more dialog tweaking from Rob.

[lyx.git] / src / frontends / xforms / xfont_loader.C

diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C
index 5008192fe3a5c6dc750db2cc6fcbf604225e92e6..32b5bd09090bcbe748b9ae27fd188d444f02f824 100644 (file)
--- a/src/frontends/xforms/xfont_loader.C
+++ b/src/frontends/xforms/xfont_loader.C
@@ -1,12 +1,12 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file xfont_loader.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Asger Alstrup
  *
- *         Copyright 1997 Asger Alstrup
- *           and the LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 #include <cmath>       // fabs()
@@ -27,9 +27,6 @@
 
 using std::endl;
 
-extern BufferView * current_view;
-
-
 // The global fontloader
 xfont_loader fontloader;
 
@@ -147,6 +144,11 @@ void xfont_loader::getFontinfo(LyXFont::FONT_FAMILY family,
                                new FontInfo("-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*");
                        return;
 
+               case LyXFont::WASY_FAMILY:
+                       fontinfo[family][series][shape] =
+                               new FontInfo("-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*");
+                       return;
+
                default:
                        break;
        }
@@ -293,15 +295,14 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
 
        XFontStruct * fs = 0;
 
-       current_view->owner()->messagePush(_("Loading font into X-Server..."));
-
        fs = XLoadQueryFont(fl_get_display(), 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;
+                       lyxerr << "Could not get font '" << font 
+                               << "'. Using 'fixed'." << endl;
                        fs = XLoadQueryFont(fl_get_display(), "fixed");
                }
        } else if (lyxerr.debugging(Debug::FONT)) {
@@ -320,8 +321,6 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
                       << "' matched by\n" << font << endl;
        }
 
-       current_view->owner()->messagePop();
-
        fontstruct[family][series][shape][size] = fs;
        return fs;
 }