some reindentation, revert workarea xpos++, constify, remove all traces of LyXParagra...

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

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index ce24297951cda918cee68cde4521ab805c575854..de94c0c9882d9535a57268102a0bf700409bce97 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -21,9 +21,6 @@
 #include "insettext.h"
 #include "lyxfont.h"
 #include "LColor.h"
-#if 1 // NEW_INSETS
-#include "lyxparagraph.h"
-#endif
 
 class Painter;
 class LyXText;
@@ -35,8 +32,8 @@ class InsetCollapsable : public UpdatableInset {
 public:
        ///
        enum UpdateCodes {
-       NONE = 0,
-       FULL
+               NONE = 0,
+               FULL
        };
        ///
        static int const TEXT_TO_TOP_OFFSET = 2;
@@ -45,8 +42,6 @@ public:
        ///
        InsetCollapsable();
        ///
-       Inset * Clone(Buffer const &) const;
-       ///
        void Read(Buffer const *, LyXLex &);
        ///
        void Write(Buffer const *, std::ostream &) const;
@@ -77,7 +72,8 @@ public:
        ///
        bool LockInsetInInset(BufferView *, UpdatableInset *);
        ///
-       bool UnlockInsetInInset(BufferView *, UpdatableInset *, bool lr = false);
+       bool UnlockInsetInInset(BufferView *, UpdatableInset *,
+                               bool lr = false);
        ///
        bool UpdateInsetInInset(BufferView *, Inset *);
        ///
@@ -92,7 +88,7 @@ public:
        void InsetKeyPress(XKeyEvent *);
        ///
        UpdatableInset::RESULT LocalDispatch(BufferView *, kb_action,
-                                        string const &);
+                                            string const &);
        ///
        int Latex(Buffer const *, std::ostream &,
                  bool fragile, bool free_spc) const;
@@ -128,6 +124,20 @@ public:
        void deleteLyXText(BufferView *, bool recursive=true) const;
        ///
        void resizeLyXText(BufferView *) const;
+       ///
+       std::vector<string> const getLabelList() const;
+       ///
+       bool nodraw() const;
+       ///
+       int scroll(bool recursive=true) const;
+       ///
+       void scroll(BufferView *bv, float sx) const {
+               UpdatableInset::scroll(bv, sx);
+       }
+       ///
+       void scroll(BufferView *bv, int offset) const {
+               UpdatableInset::scroll(bv, offset);
+       }
 
 protected:
        ///
@@ -147,9 +157,7 @@ protected:
        LColor::color framecolor;
        ///
        LyXFont labelfont;
-#ifdef NEW_INSETS
 public:
-#endif
        ///
        InsetText inset;
 protected:
@@ -159,7 +167,6 @@ protected:
        mutable int button_top_y;
        ///
        mutable int button_bottom_y;
-
 private:
        ///
        string label;