Removed unused private variable

[lyx.git] / src / mathed / InsetMathRef.cpp

diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index 14d3a35e2942a7b717a9af465d5f0df4a5fa2e1e..42151209e733d43ca222b926c2a58d078f8ad37f 100644 (file)
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -38,12 +38,12 @@ using namespace std;
 namespace lyx {
 
 InsetMathRef::InsetMathRef(Buffer * buf)
-       : CommandInset(buf, from_ascii("ref"), false)
+       : InsetMathCommand(buf, from_ascii("ref"), false)
 {}
 
 
 InsetMathRef::InsetMathRef(Buffer * buf, docstring const & data)
-       : CommandInset(buf, data, false)
+       : InsetMathCommand(buf, data, false)
 {}
 
 
@@ -66,6 +66,7 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (cmd.getArg(0) == "ref") {
                        MathData ar;
                        if (createInsetMath_fromDialogStr(cmd.argument(), ar)) {
+                               cur.recordUndo();
                                *this = *ar[0].nucleus()->asRefInset();
                                break;
                        }
@@ -74,12 +75,16 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_INSET_DIALOG_UPDATE: {
-               string const data = createDialogStr("ref");
+               string const data = createDialogStr();
                cur.bv().updateDialog("ref", data);
                break;
        }
 
        case LFUN_MOUSE_RELEASE:
+               if (cur.selection()) {
+                       cur.undispatched();
+                       break;
+               }
                if (cmd.button() == mouse_button::button3) {
                        LYXERR0("trying to goto ref '" << to_utf8(asString(cell(0))) << "'");
                        //FIXME: use DispatchResult argument
@@ -88,20 +93,30 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
                }
                if (cmd.button() == mouse_button::button1) {
                        // Eventually trigger dialog with button 3, not 1
-                       string const data = createDialogStr("ref");
+                       string const data = createDialogStr();
                        cur.bv().showDialog("ref", data, this);
                        break;
                }
                cur.undispatched();
                break;
 
-       case LFUN_MOUSE_PRESS:
-       case LFUN_MOUSE_MOTION:
+       case LFUN_MOUSE_PRESS: {
+               bool do_selection = cmd.button() == mouse_button::button1
+                       && cmd.modifier() == ShiftModifier;
+               // For some reason the cursor points inside the first cell, which is not
+               // active.
+               cur.leaveInset(*this);
+               cur.bv().mouseSetCursor(cur, do_selection);
+               break;
+       }
+
+       case LFUN_MOUSE_DOUBLE:
+       case LFUN_MOUSE_TRIPLE:
                // eat other mouse commands
                break;
 
        default:
-               CommandInset::doDispatch(cur, cmd);
+               InsetMathCommand::doDispatch(cur, cmd);
                break;
        }
 }
@@ -116,11 +131,12 @@ bool InsetMathRef::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_DIALOG_UPDATE:
        case LFUN_MOUSE_RELEASE:
        case LFUN_MOUSE_PRESS:
-       case LFUN_MOUSE_MOTION:
+       case LFUN_MOUSE_DOUBLE:
+       case LFUN_MOUSE_TRIPLE:
                status.setEnabled(true);
                return true;
        default:
-               return CommandInset::getStatus(cur, cmd, status);
+               return InsetMathCommand::getStatus(cur, cmd, status);
        }
 }
 
@@ -183,11 +199,11 @@ void InsetMathRef::updateBuffer(ParIterator const & it, UpdateType /*utype*/)
                return;
        }
        // register this inset into the buffer reference cache.
-       buffer().references(getTarget()).push_back(make_pair(this, it));
+       buffer().addReference(getTarget(), this, it);
 }
 
 
-string const InsetMathRef::createDialogStr(string const & /*name*/) const
+string const InsetMathRef::createDialogStr() const
 {
        InsetCommandParams icp(REF_CODE, to_ascii(commandname()));
        icp["reference"] = asString(cell(0));