fix #1073

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

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index b12e9e85035f068d4b183a379db2971e1d476527..d6bb6f919d13e5742f6fae590c66c0819ec774fd 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -2,38 +2,41 @@
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "math_parinset.h"
+#include "math_nestinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** A macro argument
-    \author Alejandro Aguilar Sierra
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
 */
-class MathMacroArgument : public MathParInset {
+class MathMacroArgument : public MathNestInset {
 public:
        ///
-       MathMacroArgument();
+       explicit MathMacroArgument(int);
        ///
-       explicit
-       MathMacroArgument(int);
+       MathInset * clone() const;
        ///
-       MathedInset * Clone();
+       bool isActive() const { return false; }
        ///
-       void Metrics();
+       void metrics(MetricsInfo & st) const;
        ///
-       void draw(Painter &, int x, int baseline);
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       void Write(std::ostream &, bool fragile);
-       /// Is expanded or not
-       void setExpand(bool e);
-       /// Is expanded or not
-       bool getExpand() const;
-private:
+       void substitute(MathMacro const & macro);
+
        ///
-       bool expnd_mode_;
+       void normalize(NormalStream &) const;
        ///
+       void write(WriteStream & os) const;
+
+private:
+       /// A number between 1 and 9
        int number_;
+       ///
+       char str_[3];
+       ///
+       bool expanded_;
 };
+
 #endif