Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index c7bf710fd7dc4569b18dffcc96d81f44721ba6d2..8f71fa0f8ec65d3c1553c9d77d7b971d8b804006 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -12,11 +12,12 @@
 
 #include "math_spaceinset.h"
 #include "math_data.h"
-#include "frontends/Painter.h"
 #include "math_mathmlstream.h"
+
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 
+#include "frontends/Painter.h"
 
 using std::string;
 using std::auto_ptr;
@@ -45,47 +46,65 @@ MathSpaceInset::MathSpaceInset(string const & name)
 }
 
 
-auto_ptr<InsetBase> MathSpaceInset::clone() const
+auto_ptr<InsetBase> MathSpaceInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathSpaceInset(*this));
 }
 
 
-void MathSpaceInset::metrics(MetricsInfo &, Dimension & dim) const
+int MathSpaceInset::width() const
 {
        switch (space_) {
-               case 0: dim.wid = 6; break;
-               case 1: dim.wid = 8; break;
-               case 2: dim.wid = 10; break;
-               case 3: dim.wid = 6; break;
-               case 4: dim.wid = 8; break;
-               case 5: dim.wid = 10; break;
-               case 6: dim.wid = 20; break;
-               case 7: dim.wid = 40; break;
-               case 8: dim.wid = -2; break;
-               case 9: dim.wid =  2; break;
-               default: dim.wid = 6;
+               case 0: return 6;
+               case 1: return 8;
+               case 2: return 10;
+               case 3: return 6;
+               case 4: return 8;
+               case 5: return 10;
+               case 6: return 20;
+               case 7: return 40;
+               case 8: return -2;
+               case 9: return  2;
+               default: return 6;
        }
-       dim.asc = 4;
-       dim.des = 0;
 }
 
 
-void MathSpaceInset::draw(PainterInfo & pi, int x, int y) const
+int MathSpaceInset::ascent() const
+{
+       return 4;
+}
+
+
+int MathSpaceInset::descent() const
 {
+       return 0;
+}
+
 
-// Sadly, HP-UX CC can't handle that kind of initialization.
-// XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
+void MathSpaceInset::metrics(MetricsInfo &, Dimension & dim) const
+{
+       dim.wid = width();
+       dim.asc = ascent();
+       dim.des = descent();
+}
+
+
+void MathSpaceInset::draw(PainterInfo & pi, int x, int y) const
+{
+       // Sadly, HP-UX CC can't handle that kind of initialization.
+       // XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
        if (space_ >= nSpace - 2)
                return;
 
        int xp[4];
        int yp[4];
+       int w = width();
 
-       xp[0] = ++x;               yp[0] = y - 3;
-       xp[1] = x;                 yp[1] = y;
-       xp[2] = x + pi.width - 2;  yp[2] = y;
-       xp[3] = x + pi.width - 2;  yp[3] = y - 3;
+       xp[0] = ++x;        yp[0] = y - 3;
+       xp[1] = x;          yp[1] = y;
+       xp[2] = x + w - 2;  yp[2] = y;
+       xp[3] = x + w - 2;  yp[3] = y - 3;
 
        pi.pain.lines(xp, yp, 4, (space_ < 3) ? LColor::latex : LColor::math);
 }
@@ -100,8 +119,8 @@ void MathSpaceInset::incSpace()
 void MathSpaceInset::validate(LaTeXFeatures & features) const
 {
        if (space_ >= 0 && space_< nSpace) {
-               if ((latex_mathspace[space_] == "negmedspace")
-                || (latex_mathspace[space_] == "negthickspace"))
+               if ((latex_mathspace[space_] == string("negmedspace"))
+                || (latex_mathspace[space_] == string("negthickspace")))
                        features.require("amsmath");
        }
 }