fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index a8eb021aa400df25098295e3442a4ee7be9819de..f089bf3c9e2da5ea2e6a4c4a453269e2cb0573aa 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -2,7 +2,7 @@
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "math_parinset.h"
+#include "math_inset.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -11,27 +11,26 @@
 /** A macro argument
     \author Alejandro Aguilar Sierra
 */
-class MathMacroArgument : public MathParInset {
+class MathMacroArgument : public MathInset {
 public:
        ///
-       explicit
-       MathMacroArgument(int);
+       explicit MathMacroArgument(int);
        ///
-       MathedInset * Clone();
+       MathInset * clone() const;
        ///
-       void Metrics();
+       void Metrics(MathStyles st, int asc = 0, int des = 0);
        ///
        void draw(Painter &, int x, int baseline);
        ///
-       void Write(std::ostream &, bool fragile);
-       /// Is expanded or not
-       void setExpand(bool e);
-       /// Is expanded or not
-       bool getExpand() const;
-private:
+       void Write(std::ostream &, bool fragile) const;
        ///
-       bool expnd_mode_;
+       void WriteNormal(std::ostream &) const;
        ///
+       void substitute(MathArray & array, MathMacro const & macro) const;
+
+private:
+       /// A number between 1 and 9
        int number_;
 };
+
 #endif