X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macrotemplate.h;h=a8f09a04ad75af19df95e803d703f623dad6361c;hb=46880e2b9b49632c56bab2377ce9a3c826cf8d1d;hp=e30ef406e893a72f5c4ea2b21243392184aff401;hpb=53cf203fb9622303b4b074b0c54061e505eb58af;p=lyx.git

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index e30ef406e8..a8f09a04ad 100644
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -1,14 +1,9 @@
 // -*- C++ -*-
-#ifndef MATHMACROTEMPLATE
-#define MATHMACROTEMPLATE
+#ifndef MATH_MACROTEMPLATE_H
+#define MATH_MACROTEMPLATE_H
 
-#include <vector>
-
-#include <boost/utility.hpp>
-//#include <boost/smart_ptr.hpp>
-
-#include "math_parinset.h"
-#include "math_macroarg.h"
+#include "math_nestinset.h"
+#include "LString.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -19,44 +14,35 @@ class MathMacro;
 /** This class contains the macro definition
     \author Alejandro Aguilar Sierra
  */
-class MathMacroTemplate : public MathParInset, boost::noncopyable {
+//class MathMacroTemplate : public MathInset, boost::noncopyable
+
+class MathMacroTemplate : public MathNestInset {
 public:
-	friend class MathMacro;
-	
-	/// A template constructor needs all the data
-	explicit
-	MathMacroTemplate(string const &, int na);
 	///
-	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 write(WriteStream & os) const;
 	/// Number of arguments
-	int getNoArgs() const;
+	int numargs() const;
 	///
-	void GetMacroXY(int, int &, int &) const;
+	void numargs(int);
 	///
-	MathParInset * getMacroPar(int) const;
+	string const & name() const;
 	///
-	void setMacroPar(int, MathedArray const &);
+	void draw(MathPainterInfo &, int x, int y) const;
 	///
-	void SetMacroFocus(int &, int, int);
-	///
-	void setEditMode(bool);
+	void metrics(MathMetricsInfo & st) const;
+	/// identifies macro templates
+	MathMacroTemplate * asMacroTemplate() { return this; }
 private:
-	/// Are we in edit mode or not?
-	bool edit_;
-	///
-	MathedTextCodes tcode_;
 	///
-	//std::vector<boost::shared_ptr<MathMacroArgument> > args_;
-	std::vector<MathMacroArgument> args_;
+	int numargs_;
 	///
-	int nargs_;
+	string name_;
 };
+
 #endif