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 35bd5562cafa8d1cdc2edbd735d97a78b597aced..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;
@@ -45,8 +42,6 @@ public:
        ///
        InsetCollapsable();
        ///
-       //Inset * Clone(Buffer const &) const;
-       ///
        void Read(Buffer const *, LyXLex &);
        ///
        void Write(Buffer const *, std::ostream &) const;
@@ -130,7 +125,20 @@ public:
        ///
        void resizeLyXText(BufferView *) const;
        ///
-       vector<string> const getLabelList() 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:
        ///
        int ascent_collapsed(Painter &, LyXFont const &) const;
@@ -149,9 +157,7 @@ protected:
        LColor::color framecolor;
        ///
        LyXFont labelfont;
-#ifdef NEW_INSETS
 public:
-#endif
        ///
        InsetText inset;
 protected:
@@ -161,7 +167,6 @@ protected:
        mutable int button_top_y;
        ///
        mutable int button_bottom_y;
-
 private:
        ///
        string label;