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 cf86e13d41a9550cb70d8e4152e697d62578847f..2fb33bf2098dd9c80f6f507fa5c7612474aac5e0 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -31,14 +31,16 @@ 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;
        ///
        Length width;
-       /// "special" widths, see usrguide.dvi §3.5
+       /// "special" widths, see usrguide.dvi §3.5
        std::string special;
        ///
        char pos;
@@ -76,22 +78,20 @@ public:
                Doublebox
        };
        ///
-       InsetBox(Buffer const &, std::string const &);
-       ///
-       ~InsetBox();
+       InsetBox(Buffer *, std::string const &);
        ///
        static std::string params2string(InsetBoxParams const &);
        ///
        static void string2params(std::string const &, InsetBoxParams &);
+       ///
+       InsetBoxParams const & params() const { return params_; }
 private:
        ///
        friend class InsetBoxParams;
        ///
-       docstring editMessage() const;
-       ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        void write(std::ostream &) const;
        ///
@@ -100,28 +100,28 @@ private:
        void setButtonLabel();
        ///
        void metrics(MetricsInfo &, Dimension &) const;
-       /// show the Box dialog
-       bool showInsetDialog(BufferView * bv) const;
        ///
        DisplayType display() const { return Inline; }
        ///
-       bool allowParagraphCustomization(idx_type = 0) { return forcePlainLayout(); }
+       bool allowParagraphCustomization(idx_type = 0) const { return !forcePlainLayout(); }
        ///
        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;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       void validate(LaTeXFeatures &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       InsetBoxParams const & params() const { return params_; }
+       void validate(LaTeXFeatures &) const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) 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_;