X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macrotemplate.h;h=a8f09a04ad75af19df95e803d703f623dad6361c;hb=d359dd8fca52c4f0100f7cf4bf636113c5c4e49f;hp=b351a4ff6e0b5df76a88b38e2d1fcffb85b06eed;hpb=bb2aa47875a71c75ddf6dc8a231b2e4ed78ba0c7;p=lyx.git

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index b351a4ff6e..a8f09a04ad 100644
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -1,11 +1,9 @@
 // -*- C++ -*-
-#ifndef MATHMACROTEMPLATE
-#define MATHMACROTEMPLATE
+#ifndef MATH_MACROTEMPLATE_H
+#define MATH_MACROTEMPLATE_H
 
-#include <vector>
-
-#include "math_parinset.h"
-#include "math_macroarg.h"
+#include "math_nestinset.h"
+#include "LString.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -16,52 +14,35 @@ class MathMacro;
 /** This class contains the macro definition
     \author Alejandro Aguilar Sierra
  */
-class MathMacroTemplate : public MathParInset {
+//class MathMacroTemplate : public MathInset, boost::noncopyable
+
+class MathMacroTemplate : public MathNestInset {
 public:
-	/// A template constructor needs all the data
-	explicit
-	MathMacroTemplate(string const &, int na = 0, int f = 0);
 	///
-	void draw(Painter &, int, int);
+	MathMacroTemplate();
 	///
-	void Metrics();
+	MathMacroTemplate(string const & name, int nargs);
 	///
-	void WriteDef(std::ostream &, bool fragile);
-	/// useful for special insets
-	void  setTCode(MathedTextCodes t);
+	MathInset * clone() const;
 	///
-	MathedTextCodes getTCode() const;
-	/// 
-	void setArgument(MathedArray *, int i= 0);
+	void write(WriteStream & os) const;
 	/// Number of arguments
-	int getNoArgs() const;
-	///
-	void GetMacroXY(int, int &, int &) const;
+	int numargs() const;
 	///
-	MathParInset * getMacroPar(int) const;
+	void numargs(int);
 	///
-	void SetMacroFocus(int &, int, int);
+	string const & name() const;
 	///
-	void setEditMode(bool);
-	
-	/// Replace the appropriate arguments with a specific macro's data
-	void update(MathMacro * m);
+	void draw(MathPainterInfo &, int x, int y) const;
 	///
-	short flags() const;
+	void metrics(MathMetricsInfo & st) const;
+	/// identifies macro templates
+	MathMacroTemplate * asMacroTemplate() { return this; }
 private:
 	///
-	short flags_;
+	int numargs_;
 	///
-	MathedTextCodes tcode_;
-	///
-	std::vector<MathMacroArgument> args_;
-	///
-	int nargs_;
+	string name_;
 };
 
-
-inline
-short MathMacroTemplate::flags() const {
-	return flags_;
-}
 #endif