Final touch 'inset display()'; fix 'is a bit silly' bug

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 6d8df729c363e5a2d92103af8a721730797e2cbc..969f987da073b53f902ec245907b8b9b6acc5625 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 "render_button.h"
 #include "mailinset.h"
-#include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
@@ -27,76 +27,92 @@
  */
 
 ///
-class InsetCommand : public InsetButton, boost::noncopyable {
+class InsetCommand : public InsetOld {
 public:
        ///
        explicit
-       InsetCommand(InsetCommandParams const &, bool same_id = false);
+       InsetCommand(InsetCommandParams const &);
        ///
-       void write(Buffer const *, std::ostream & os) const
+       void metrics(MetricsInfo &, Dimension &) 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); };
+       void scanCommand(std::string const & c) { p_.scanCommand(c); };
        ///
-       virtual int latex(Buffer const *, std::ostream &,
-                         bool fragile, bool free_spc) const;
+       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; }
+       ///
+       virtual bool display() const { return true; }
+       
+       ///
+       InsetCommandParams const & params() const { return p_; }
        ///
-       string const getCommand() const { return p_.getCommand(); }
+       std::string const & getContents() const { return p_.getContents(); }
        ///
-       string const & getCmdName() const { return p_.getCmdName(); }
+       void setContents(std::string const & c) { p_.setContents(c); }
        ///
-       string const & getOptions() const { return p_.getOptions(); }
+       std::string const & getOptions() const { return p_.getOptions(); }
        ///
-       string const & getContents() const { return p_.getContents(); }
+       RenderButton & button() const { return button_; }
+
+protected:
        ///
-       void setCmdName(string const & n) { p_.setCmdName(n); }
+       virtual
+       dispatch_result
+       priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
        ///
-       void setOptions(string const & o) { p_.setOptions(o); }
+       std::string const getCommand() const { return p_.getCommand(); }
        ///
-       void setContents(string const & c) { p_.setContents(c); }
+       std::string const & getCmdName() const { return p_.getCmdName(); }
        ///
-       InsetCommandParams const & params() const { return p_; }
+       void setCmdName(std::string const & n) { p_.setCmdName(n); }
        ///
-       void setParams(InsetCommandParams const &);
+       void setOptions(std::string const & o) { p_.setOptions(o); }
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
+       void setParams(InsetCommandParams const &);
+       /// This should provide the text for the button
+       virtual std::string const getScreenLabel(Buffer const &) const = 0;
 
 private:
        ///
        InsetCommandParams p_;
+       mutable bool set_label_;
+       mutable RenderButton button_;
 };
 
 
 class InsetCommandMailer : public MailInset {
 public:
        ///
-       InsetCommandMailer(string const & name, InsetCommand & inset);
+       InsetCommandMailer(std::string const & name, InsetCommand & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetCommandParams &);
+       static void string2params(std::string const &, InsetCommandParams &);
        ///
-       static string const params2string(string const & name,
+       static std::string const params2string(std::string const & name,
                                          InsetCommandParams const &);
 private:
        ///
-       string const name_;
+       std::string const name_;
        ///
        InsetCommand & inset_;
 };