Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 7691845910b2d7054d7e7be5f8d6d08903e4ed1f..f6b8c70cd3a5f8642dbf1c823936e64c9bc1e8f7 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -41,18 +41,15 @@ public:
        ///
        InsetCollapsable(InsetCollapsable const & in);
        ///
-       //InsetCollapsable(InsetCollapsable const & in, bool same_id);
-       ///
        void read(Buffer const *, LyXLex &);
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(BufferView *, const LyXFont &, int, float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        /// draw, either inlined (no button) or collapsed/open
-       void draw(BufferView * bv, LyXFont const & f,
-                 int baseline, float & x, bool inlined) const;
+       void draw(PainterInfo & pi, int x, int y, bool inlined) const;
        ///
        void update(BufferView *, bool = false);
        ///
@@ -183,7 +180,7 @@ protected:
        ///
        int height_collapsed() const;
        ///
-       void draw_collapsed(Painter & pain, int, float &) const;
+       void draw_collapsed(PainterInfo & pi, int x, int y) const;
        ///
        int getMaxTextWidth(Painter & pain, UpdatableInset const *) const;