prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index ee32fa3a76b892699bb45487bf72628c8d270649..0392743e4c40f2db7ff183a40911b6ffa4394f5b 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -16,6 +16,7 @@
 #include "debug.h"
 #include "funcrequest.h"
 #include "lyxlex.h"
+#include "metricsinfo.h"
 
 #include "frontends/Painter.h"
 
@@ -26,21 +27,47 @@
 using std::ostream;
 
 
-InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
-       : p_(p.getCmdName(), p.getContents(), p.getOptions())
+InsetCommand::InsetCommand(InsetCommandParams const & p)
+       : p_(p.getCmdName(), p.getContents(), p.getOptions()),
+         set_label_(false)
 {}
 
 
+BufferView * InsetCommand::view() const
+{
+       return button_.view();
+}
+
+
+void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       if (!set_label_) {
+               set_label_ = true;
+               button_.update(getScreenLabel(mi.base.bv->buffer()),
+                              editable() != NOT_EDITABLE);
+       }
+       button_.metrics(mi, dim);
+       dim_ = dim;
+}
+
+
+void InsetCommand::draw(PainterInfo & pi, int x, int y) const
+{
+       button_.draw(pi, x, y);
+}
+
+
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
        p_.setCmdName(p.getCmdName());
        p_.setContents(p.getContents());
        p_.setOptions(p.getOptions());
+       set_label_ = false;
 }
 
 
-int InsetCommand::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                       bool/*fs*/) const
+int InsetCommand::latex(Buffer const *, ostream & os,
+                       LatexRunParams const &) const
 {
        os << getCommand();
        return 0;
@@ -67,7 +94,6 @@ int InsetCommand::docbook(Buffer const *, ostream &, bool) const
 
 dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
 {
-       lyxerr << "InsetCommand::localDispatch: " << cmd.action << "\n";
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p;
@@ -88,7 +114,7 @@ dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
                return localDispatch(FuncRequest(cmd.view(), LFUN_INSET_EDIT));
 
        default:
-               return UNDISPATCHED;
+               return InsetOld::localDispatch(cmd);
        }
 
 }
@@ -100,7 +126,7 @@ InsetCommandMailer::InsetCommandMailer(string const & name,
 {}
 
 
-string const InsetCommandMailer::inset2string() const
+string const InsetCommandMailer::inset2string(Buffer const &) const
 {
        return params2string(name(), inset_.params());
 }
@@ -115,7 +141,7 @@ void InsetCommandMailer::string2params(string const & in,
 
        if (in.empty())
                return;
-       
+
        istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);