split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index bd1300e07ef194649248817eea69ca21b132a234..b38add432d2485612f486f4f1f85f4df9b45bbb1 100644 (file)
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -1,11 +1,8 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_binaryopinset.h"
-#include "Painter.h"
+#include "MathPainterInfo.h"
 #include "support/LOstream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
@@ -20,7 +17,7 @@ MathBinaryOpInset::MathBinaryOpInset(char op)
 
 
 MathInset * MathBinaryOpInset::clone() const
-{   
+{
        return new MathBinaryOpInset(*this);
 }
 
@@ -31,22 +28,22 @@ int MathBinaryOpInset::opwidth() const
 }
 
 
-void MathBinaryOpInset::metrics(MathMetricsInfo const & mi) const
+void MathBinaryOpInset::metrics(MathMetricsInfo & mi) const
 {
        mi_ = mi;
-       xcell(0).metrics(mi);
-       xcell(1).metrics(mi);
-       width_   = xcell(0).width() + xcell(1).width() + opwidth();
-       ascent_  = max(xcell(0).ascent(),  xcell(1).ascent());
-       descent_ = max(xcell(0).descent(), xcell(1).descent());
+       cell(0).metrics(mi);
+       cell(1).metrics(mi);
+       width_   = cell(0).width() + cell(1).width() + opwidth();
+       ascent_  = max(cell(0).ascent(),  cell(1).ascent());
+       descent_ = max(cell(0).descent(), cell(1).descent());
 }
 
 
-void MathBinaryOpInset::draw(Painter & pain, int x, int y) const
-{ 
-       xcell(0).draw(pain, x, y); 
-       drawChar(pain, LM_TC_CONST, mi_, x + xcell(0).width() , y, op_);
-       xcell(1).draw(pain, x + width() - xcell(1).width(), y); 
+void MathBinaryOpInset::draw(MathPainterInfo & pain, int x, int y) const
+{
+       cell(0).draw(pain, x, y);
+       drawChar(pain, LM_TC_CONST, mi_, x + cell(0).width() , y, op_);
+       cell(1).draw(pain, x + width() - cell(1).width(), y);
 }