architectural changes to tex2lyx

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

diff --git a/src/mathed/command_inset.h b/src/mathed/command_inset.h
index 9902afc811db166d943eace60c3888f5a3f2832f..0e7ed2bf8851f972980beed4c6843437d9fe52d1 100644 (file)
--- a/src/mathed/command_inset.h
+++ b/src/mathed/command_inset.h
@@ -15,27 +15,38 @@
 #ifndef COMMAND_INSET_H
 #define COMMAND_INSET_H
 
-#include "button_inset.h"
+#include "math_nestinset.h"
+#include "insets/renderers.h"
+
 
 /// Inset for things like \name[options]{contents}
-class CommandInset : public ButtonInset {
+class CommandInset : public MathNestInset {
 public:
-       /// name, contents, options deliminited by '|++|'
-       explicit CommandInset(string const & data);
        ///
-       MathInset * clone() const;
+       explicit CommandInset(string const & name);
        ///
-       void write(WriteStream & os) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
+       ///
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       ///
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       //void infoize(std::ostream & os) const;
+       void write(WriteStream & os) const;
+       //
+       // void infoize(std::ostream & os) const;
        ///
        dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
        ///
-       string screenLabel() const;
-       /// generate something that will be understodd by the Dialogs.
+       virtual string const screenLabel() const;
+       /// generate something that will be understood by the Dialogs.
        string const createDialogStr(string const & name) const;
-public:
+
+       string const & commandname() const { return name_; }
+
+private:
        string name_;
+       mutable bool set_label_;
+       mutable ButtonRenderer button_;
 };
 
 #endif