minimal effort implementation of:

[lyx.git] / src / metricsinfo.C

diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index b0bb7c7864073765eb8c29a710d49fd1f279d6d3..bb14576342a68163af4a899f3c9e440fb3994421 100644 (file)
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -20,6 +20,9 @@
 
 #include <boost/assert.hpp>
 
+using lyx::char_type;
+using lyx::docstring;
+
 using std::string;
 
 
@@ -46,19 +49,25 @@ MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
 
 
 
-PainterInfo::PainterInfo(BufferView * bv, Painter & painter)
-       : pain(painter), ltr_pos(false)
+PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
+       : pain(painter), ltr_pos(false), erased_(false)
 {
        base.bv = bv;
 }
 
 
-void PainterInfo::draw(int x, int y, char c)
+void PainterInfo::draw(int x, int y, char_type c)
 {
        pain.text(x, y, c, base.font);
 }
 
 
+void PainterInfo::draw(int x, int y, docstring const & str)
+{
+       pain.text(x, y, str, base.font);
+}
+
+
 Styles smallerScriptStyle(Styles st)
 {
        switch (st) {
@@ -122,10 +131,10 @@ StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
        :       Changer<MetricsBase>(mb)
 {
        static const int diff[4][4] =
-         { { 0, 0, -3, -5 },
-                                        { 0, 0, -3, -5 },
-                                        { 3, 3,  0, -2 },
-                                        { 5, 5,  2,  0 } };
+               { { 0, 0, -3, -5 },
+                 { 0, 0, -3, -5 },
+                 { 3, 3,  0, -2 },
+                 { 5, 5,  2,  0 } };
        save_ = mb;
        int t = diff[mb.style][style];
        if (t > 0)