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

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

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index 7ed0dc42a5e5a0986547b412bc225eb522f29af5..bcf337d7a086d63f509008af942768785f6ee056 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -13,11 +13,15 @@
 #define INSETWRAP_H
 
 #include "insetcollapsable.h"
-#include "toc.h"
 #include "lyxlength.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 
-struct InsetWrapParams {
+class InsetWrapParams {
+public:
        ///
        void write(std::ostream &) const;
        ///
@@ -47,26 +51,28 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       InsetOld::Code lyxCode() const { return InsetOld::WRAP_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::WRAP_CODE; }
        ///
-       int latex(Buffer const &, std::ostream &,
+       int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
        ///
-       std::string const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
-       bool insetAllowed(InsetOld::Code) const;
+       bool insetAllowed(InsetBase::Code) const;
        ///
-       void addToToc(lyx::toc::TocList &, Buffer const &) const;
+       void addToToc(TocList &, Buffer const &) const;
        ///
        bool showInsetDialog(BufferView *) const;
        ///
        InsetWrapParams const & params() const { return params_; }
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
        ///
-       virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
        virtual std::auto_ptr<InsetBase> doClone() const;
 
@@ -75,10 +81,6 @@ private:
 };
 
 
-
-#include "mailinset.h"
-
-
 class InsetWrapMailer : public MailInset {
 public:
        ///
@@ -100,4 +102,7 @@ private:
        InsetWrap & inset_;
 };
 
+
+} // namespace lyx
+
 #endif