fix #1073

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

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index 678b7ba9a124f48bc5fc5bf018b6b08fb31dfae2..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"
+
 
 /** 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);
-    ///
-    ~MathMacroArgument();
-    ///
-    MathedInset * Clone();
-    ///
-    void Metrics();
-    ///
-    void draw(Painter &, int x, int baseline);
-    ///
-    void Write(std::ostream &, bool fragile);
-    ///
-    void setNumber(int n);
-    /// Is expanded or not
-    void setExpand(bool e);
-    /// Is expanded or not
-    bool getExpand() const;
+       ///
+       explicit MathMacroArgument(int);
+       ///
+       MathInset * clone() const;
+       ///
+       bool isActive() const { return false; }
+       ///
+       void metrics(MetricsInfo & st) const;
+       ///
+       void draw(PainterInfo &, int x, int y) const;
+       ///
+       void substitute(MathMacro const & macro);
+
+       ///
+       void normalize(NormalStream &) const;
+       ///
+       void write(WriteStream & os) const;
+
 private:
-    ///
-    bool expnd_mode_;
-    ///
-    int number_;
+       /// A number between 1 and 9
+       int number_;
+       ///
+       char str_[3];
+       ///
+       bool expanded_;
 };
+
 #endif