Cleanup bv-dependent variables in InsetCollapsable

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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 66bdf0b38bf49090dd0561f3b435344bb0e34c88..a0bbf32f4a2435af33456a26ef48a6b4de6e0618 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -194,7 +194,7 @@ Buffer & Inset::buffer()
                string const iname = insetName(lyxCode());
                LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
                                        << " name: " << iname);
-               s << "LyX Code: " << lyxCode() << " name: " << iname;
+               s << "LyX Code: " << lyxCode() << " name: " << from_ascii(iname);
                LATTEST(false);
                throw ExceptionMessage(BufferException, 
                        from_ascii("Inset::buffer_ member not initialized!"), s.str());
@@ -258,7 +258,7 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-void Inset::forToc(docstring &, size_t) const
+void Inset::forOutliner(docstring &, size_t const, bool const) const
 {
 }
 
@@ -350,7 +350,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
                // if the derived inset did not explicitly handle mouse_release,
                // we assume we request the settings dialog
                if (!cur.selection() && cmd.button() == mouse_button::button1
-                   && clickable(cmd.x(), cmd.y()) && hasSettings()) {
+                   && clickable(cur.bv(), cmd.x(), cmd.y()) && hasSettings()) {
                        FuncRequest tmpcmd(LFUN_INSET_SETTINGS);
                        dispatch(cur, tmpcmd);
                }
@@ -388,11 +388,6 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
                // Allow modification of our data.
                // This needs to be handled in the doDispatch method of our
                // instantiatable children.
-               // FIXME: Why don't we let the insets determine whether this
-               // should be enabled or not ? Now we need this check for 
-               // the tabular features. (vfr)
-               if (cmd.getArg(0) == "tabular")
-                       return false;
                flag.setEnabled(true);
                return true;