fix layout of InsetBox and remove unused InsetCollapsable methods.

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 2aaa609e2b6693584fee9198f88496bc4e296836..fb8e175857b3decb140a40baf690801b459ac9cb 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -19,16 +19,16 @@
 #include "TextClass.h"
 
 #include "Box.h"
-#include "Font.h"
 
 #include <string>
 
 namespace lyx {
 
-class Text;
-class Paragraph;
 class CursorSlice;
+class FontInfo;
 class InsetLayout;
+class Paragraph;
+class Text;
 
 namespace frontend { class Painter; }
 
@@ -37,15 +37,13 @@ namespace frontend { class Painter; }
 */
 class InsetCollapsable : public InsetText {
 public:
-       ///
-       static int const TEXT_TO_TOP_OFFSET = 2;
-       ///
-       static int const TEXT_TO_BOTTOM_OFFSET = 2;
        ///
        InsetCollapsable(BufferParams const &, CollapseStatus status = Inset::Open);
        ///
        InsetCollapsable(InsetCollapsable const & rhs);
-       ///
+       
+       InsetCollapsable * asInsetCollapsable() { return this; }
+       InsetCollapsable const * asInsetCollapsable() const { return this; }
        docstring name() const { return from_ascii("Collapsable"); }
        ///
        void setLayout(BufferParams const &);
@@ -74,8 +72,6 @@ public:
        ///
        virtual void setButtonLabel() {}
        ///
-       void setLabelFont(Font const & f);
-       ///
        bool isOpen() const { return geometry() != ButtonOnly; }
        ///
        CollapseStatus status() const;
@@ -130,7 +126,7 @@ public:
        ///
        bool setMouseHover(bool mouse_hover);
        ///
-       virtual Color_color backgroundColor() const {return layout_.bgcolor; }
+       virtual ColorCode backgroundColor() const {return layout_.bgcolor; }
 
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
@@ -157,6 +153,8 @@ protected:
        Inset * editXY(Cursor & cur, int x, int y);
        ///
        docstring floatName(std::string const & type, BufferParams const &) const;
+       ///
+       virtual void resetParagraphsFont();
 
 protected:
        ///