InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 3648fd6eb969372e6f49b97ffbe19258db449ba6..b0692484f5cb00eca7f28e36fc08ab574ed3a80d 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,19 +78,17 @@ 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;
@@ -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; }
        ///
@@ -119,9 +117,9 @@ private:
        ///
        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;
        ///