* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index f3c77eacf41f0fba657a8dfc47a49a527a97ffe2..8786c1c649efb1301eeaec92995e0f9d7ddc9f63 100644 (file)
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -13,11 +13,13 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-
 #include "insetcollapsable.h"
 #include "lyxlength.h"
+#include "mailinset.h"
 
 
+namespace lyx {
+
 class InsetBoxParams {
 public:
        ///
@@ -60,7 +62,7 @@ public:
        ///
        ~InsetBox();
        ///
-       virtual lyx::docstring const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        InsetBase::Code lyxCode() const { return InsetBase::BOX_CODE; }
        ///
@@ -70,7 +72,7 @@ public:
        ///
        void setButtonLabel();
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        /// show the Box dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
@@ -78,17 +80,15 @@ public:
        ///
        bool forceDefaultParagraphs(idx_type) const;
        ///
-       bool neverIndent() const { return true; }
+       bool neverIndent(Buffer const &) const { return true; }
        ///
        bool noFontChange() const { return true; }
        ///
-       int latex(Buffer const &, lyx::odocstream &,
-                       OutputParams const &) const;
+       int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
-                   OutputParams const &) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, lyx::odocstream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const & runparams) const;
        ///
        void validate(LaTeXFeatures &) const;
@@ -108,6 +108,8 @@ public:
 protected:
        InsetBox(InsetBox const &);
        virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       /// Is the width forced to some value?
+       virtual bool hasFixedWidth() const;
 private:
        friend class InsetBoxParams;
 
@@ -120,8 +122,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetBoxMailer : public MailInset {
 public:
        ///
@@ -144,4 +144,7 @@ private:
        InsetBox & inset_;
 };
 
+
+} // namespace lyx
+
 #endif // INSET_BOX_H