Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/MathMacroArgument.h b/src/mathed/MathMacroArgument.h
index 1fe0f2ea9ff1ab7cf1a6931c40b043bf4ad61bcb..32d0e05e2c7aaf82a75de94387da1cf0474e00e6 100644 (file)
--- a/src/mathed/MathMacroArgument.h
+++ b/src/mathed/MathMacroArgument.h
@@ -13,25 +13,27 @@
 #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);
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void 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; }
+       void setNumber(std::size_t n);
+       ///
+       InsetCode lyxCode() const { return MATHMACROARG_CODE; }
 
        ///
        void normalize(NormalStream &) const;
@@ -39,7 +41,7 @@ public:
        void write(WriteStream & os) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
        /// A number between 1 and 9
        std::size_t number_;
        ///