reformatting and remove using delc

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

diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index 140e7f3778bdc6021e80804ccffa1ea1b842ac94..86321f977cf7f3fcda1cb2e12d679410534130f0 100644 (file)
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -22,6 +22,7 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
+#include "commandtags.h"
 
 class BufferView;
 class Buffer;
@@ -103,16 +104,29 @@ public:
                ///
                THEOREM_CODE, // 30
                ///
-               CAPTION_CODE
+               CAPTION_CODE,
+               ///
+               MATHMACRO_CODE,
+               ///
+               ERROR_CODE,
+               ///
+               CITE_CODE
        };
 
        ///
-       enum { TEXT_TO_INSET_OFFSET = 2 };
+       enum {
+               ///
+               TEXT_TO_INSET_OFFSET = 2
+       };
 
+       ///
        enum EDITABLE {
-           NOT_EDITABLE = 0,
-           IS_EDITABLE,
-           HIGHLY_EDITABLE
+               ///
+               NOT_EDITABLE = 0,
+               ///
+               IS_EDITABLE,
+               ///
+               HIGHLY_EDITABLE
        };
 
        ///
@@ -164,7 +178,8 @@ public:
        virtual int Latex(Buffer const *, std::ostream &, bool fragile,
                          bool free_spc) const = 0;
        ///
-       virtual int Ascii(Buffer const *, std::ostream &) const = 0;
+       virtual int Ascii(Buffer const *,
+                         std::ostream &, int linelen = 0) const = 0;
        ///
        virtual int Linuxdoc(Buffer const *, std::ostream &) const = 0;
        ///
@@ -182,7 +197,7 @@ public:
        }
 
        ///
-       virtual Inset * Clone() const = 0;
+       virtual Inset * Clone(Buffer const &) const = 0;
 
        /// returns true to override begin and end inset in file
        virtual bool DirectWrite() const;
@@ -198,25 +213,28 @@ public:
        ///
        virtual bool InsertInsetAllowed(Inset *) const { return false; }
        ///
-       virtual void setInsetName(const char * s) { name = s; }
+       void setInsetName(string const & s) { name = s; }
        ///
-       virtual string getInsetName() const { return name; }
+       string const getInsetName() const { return name; }
        ///
-       virtual void setOwner(Inset * inset) { owner_ = inset; }
+       void setOwner(Inset * inset) { owner_ = inset; }
        ///
-       virtual Inset * owner() const { return owner_; }
+       Inset * owner() const { return owner_; }
        ///
        int x() const { return top_x; }
        ///
        int y() const { return top_baseline; }
+       //
+       // because we could have fake text insets and have to call this
+       // inside them without cast!!!
+       ///
+       virtual LyXText * getLyXText(BufferView const *, bool const recursive=false) const;
+       ///
+       virtual void deleteLyXText(BufferView *, bool = true) const {}
        ///
-       /// because we could have fake text insets and have to call this
-       /// inside them without cast!!!
-       virtual LyXText * getLyXText(BufferView *) const;
-       virtual void deleteLyXText(BufferView *, bool =true) const {}
        virtual void resizeLyXText(BufferView *) const {}
-       // returns the actuall scroll-value
-       int  scroll() const { return scx; }
+       /// returns the actuall scroll-value
+       int scroll() const { return scx; }
 
 protected:
        ///
@@ -293,7 +311,7 @@ public:
        /// may call ToggleLockedInsetCursor
        virtual void ToggleInsetCursor(BufferView *);
        ///
-       virtual void ShowInsetCursor(BufferView *);
+       virtual void ShowInsetCursor(BufferView *, bool show=true);
        ///
        virtual void HideInsetCursor(BufferView *);
        ///
@@ -327,7 +345,7 @@ public:
        virtual UpdatableInset * GetFirstLockingInsetOfType(Inset::Code c)
                { return (c == LyxCode()) ? this : 0; }
        ///
-       virtual int InsetInInsetY() { return 0; }
+       virtual unsigned int InsetInInsetY() { return 0; }
        ///
        virtual bool UpdateInsetInInset(BufferView *, Inset *)
                { return false; }
@@ -339,13 +357,15 @@ public:
                                        bool /*lr*/ = false)
                { return false; }
        ///  An updatable inset could handle lyx editing commands
-       virtual RESULT LocalDispatch(BufferView *, int, string const &);
+       virtual RESULT LocalDispatch(BufferView *, kb_action, string const &);
        ///
        virtual bool isCursorVisible() const { return cursor_visible; }
        ///
-       virtual int getMaxWidth(Painter & pain, UpdatableInset const *) const;
+       virtual int getMaxWidth(BufferView * bv, UpdatableInset const *) const;
        ///
        int scroll() const { return scx; }
+       ///
+       virtual bool ShowInsetDialog(BufferView *) const { return false; }
 
 protected:
        ///