Fix wrongly copy-pasted entries in SpellcheckerUi.ui

[lyx.git] / src / insets / InsetBox.h

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 60ecfbda649fe8ba4ca07bc20e7b55492a68807b..2fb33bf2098dd9c80f6f507fa5c7612474aac5e0 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -31,8 +31,10 @@ public:
 
        ///
        std::string type;
-       /// Use a parbox (true) or minipage (false)
+       /// Is there a parbox?
        bool use_parbox;
+       /// Is there a makebox?
+       bool use_makebox;
        /// Do we have an inner parbox or minipage to format paragraphs to
        /// columnwidth?
        bool inner_box;
@@ -78,8 +80,6 @@ public:
        ///
        InsetBox(Buffer *, std::string const &);
        ///
-       ~InsetBox();
-       ///
        static std::string params2string(InsetBoxParams const &);
        ///
        static void string2params(std::string const &, InsetBoxParams &);
@@ -91,7 +91,7 @@ private:
        ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        void write(std::ostream &) const;
        ///
@@ -100,8 +100,6 @@ private:
        void setButtonLabel();
        ///
        void metrics(MetricsInfo &, Dimension &) const;
-       /// show the Box dialog
-       bool showInsetDialog(BufferView * bv) const;
        ///
        DisplayType display() const { return Inline; }
        ///
@@ -110,10 +108,12 @@ private:
        bool forcePlainLayout(idx_type = 0) const;
        ///
        bool neverIndent() const { return true; }
+       /** returns false if, when outputing LaTeX, font changes should
+           be closed before generating this inset. This is needed for
+           insets that may contain several paragraphs */
+       bool inheritFont() const { return false; }
        ///
-       bool noFontChange() const { return true; }
-       ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -133,7 +133,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
 
        ///
        InsetBoxParams params_;