fix #1073

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 7fb67920b53180fe814549d56eeed54aed7af0a0..849874214ace2da22f670894a7f74978e10280bf 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_sizeinset.h"
 #include "math_parser.h"
@@ -11,9 +8,10 @@
 #include "math_support.h"
 #include "support/LOstream.h"
 
+using std::atoi;
 
 MathSizeInset::MathSizeInset(latexkeys const * l)
-       : MathNestInset(1), key_(l)
+       : MathNestInset(1), key_(l), style_(Styles(atoi(l->extra.c_str())))
 {}
 
 
@@ -23,21 +21,19 @@ MathInset * MathSizeInset::clone() const
 }
 
 
-void MathSizeInset::metrics(MathMetricsInfo & mi) const
+void MathSizeInset::metrics(MetricsInfo & mi) const
 {
-       //MathStyleChanger dummy(mi.base, MathStyles(key_->id));
-       xcell(0).metrics(mi);
-       ascent_   = xcell(0).ascent() + 1;
-       descent_  = xcell(0).descent() + 1;
-       width_    = xcell(0).width() + 2;
+       StyleChanger dummy(mi.base, style_);
+       dim_ = cell(0).metrics(mi);
+       metricsMarkers2();
 }
 
 
-void MathSizeInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathSizeInset::draw(PainterInfo & pi, int x, int y) const
 {
-       //MathStyleChanger dummy(pi.base, MathStyles(key_->id));
-       xcell(0).draw(pi, x + 1, y);
-       mathed_draw_framebox(pi, x, y, this);
+       StyleChanger dummy(pi.base, style_);
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 }
 
 
@@ -49,7 +45,7 @@ void MathSizeInset::write(WriteStream & os) const
 
 void MathSizeInset::normalize(NormalStream & os) const
 {
-       os << "[" << key_->name << ' ' << cell(0) << ']';
+       os << '[' << key_->name << ' ' << cell(0) << ']';
 }