architectural changes to tex2lyx

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 4880f9b1b59a3e717533a27ea1c552816d875adc..51de586808b082a38d53710922a815757bef5acd 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_decorationinset.h"
 #include "math_support.h"
@@ -11,15 +8,17 @@
 #include "math_streamstr.h"
 #include "support/LOstream.h"
 
+using std::auto_ptr;
+
 
 MathDecorationInset::MathDecorationInset(latexkeys const * key)
        : MathNestInset(1), key_(key)
 {}
 
 
-MathInset * MathDecorationInset::clone() const
+auto_ptr<InsetBase> MathDecorationInset::clone() const
 {
-       return new MathDecorationInset(*this);
+       return auto_ptr<InsetBase>(new MathDecorationInset(*this));
 }
 
 
@@ -75,32 +74,35 @@ bool MathDecorationInset::wide() const
 }
 
 
-void MathDecorationInset::metrics(MathMetricsInfo & mi) const
+void MathDecorationInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi);
        dim_ = cell(0).dim();
+
        dh_  = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
        dw_  = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
 
        if (upper()) {
-               dy_ = -dim_.a - dh_;
-               dim_.a += dh_ + 1;
+               dy_ = -dim_.asc - dh_;
+               dim_.asc += dh_ + 1;
        } else {
-               dy_ = dim_.d + 1;
-               dim_.d += dh_ + 2;
+               dy_ = dim_.des + 1;
+               dim_.des += dh_ + 2;
        }
 
        metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathDecorationInset::draw(PainterInfo & pi, int x, int y) const
 {
        cell(0).draw(pi, x + 1, y);
        if (wide())
-               mathed_draw_deco(pi, x + 1, y + dy_, width(), dh_, key_->name);
+               mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
        else
-               mathed_draw_deco(pi, x + 1 + (width() - dw_) / 2, y + dy_, dw_, dh_, key_->name);
+               mathed_draw_deco(pi, x + 1 + (pi.width - dw_) / 2,
+                       y + dy_, dw_, dh_, key_->name);
        drawMarkers(pi, x, y);
 }