X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.cpp;h=806d8256f29f7c96a2e7d481f9983ce936e1e514;hb=2203d7aa0a8e9d64666498fb26eb17f699c2f52b;hp=7639d54a873a2fa7956b3ee531123b402da726b2;hpb=c2e4c79f6e34f6abf49e55d3cb77bd452898a623;p=lyx.git

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 7639d54a87..806d8256f2 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3245,10 +3245,11 @@ void InsetTabular::setBuffer(Buffer & buf)
 
 bool InsetTabular::insetAllowed(InsetCode code) const
 {
-	switch (code)
-	{
+	switch (code) {
+	case FLOAT_CODE:
 	case MARGIN_CODE:
 	case MATHMACRO_CODE:
+	case WRAP_CODE:
 		return false;
 
 	case CAPTION_CODE:
@@ -3737,7 +3738,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 			// only update if selection changes
 			if (bvcur.idx() == cur.idx() &&
 				!(bvcur.realAnchor().idx() == cur.idx() && bvcur.pos() != cur.pos()))
-				cur.noUpdate();
+				cur.noScreenUpdate();
 			setCursorFromCoordinates(cur, cmd.x(), cmd.y());
 			bvcur.setCursor(cur);
 			bvcur.setSelection(true);
@@ -3931,7 +3932,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 //		col_type const col = tabular.cellColumn(cur.idx());
 //		int const t =	cur.bv().top_y() + cur.bv().height();
 //		if (t < yo() + tabular.getHeightOfTabular()) {
-//			cur.bv().scrollDocView(t);
+//			cur.bv().scrollDocView(t, true);
 //			cur.idx() = tabular.cellBelow(first_visible_cell) + col;
 //		} else {
 //			cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + col;
@@ -3947,7 +3948,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 //		col_type const col = tabular.cellColumn(cur.idx());
 //		int const t =	cur.bv().top_y() + cur.bv().height();
 //		if (yo() < 0) {
-//			cur.bv().scrollDocView(t);
+//			cur.bv().scrollDocView(t, true);
 //			if (yo() > 0)
 //				cur.idx() = col;
 //			else
@@ -4732,7 +4733,7 @@ void InsetTabular::resetPos(Cursor & cur) const
 
 	// only update if offset changed
 	if (scx_ != scx_old)
-		cur.updateFlags(Update::Force | Update::FitCursor);
+		cur.screenUpdateFlags(Update::Force | Update::FitCursor);
 }