remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C
index 0b373d05414b8263bb00abe4b87c6849ad00e543..4412065a12781ce5be6a0d94a38c00b6f0f3c535 100644 (file)
--- a/src/frontends/xforms/xfont_metrics.C
+++ b/src/frontends/xforms/xfont_metrics.C
@@ -11,12 +11,8 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation "frontends/font_metrics.h"
-#pragma implementation "frontends/xfont_metrics.h"
-#endif
-
 #include "support/lstrings.h"
+#include "frontends/lyx_gui.h"
 #include "xfont_metrics.h"
 #include "xfont_loader.h"
 #include "lyxrc.h"
@@ -113,7 +109,7 @@ int rbearing(char c, LyXFont const & f)
 
 int width(char const * s, size_t n, LyXFont const & f)
 {
-       if (!lyxrc.use_gui)
+       if (!lyx_gui::use_gui)
                return n;
 
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
@@ -198,7 +194,7 @@ namespace xfont_metrics {
 
 int width(XChar2b const * s, int n, LyXFont const & f)
 {
-       if (!lyxrc.use_gui)
+       if (!lyx_gui::use_gui)
                return n;
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {