Get rid of Inset::setPosCache

[lyx.git] / src / mathed / InsetMath.cpp

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index a8642c14ac27cb19c77fbc788064aa365dd9de66..ba559e7eb6b4888080cc140c303526125602a65a 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -16,13 +16,15 @@
 #include "MathRow.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/lassert.h"
 
 using namespace std;
 
@@ -56,15 +58,44 @@ MathClass InsetMath::mathClass() const
 }
 
 
-bool InsetMath::addToMathRow(MathRow & mrow, MetricsInfo const &) const
+bool InsetMath::addToMathRow(MathRow & mrow, MetricsInfo & ) const
 {
-       MathRow::Element e;
+       MathRow::Element e(MathRow::INSET, mathClass());
        e.inset = this;
-       e.mclass = mathClass();
        mrow.push_back(e);
        return true;
 }
 
+void InsetMath::metricsMarkers(MetricsInfo & mi, Dimension & dim,
+                           int framesize) const
+{
+       if (!mi.base.macro_nesting)
+               Inset::metricsMarkers(dim, framesize);
+}
+
+
+void InsetMath::metricsMarkers2(MetricsInfo & mi, Dimension & dim,
+                            int framesize) const
+{
+       if (!mi.base.macro_nesting)
+               Inset::metricsMarkers2(dim, framesize);
+}
+
+
+void InsetMath::drawMarkers(PainterInfo & pi, int x, int y) const
+{
+       if (!pi.base.macro_nesting)
+               Inset::drawMarkers(pi, x, y);
+}
+
+
+void InsetMath::drawMarkers2(PainterInfo & pi, int x, int y) const
+{
+       if (!pi.base.macro_nesting)
+               Inset::drawMarkers2(pi, x, y);
+}
+
+
 
 void InsetMath::dump() const
 {