fix compilation on F13 and binutils/gold by rewriting specialized X11 code

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index a711a2a416e14a303ba8a055dfb62b1887d19cbb..020b97ec1793be9035d224d02de1cf7e9218f3d9 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -153,10 +153,15 @@ public:
 class FontSetChanger : public Changer<MetricsBase> {
 public:
        ///
-       FontSetChanger(MetricsBase & mb, docstring const & font);
-       FontSetChanger(MetricsBase & mb, char const * const font);
+       FontSetChanger(MetricsBase & mb, docstring const & font,
+                       bool really_change_font = true);
+       FontSetChanger(MetricsBase & mb, char const * const font,
+                       bool really_change_font = true);
        ///
        ~FontSetChanger();
+private:
+       ///
+       bool change_;
 };
 
 
@@ -217,12 +222,16 @@ public:
 
 
 // temporarily change the used color
-class ColorChanger : public Changer<FontInfo, std::string> {
+class ColorChanger : public Changer<FontInfo, ColorCode> {
 public:
        ///
-       ColorChanger(FontInfo & font, std::string const & color);
+       ColorChanger(FontInfo & font, docstring const & color,
+                    bool really_change_color = true);
        ///
        ~ColorChanger();
+private:
+       ///
+       bool change_;
 };
 
 } // namespace lyx