X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetPhantom.cpp;h=9e3808f0e7ca38d1d9bc4f333fc5411ac3360145;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=d21b0b1bf58d09399d68c4cff72d65c20186fb2a;hpb=77c771e3b6599a81173a1834aa60e33d66f1b7a4;p=lyx.git

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index d21b0b1bf5..9e3808f0e7 100644
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -126,7 +126,7 @@ InsetPhantom::~InsetPhantom()
 }
 
 
-docstring InsetPhantom::name() const 
+docstring InsetPhantom::layoutName() const
 {
 	return from_ascii("Phantom:" + phantomtranslator().find(params_.type));
 }
@@ -154,7 +154,7 @@ void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
 	ColorCode const origcol = pi.base.font.color();
 	pi.base.font.setColor(Color_special);
 	pi.base.font.setColor(origcol);
-	Dimension const dim = dimension(*pi.base.bv);
+	Dimension const dim = Inset::dimension(*pi.base.bv);
 
 	if (params_.type == InsetPhantomParams::Phantom ||
 		params_.type == InsetPhantomParams::VPhantom) {
@@ -256,10 +256,13 @@ bool InsetPhantom::showInsetDialog(BufferView * bv) const
 
 void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
+		cur.recordUndoInset(ATOMIC_UNDO, this);
 		string2params(to_utf8(cmd.argument()), params_);
+		setButtonLabel();
+		cur.forceBufferUpdate();
 		break;
 
 	case LFUN_INSET_DIALOG_UPDATE:
@@ -276,7 +279,7 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
 		if (cmd.getArg(0) == "phantom") {
@@ -299,18 +302,12 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 docstring InsetPhantom::toolTip(BufferView const &, int, int) const
 {
-	OutputParams rp(&buffer().params().encoding());
-	odocstringstream ods;
-	InsetCollapsable::plaintext(ods, rp);
-	docstring content_tip = support::wrapParas(ods.str());
-	docstring res = phantomtranslator_loc().find(params_.type);
-	if (!content_tip.empty())
-		res += from_ascii(": ") + "\n" + content_tip;
-	return res;
+	docstring const res = phantomtranslator_loc().find(params_.type);
+	return toolTipText(res + from_ascii(": "));
 }
 
 
-int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) const
+void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const
 {
 	if (params_.type == InsetPhantomParams::Phantom)
 		os << "\\phantom{";
@@ -318,10 +315,8 @@ int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) const
 		os << "\\hphantom{";
 	else if (params_.type == InsetPhantomParams::VPhantom)
 		os << "\\vphantom{";
-	int const i = InsetCollapsable::latex(os, runparams);
+	InsetCollapsable::latex(os, runparams);
 	os << "}";
-
-	return i;
 }
 
 
@@ -363,7 +358,7 @@ docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const
 	return docstring();
 }
 
-docstring InsetPhantom::contextMenu(BufferView const &, int, int) const
+docstring InsetPhantom::contextMenuName() const
 {
 	return from_ascii("context-phantom");
 }