Enable convertDefault.sh to run even if its executable bit is not set.

[lyx.git] / src / insets / insetcommand.h

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index a3e14b818a40d73603971f2fe88095bcd5634052..489c68e7a782ac12a23c4f7ebb641228cffb7b2a 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -7,17 +7,17 @@
  * \author Angus Leeming
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_LATEXCOMMAND_H
 #define INSET_LATEXCOMMAND_H
 
 
-#include "insetbutton.h"
+#include "inset.h"
 #include "insetcommandparams.h"
+#include "renderers.h"
 #include "mailinset.h"
-#include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
@@ -27,57 +27,67 @@
  */
 
 ///
-class InsetCommand : public InsetButton, boost::noncopyable {
+class InsetCommand : public InsetOld {
 public:
        ///
        explicit
        InsetCommand(InsetCommandParams const &);
        ///
-       InsetCommand(InsetCommand const &);
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void write(Buffer const *, std::ostream & os) const
+       void draw(PainterInfo & pi, int x, int y) const;
+       ///
+       void write(Buffer const &, std::ostream & os) const
                { p_.write(os); }
        ///
-       virtual void read(Buffer const *, LyXLex & lex)
+       virtual void read(Buffer const &, LyXLex & lex)
                { p_.read(lex); }
        /// Can remove one InsetBibKey is modified
        void scanCommand(string const & c) { p_.scanCommand(c); };
        ///
-       virtual int latex(Buffer const *, std::ostream &,
+       virtual int latex(Buffer const &, std::ostream &,
                          LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       virtual int linuxdoc(Buffer const *, std::ostream &) const;
+       virtual int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       virtual int docbook(Buffer const *, std::ostream &, bool) const;
+       virtual int docbook(Buffer const &, std::ostream &, bool) const;
        ///
-       Inset::Code lyxCode() const { return Inset::NO_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::NO_CODE; }
 
        ///
-       string const getCommand() const { return p_.getCommand(); }
+       InsetCommandParams const & params() const { return p_; }
        ///
-       string const & getCmdName() const { return p_.getCmdName(); }
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
+       ///
+       string const & getContents() const { return p_.getContents(); }
+       ///
+       void setContents(string const & c) { p_.setContents(c); }
        ///
        string const & getOptions() const { return p_.getOptions(); }
+
+protected:
        ///
-       string const & getContents() const { return p_.getContents(); }
+       string const getCommand() const { return p_.getCommand(); }
+       ///
+       string const & getCmdName() const { return p_.getCmdName(); }
        ///
        void setCmdName(string const & n) { p_.setCmdName(n); }
        ///
        void setOptions(string const & o) { p_.setOptions(o); }
        ///
-       void setContents(string const & c) { p_.setContents(c); }
-       ///
-       InsetCommandParams const & params() const { return p_; }
-       ///
        void setParams(InsetCommandParams const &);
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
+       virtual BufferView * view() const;
+       /// This should provide the text for the button
+       virtual string const getScreenLabel(Buffer const &) const = 0;
 
 private:
        ///
        InsetCommandParams p_;
+       mutable bool set_label_;
+       mutable ButtonRenderer button_;
 };
 
 
@@ -90,7 +100,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static void string2params(string const &, InsetCommandParams &);
        ///