remove symbol_def.h

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

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index d9bc68393076582ad591acebd5d14820784a64c3..58f74cca21a1e6721c02466496778ebfac5f4fcd 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,33 @@
 /** 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(std::ostream &, bool fragile) const;
        ///
-       void metrics(MathStyles st);
+       void metrics(MathStyles st) const;
        ///
        void writeNormal(std::ostream & os) const;
+
 private:
        ///
-       int deco_;
+       bool upper() const;
+       ///
+       bool protect() 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_;
 };
 #endif