fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index 94c368b24a5d90fdb21c0d431fd7d6c475d94a98..2c5866256625d515160d6a3c99070fdb584e1053 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -2,7 +2,8 @@
 #ifndef MATH_DECORATIONINSET_H
 #define MATH_DECORATIONINSET_H
 
-#include "math_inset.h"
+#include "math_nestinset.h"
+#include "LString.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -11,28 +12,39 @@
 /** Decorations and accents over (below) a math object
     \author Alejandro Aguilar Sierra
  */
-class MathDecorationInset : public MathInset {
+
+class MathDecorationInset : public MathNestInset {
 public:
        ///
-       MathDecorationInset(string const & name, int);
+       explicit MathDecorationInset(string const & name);
        ///
        MathInset * clone() const;
        ///
-       void draw(Painter &, int, int);
+       void draw(Painter &, int x, int y) const;
+       ///
+       void write(WriteStream & os) const;
        ///
-       void Write(std::ostream &, bool fragile) const;
+       void metrics(MathMetricsInfo const & st) const;
        ///
-       void Metrics(MathStyles st, int asc = 0, int des = 0);
+       void normalize(NormalStream & os) const;
        ///
-       void WriteNormal(std::ostream & os) const;
+       bool isScriptable() const;
+
 private:
        ///
-       int deco_;
+       bool upper() const;
+       ///
+       bool protect() const;
+       /// is it a wide decoration?
+       bool wide() const;
+
        ///
-       bool upper_;
-       /// height of deco
-       int dh_;
-       /// vertical offset of deco
-       int dy_;
+       string const name_;
+       /// height cache of deco
+       mutable int dh_;
+       /// vertical offset cache of deco
+       mutable int dy_;
+       /// width for non-wide deco
+       mutable int dw_;
 };
 #endif