Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 611647d6f34bdfd23e1bdb2ee44987b654c8e586..2567a5ca5651f3f6e21675c775c9ed94f5cd6c17 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -15,12 +15,12 @@
 
 #include "InsetCollapsable.h"
 #include "Length.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-class InsetBoxParams {
+class InsetBoxParams
+{
 public:
        ///
        InsetBoxParams(std::string const &);
@@ -28,6 +28,7 @@ public:
        void write(std::ostream & os) const;
        ///
        void read(Lexer & lex);
+
        ///
        std::string type;
        /// Use a parbox (true) or minipage (false)
@@ -52,25 +53,49 @@ public:
 };
 
 
-/** The fbox/fancybox inset
 
-*/
-class InsetBox : public InsetCollapsable {
+///////////////////////////////////////////////////////////////////////
+//
+// The fbox/fancybox inset
+//
+///////////////////////////////////////////////////////////////////////
+
+
+class InsetBox : public InsetCollapsable
+{
 public:
        ///
-       InsetBox(BufferParams const &, std::string const &);
+       enum BoxType {
+               Frameless,
+               Boxed,
+               Framed,
+               ovalbox,
+               Ovalbox,
+               Shadowbox,
+               Shaded,
+               Doublebox
+       };
+       ///
+       InsetBox(Buffer const &, std::string const &);
        ///
        ~InsetBox();
        ///
-       virtual docstring const editMessage() const;
+       static std::string params2string(InsetBoxParams const &);
+       ///
+       static void string2params(std::string const &, InsetBoxParams &);
+private:
+       ///
+       friend class InsetBoxParams;
+       ///
+       docstring editMessage() const;
        ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
        docstring name() const;
        ///
-       void write(Buffer const &, std::ostream &) const;
+       void write(std::ostream &) const;
        ///
-       void read(Buffer const & buf, Lexer & lex);
+       void read(Lexer & lex);
        ///
        void setButtonLabel();
        ///
@@ -79,22 +104,20 @@ public:
        bool showInsetDialog(BufferView * bv) const;
        ///
        DisplayType display() const { return Inline; }
-       //FIXME Is this the one we want? or is it:
-       //allowParagraphCustomization(idx_type)?
        ///
-       virtual bool forceEmptyLayout() const;
+       bool allowParagraphCustomization(idx_type = 0) { return forceEmptyLayout(); }
        ///
-       bool neverIndent(Buffer const &) const { return true; }
+       bool forceEmptyLayout(idx_type = 0) const;
        ///
-       bool noFontChange() const { return true; }
+       bool neverIndent() const { return true; }
        ///
-       bool isMacroScope(Buffer const & buf) const;
+       bool noFontChange() const { return true; }
        ///
-       int latex(Buffer const &, odocstream &, OutputParams const &) const;
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -102,56 +125,20 @@ public:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       enum BoxType {
-               Frameless,
-               Boxed,
-               Framed,
-               ovalbox,
-               Ovalbox,
-               Shadowbox,
-               Shaded,
-               Doublebox
-       };
-protected:
-       InsetBox(InsetBox const &);
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
        /// Is the width forced to some value?
-       virtual bool hasFixedWidth() const;
-private:
-       friend class InsetBoxParams;
-
-       virtual Inset * clone() const;
-
+       bool hasFixedWidth() const;
+       ///
+       Inset * clone() const { return new InsetBox(*this); }
        /// used by the constructors
        void init();
        ///
-       InsetBoxParams params_;
-};
-
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
 
-class InsetBoxMailer : public MailInset {
-public:
-       ///
-       InsetBoxMailer(InsetBox & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
        ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static std::string const params2string(InsetBoxParams const &);
-       ///
-       static void string2params(std::string const &, InsetBoxParams &);
-
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetBox & inset_;
+       InsetBoxParams params_;
 };
 
-
 } // namespace lyx
 
-#endif // INSET_BOX_H
+#endif // INSETBOX_H