move things around

[lyx.git] / src / mathed / math_scriptinset.C

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index d4835efa97c41721685ba2f5e255f308603fa414..158c2b91c42e838f4ce635f3de9b2b38ab038668 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -4,20 +4,21 @@
 
 #include "math_scriptinset.h"
 #include "support/LOstream.h"
+#include "support.h"
 
 
 MathScriptInset::MathScriptInset()
-       : MathInset(2), up_(false), down_(false), limits_(0), symbol_(0)
+       : MathNestInset(2), up_(false), down_(false), limits_(0), symbol_(0)
 {}
 
 
 MathScriptInset::MathScriptInset(bool up, bool down, MathInset * symbol)
-       : MathInset(2), up_(up), down_(down), limits_(0), symbol_(symbol)
+       : MathNestInset(2), up_(up), down_(down), limits_(0), symbol_(symbol)
 {}
 
 
 MathScriptInset::MathScriptInset(MathScriptInset const & p)
-       : MathInset(p), up_(p.up_), down_(p.down_),
+       : MathNestInset(p), up_(p.up_), down_(p.down_),
                limits_(p.limits_), symbol_(p.symbol_ ? p.symbol_->clone() : 0)
 {}
 
@@ -211,7 +212,7 @@ void MathScriptInset::writeNormal(std::ostream & os) const
 }
 
 
-void MathScriptInset::metrics(MathStyles st)
+void MathScriptInset::metrics(MathStyles st) const
 {
        size_ = st;
        MathStyles tt = smallerStyleScript(st);
@@ -239,15 +240,15 @@ void MathScriptInset::metrics(MathStyles st)
                dx0_   = (width_ - xcell(0).width()) / 2;
                dx1_   = (width_ - xcell(1).width()) / 2;
        } else {
-               int asc;
-               int des;
+               int asc = 0;
+               int des = 0;
                int wid = 0;
                mathed_char_height(LM_TC_VAR, st, 'I', asc, des);
                if (symbol_) {
                        symbol_->metrics(st);
                        wid  = symbol_->width();
                        asc  = symbol_->ascent();
-                       des = symbol_->descent();
+                       des  = symbol_->descent();
                }
                ascent_  = up()   ? xcell(0).height() + asc : 0;
                descent_ = down() ? xcell(1).height() + des : 0;
@@ -261,7 +262,7 @@ void MathScriptInset::metrics(MathStyles st)
 }
 
 
-void MathScriptInset::draw(Painter & pain, int x, int y)
+void MathScriptInset::draw(Painter & pain, int x, int y) const
 {  
        xo(x);
        yo(y);