X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macroarg.h;h=d7d763d878a1e74eb949921b80b8e20c2ed93afc;hb=3e93baac3cd18e27db3eb2a1fcaf90b25e0918a6;hp=c8855d9a87d1d177703ceef742d94c9117ae95ca;hpb=5507c1ad69ef62f0790b66c797c6d89166795590;p=lyx.git

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index c8855d9a87..d7d763d878 100644
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -1,42 +1,47 @@
 // -*- C++ -*-
+/**
+ * \file math_macroarg.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "math_nestinset.h"
+#include "math_diminset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-/** A macro argument
-    \author Alejandro Aguilar Sierra
-*/
-class MathMacroArgument : public MathNestInset {
+/// A macro argument.
+class MathMacroArgument : public MathDimInset {
 public:
 	///
-	explicit MathMacroArgument(int);
+	explicit MathMacroArgument(std::size_t);
 	///
-	MathInset * clone() const;
+	std::auto_ptr<InsetBase> clone() const;
 	///
-	void metrics(MathMetricsInfo const & st) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void draw(Painter &, int x, int y) const;
+	void draw(PainterInfo &, int x, int y) const;
 	///
-	void write(MathWriteInfo & os) const;
+	std::size_t number() const { return number_; }
 	///
-	void writeNormal(std::ostream &) const;
+	InsetBase::Code lyxCode() const { return MATHMACROARG_CODE; }
+
 	///
-	void substitute(MathMacro const & macro);
+	void normalize(NormalStream &) const;
 	///
-	bool isActive() const { return false; }
+	void write(WriteStream & os) const;
 
 private:
 	/// A number between 1 and 9
-	int number_;
+	std::size_t number_;
 	///
 	char str_[3];
-	///
-	bool expanded_;
 };
 
 #endif