Properly fix bug 3258.

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

diff --git a/src/mathed/MathMacroArgument.h b/src/mathed/MathMacroArgument.h
index bb5b058f67c3f0ec65624300dc8ae83ffaa32fa3..bee2ccc7c8c7c440ab9233dbe4ad0bd1abb93f24 100644 (file)
--- a/src/mathed/MathMacroArgument.h
+++ b/src/mathed/MathMacroArgument.h
@@ -13,22 +13,25 @@
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "InsetMathDim.h"
+#include "InsetMath.h"
+
+
+namespace lyx {
 
 
 /// A macro argument.
-class MathMacroArgument : public InsetMathDim {
+class MathMacroArgument : public InsetMath {
 public:
        ///
        explicit MathMacroArgument(std::size_t);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo &, int x, int y) const;
        ///
        std::size_t number() const { return number_; }
        ///
-       InsetBase::Code lyxCode() const { return MATHMACROARG_CODE; }
+       Inset::Code lyxCode() const { return MATHMACROARG_CODE; }
 
        ///
        void normalize(NormalStream &) const;
@@ -36,11 +39,14 @@ public:
        void write(WriteStream & os) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
        /// A number between 1 and 9
        std::size_t number_;
        ///
-       char str_[3];
+       docstring str_;
 };
 
+
+} // namespace lyx
+
 #endif