fix #1073

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

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index 0e2f7aa70ec5cbbf6fe586512fd8113dd8d33e36..d6bb6f919d13e5742f6fae590c66c0819ec774fd 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -2,35 +2,41 @@
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "math_inset.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 MathInset {
+class MathMacroArgument : public MathNestInset {
 public:
        ///
        explicit MathMacroArgument(int);
        ///
        MathInset * clone() const;
        ///
-       void metrics(MathStyles st);
+       bool isActive() const { return false; }
+       ///
+       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) const;
+       void substitute(MathMacro const & macro);
+
        ///
-       void writeNormal(std::ostream &) const;
+       void normalize(NormalStream &) const;
        ///
-       void substitute(MathArray & array, MathMacro const & macro) const;
+       void write(WriteStream & os) const;
 
 private:
        /// A number between 1 and 9
        int number_;
+       ///
+       char str_[3];
+       ///
+       bool expanded_;
 };
 
 #endif