Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / insets / InsetCommand.cpp

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index b2fbc690000652cf4e6bcd594beb9414565edd7b..fcda3cd2b984175a7cf24169adffb322c2a74095 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -51,7 +51,7 @@ using namespace std;
 
 namespace lyx {
 
-// FIXME Would it now be possible to use the InsetCode in 
+// FIXME Would it now be possible to use the InsetCode in
 // place of the mailer name and recover that information?
 InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p)
        : Inset(buf), p_(p)
@@ -65,6 +65,20 @@ InsetCommand::InsetCommand(InsetCommand const & rhs)
 {}
 
 
+InsetCommand & InsetCommand::operator=(InsetCommand const & rhs)
+{
+       if (&rhs == this)
+               return *this;
+
+       Inset::operator=(rhs);
+       p_ = rhs.p_;
+       mouse_hover_.clear();
+       button_ = RenderButton();
+
+       return *this;
+}
+
+
 InsetCommand::~InsetCommand()
 {
        if (p_.code() != NO_CODE)
@@ -80,7 +94,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       button_.update(screenLabel(), editable() || clickable(0, 0));
+       button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0));
        button_.metrics(mi, dim);
 }
 
@@ -190,21 +204,21 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_ERT_INSERT:
                status.setEnabled(false);
                return true;
-       
+
        // we handle these
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "changetype") {
                        string const newtype = cmd.getArg(1);
                        status.setEnabled(p_.isCompatibleCommand(p_.code(), newtype));
                        status.setOnOff(newtype == p_.getCmdName());
-               } 
+               }
                status.setEnabled(true);
                return true;
-       
+
        case LFUN_INSET_DIALOG_UPDATE:
                status.setEnabled(true);
                return true;
-       
+
        default:
                return Inset::getStatus(cur, cmd, status);
        }
@@ -334,7 +348,7 @@ bool decodeInsetParam(string const & name, string & data,
                break;
        }
        case MATH_SPACE_CODE: {
-           InsetSpaceParams p(true);
+               InsetSpaceParams p(true);
                data = InsetSpace::params2string(p);
                break;
        }