cosmetic fix

[lyx.git] / src / metricsinfo.C

diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index 34b504fd3d00f18ce3d7458b14bba62c058e661f..1202520b80e97eb7b2e2c62739aa6f4397408962 100644 (file)
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -5,27 +5,39 @@
 #include "mathed/math_support.h"
 #include "frontends/Painter.h"
 #include "debug.h"
+#include "BufferView.h"
 
 
 
 MetricsBase::MetricsBase()
-       : font(), style(LM_ST_TEXT), fontname("mathnormal"),
-         restrictwidth(false), textwidth(0)
+       : bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"),
+         textwidth(0)
 {}
 
 
 
+MetricsBase::MetricsBase(BufferView * b, LyXFont const & f, int w)
+       : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
+         textwidth(w)
+{}
+
+
 
 MetricsInfo::MetricsInfo()
-       : fullredraw(false)
 {}
 
 
+MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
+       : base(bv, font, textwidth)
+{}
 
 
-PainterInfo::PainterInfo(Painter & p)
-       : pain(p)
-{}
+
+PainterInfo::PainterInfo(BufferView * bv)
+       : pain(bv->painter())
+{
+       base.bv = bv;
+}
 
 
 void PainterInfo::draw(int x, int y, char c)
@@ -42,11 +54,9 @@ Styles smallerScriptStyle(Styles st)
                        return LM_ST_SCRIPT;
                case LM_ST_SCRIPT:
                case LM_ST_SCRIPTSCRIPT:
+               default: // shut up compiler
                        return LM_ST_SCRIPTSCRIPT;
        }
-       // shut up compiler
-       lyxerr << "should not happen\n";
-       return LM_ST_DISPLAY;
 }
 
 ScriptChanger::ScriptChanger(MetricsBase & mb)
@@ -64,13 +74,12 @@ Styles smallerFracStyle(Styles st)
                        return LM_ST_SCRIPT;
                case LM_ST_SCRIPT:
                case LM_ST_SCRIPTSCRIPT:
+               default: // shut up compiler
                        return LM_ST_SCRIPTSCRIPT;
        }
-       // shut up compiler
-       lyxerr << "should not happen\n";
-       return LM_ST_DISPLAY;
 }
 
+
 FracChanger::FracChanger(MetricsBase & mb)
        : StyleChanger(mb, smallerFracStyle(mb.style))
 {}
@@ -140,7 +149,6 @@ WidthChanger::WidthChanger(MetricsBase & mb, int w)
        :       Changer<MetricsBase>(mb)
 {
        save_ = mb;
-       mb.restrictwidth = true;
        mb.textwidth     = w;
 }