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 21ef625c7f6ae3b54d0088dbf83f1f270a623e12..a0bbf32f4a2435af33456a26ef48a6b4de6e0618 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -94,6 +94,9 @@ static void build_translator()
        insetnames[FLOAT_CODE] = InsetName("float", _("Float"));
        insetnames[WRAP_CODE] = InsetName("wrap");
        insetnames[SPECIALCHAR_CODE] = InsetName("specialchar");
+       insetnames[IPA_CODE] = InsetName("ipa");
+       insetnames[IPACHAR_CODE] = InsetName("ipachar");
+       insetnames[IPADECO_CODE] = InsetName("ipadeco");
        insetnames[TABULAR_CODE] = InsetName("tabular", _("Table"));
        insetnames[EXTERNAL_CODE] = InsetName("external");
        insetnames[CAPTION_CODE] = InsetName("caption");
@@ -123,6 +126,8 @@ static void build_translator()
        insetnames[MATH_BOLDSYMBOL_CODE] = InsetName("mathboldsymbol");
        insetnames[MATH_BOX_CODE] = InsetName("mathbox");
        insetnames[MATH_BRACE_CODE] = InsetName("mathbrace");
+       insetnames[MATH_CANCEL_CODE] = InsetName("mathcancel");
+       insetnames[MATH_CANCELTO_CODE] = InsetName("mathcancelto");
        insetnames[MATH_CASES_CODE] = InsetName("mathcases");
        insetnames[MATH_CHAR_CODE] = InsetName("mathchar");
        insetnames[MATH_COLOR_CODE] = InsetName("mathcolor");
@@ -189,8 +194,8 @@ Buffer & Inset::buffer()
                string const iname = insetName(lyxCode());
                LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
                                        << " name: " << iname);
-               s << "LyX Code: " << lyxCode() << " name: " << iname;
-               LASSERT(false, /**/);
+               s << "LyX Code: " << lyxCode() << " name: " << from_ascii(iname);
+               LATTEST(false);
                throw ExceptionMessage(BufferException, 
                        from_ascii("Inset::buffer_ member not initialized!"), s.str());
        }
@@ -253,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
 {
 }
 
@@ -345,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
-                         && hasSettings()) {
+                   && clickable(cur.bv(), cmd.x(), cmd.y()) && hasSettings()) {
                        FuncRequest tmpcmd(LFUN_INSET_SETTINGS);
                        dispatch(cur, tmpcmd);
                }
@@ -383,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;
 
@@ -406,12 +406,17 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
                } else {
                        return false;
                }
-       
+
        case LFUN_IN_MATHMACROTEMPLATE:
                // By default we're not in a MathMacroTemplate inset
                flag.setEnabled(false);
                return true;
 
+       case LFUN_IN_IPA:
+               // By default we're not in an IPA inset
+               flag.setEnabled(false);
+               return true;
+
        default:
                break;
        }
@@ -632,6 +637,12 @@ Buffer const * Inset::updateFrontend() const
 }
 
 
+bool Inset::resetFontEdit() const
+{
+       return getLayout().resetsFont() || !inheritFont();
+}
+
+
 docstring Inset::completionPrefix(Cursor const &) const 
 {
        return docstring();