insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 9fda837950f9518eb284da4648b61f7e719a6882..b0aae9d27f52fea1a0665a2f289445abebc3b288 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -16,8 +16,6 @@
 #include "insetcommandparams.h"
 #include "render_button.h"
 #include <boost/scoped_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 
 class Buffer;
 class Dimension;
@@ -36,13 +34,12 @@ public:
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
 
-       ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
-
        /// Override these InsetButton methods if Previewing
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
+       ///
+       virtual bool display() const;
 
        /// get the parameters
        InsetCommandParams const & params(void) const;
@@ -69,24 +66,25 @@ public:
        ///
        void read(Buffer const &, LyXLex &);
        ///
-       int latex(Buffer const &, std::ostream &, LatexRunParams const &) const;
+       int latex(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int ascii(Buffer const &, std::ostream &, int linelen) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        void addPreview(lyx::graphics::PreviewLoader &) const;
-
+protected:
+       ///
+       virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
 private:
-       void cache(BufferView *) const;
-       BufferView * view() const;
-
-       /// Slot receiving a signal that the preview is ready to display.
-       void statusChanged() const;
        /** Slot receiving a signal that the external file has changed
         *  and the preview should be regenerated.
         */
@@ -112,7 +110,6 @@ private:
        boost::scoped_ptr<RenderMonitoredPreview> const preview_;
 
        /// cache
-       mutable boost::weak_ptr<BufferView> view_;
        mutable bool set_label_;
        mutable RenderButton button_;
 };