X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_nestinset.C;h=d597bebeb069cd2242277bb6f57a426a7bf55824;hb=6a36d26356348d9e5f6ff63febe321d06c2e40ed;hp=ec23d10bdc00723890090c249e6410aa51cae730;hpb=d9f29afe1c3ad1c7b8568dda33dc52ba8d07608b;p=lyx.git

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index ec23d10bdc..d597bebeb0 100644
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -30,6 +30,7 @@
 #include "math_symbolinset.h"
 #include "math_support.h"
 #include "math_unknowninset.h"
+#include "ref_inset.h"
 
 #include "BufferView.h"
 #include "CutAndPaste.h"
@@ -56,7 +57,6 @@
 using lyx::cap::copySelection;
 using lyx::cap::grabAndEraseSelection;
 using lyx::cap::cutSelection;
-using lyx::cap::pasteSelection;
 using lyx::cap::replaceSelection;
 using lyx::cap::selClearOrDel;
 
@@ -885,34 +885,14 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_DIALOG_SHOW_NEW_INSET: {
 		string const & name = cmd.argument;
 		string data;
-#if 0
 		if (name == "ref") {
 			RefInset tmp(name);
 			data = tmp.createDialogStr(name);
 		}
-#endif
 		cur.bv().owner()->getDialogs().show(name, data, 0);
 		break;
 	}
 
-	case LFUN_INSET_APPLY: {
-		string const name = cmd.getArg(0);
-		InsetBase * base = cur.bv().owner()->getDialogs().getOpenInset(name);
-
-		if (base) {
-			FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
-			base->dispatch(cur, fr);
-			break;
-		}
-		MathArray ar;
-		if (createMathInset_fromDialogStr(cmd.argument, ar)) {
-			cur.insert(ar);
-			break;
-		}
-		cur.undispatched();
-		break;
-	}
-
 	default:
 		MathDimInset::doDispatch(cur, cmd);
 		break;
@@ -1045,8 +1025,7 @@ void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest & cmd)
 	//lyxerr << "## lfunMousePress: buttons: " << cmd.button() << endl;
 	if (cmd.button() == mouse_button::button1) {
 		//lyxerr << "## lfunMousePress: setting cursor to: " << cur << endl;
-		cur.resetAnchor();
-		cur.bv().cursor() = cur;
+		cur.bv().mouseSetCursor(cur);
 	}
 
 	if (cmd.button() == mouse_button::button2) {
@@ -1269,6 +1248,7 @@ bool MathNestInset::script(LCursor & cur, bool up)
 		--cur.pos();
 		MathScriptInset * inset = cur.nextAtom().nucleus()->asScriptInset();
 		cur.push(*inset);
+		inset->ensure(up);
 		cur.idx() = inset->idxOfScript(up);
 		cur.pos() = cur.lastpos();
 	} else {