Fix text frame drawing.

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 982d1306dba93a44ffa157ff8217777698d79729..6b2b14a7310c12f99beecbb4fbfd210dfff44cb1 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -15,7 +15,6 @@
 #ifndef INSETBASE_H
 #define INSETBASE_H
 
-#include "Changes.h"
 #include "Dimension.h"
 
 #include "support/docstream.h"
@@ -25,26 +24,32 @@
 
 namespace lyx {
 
+class BiblioInfo;
 class Buffer;
 class BufferParams;
 class BufferView;
-class ParIterator;
-class ParConstIterator;
+class Change;
+class Color_color;
+class Cursor;
 class CursorSlice;
 class FuncRequest;
 class FuncStatus;
+class InsetIterator;
+class InsetLayout;
 class InsetMath;
 class InsetText;
 class LaTeXFeatures;
-class Color_color;
-class Cursor;
 class Lexer;
-class Text;
+class MathAtom;
 class MetricsInfo;
-class Dimension;
-class PainterInfo;
 class OutputParams;
+class PainterInfo;
+class Paragraph;
+class ParConstIterator;
+class ParIterator;
+class Text;
 class TocList;
+class EmbeddedFiles;
 
 
 namespace graphics { class PreviewLoader; }
@@ -73,8 +78,6 @@ public:
 
        /// virtual base class destructor
        virtual ~Inset() {}
-       /// replicate ourselves
-       std::auto_ptr<Inset> clone() const;
 
        /// identification as math inset
        virtual InsetMath * asInsetMath() { return 0; }
@@ -379,6 +382,8 @@ public:
 
        ///
        virtual docstring name() const { return from_ascii("unknown"); }
+       ///
+       virtual InsetLayout const & getLayout(BufferParams const & bp) const;
        /// used to toggle insets
        /// is the inset open?
        /// should this inset be handled like a normal charater
@@ -434,9 +439,16 @@ public:
        /// Add an entry to the TocList
        /// pit is the ParConstIterator of the paragraph containing the inset
        virtual void addToToc(TocList &, Buffer const &, ParConstIterator const &) const {}
-       // Update the counters of this inset and of its contents
+       /// report files that can be embedded with the lyx file
+       virtual void registerEmbeddedFiles(Buffer const &, EmbeddedFiles &,
+                       ParConstIterator const &) const {};
+       /// Fill keys with BibTeX information
+       virtual void fillWithBibKeys(Buffer const &,
+               BiblioInfo &, InsetIterator const &) const { return; }
+       /// Update the counters of this inset and of its contents
        virtual void updateLabels(Buffer const &, ParIterator const &) {}
 
+
 public:
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Code lyxCode() const { return NO_CODE; }
@@ -464,6 +476,8 @@ public:
        /// reject the changes within the inset
        virtual void rejectChanges(BufferParams const &) {};
 
+       /// FIXME: move dim_ out of Inset!
+       Dimension const & dimension() { return dim_; }
        /// inset width.
        int width() const { return dim_.wid; }
        /// inset ascent.
@@ -477,7 +491,6 @@ public:
        ///
        enum CollapseStatus {
                Collapsed,
-               Inlined,
                Open
        };
        ///
@@ -488,6 +501,11 @@ public:
 protected:
        Inset();
 
+       /// replicate ourselves
+       friend class Paragraph;
+       friend class MathAtom;
+       virtual Inset * clone() const = 0;
+
        /** The real dispatcher.
         *  Gets normally called from Cursor::dispatch(). Cursor::dispatch()
         *  assumes the common case of 'LFUN handled, need update'.
@@ -503,8 +521,6 @@ protected:
 
        /// Cached dimensions of the inset.
        mutable Dimension dim_;
-private:
-       virtual std::auto_ptr<Inset> doClone() const = 0;
 };