Fix text frame drawing.

[lyx.git] / src / insets / InsetFootlike.cpp

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index eee2c8c69388e5aaedf30ce18a98c2a26212027c..4bb185d60586dceca678758213f2b59a28e43eb5 100644 (file)
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -15,39 +15,26 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "Color.h"
 #include "MetricsInfo.h"
-#include "Paragraph.h"
 
 
 namespace lyx {
 
+
 InsetFootlike::InsetFootlike(BufferParams const & bp)
        : InsetCollapsable(bp)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       font.decSize();
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-}
+{}
 
 
 InsetFootlike::InsetFootlike(InsetFootlike const & in)
        : InsetCollapsable(in)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       font.decSize();
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-}
+{}
 
 
 bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LyXFont tmpfont = mi.base.font;
-       mi.base.font = mi.base.bv->buffer()->params().getFont();
+       Font tmpfont = mi.base.font;
+       mi.base.font = mi.base.bv->buffer().params().getFont();
        InsetCollapsable::metrics(mi, dim);
        mi.base.font = tmpfont;
        bool const changed = dim_ != dim;
@@ -58,8 +45,8 @@ bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
-       LyXFont tmpfont = pi.base.font;
-       pi.base.font = pi.base.bv->buffer()->params().getFont();
+       Font tmpfont = pi.base.font;
+       pi.base.font = pi.base.bv->buffer().params().getFont();
        InsetCollapsable::draw(pi, x, y);
        pi.base.font = tmpfont;
 }
@@ -67,15 +54,15 @@ void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 
 void InsetFootlike::write(Buffer const & buf, std::ostream & os) const
 {
-       os << to_utf8(getInsetName()) << "\n";
+       os << to_utf8(name()) << "\n";
        InsetCollapsable::write(buf, os);
 }
 
 
-bool InsetFootlike::insetAllowed(InsetBase::Code code) const
+bool InsetFootlike::insetAllowed(Inset::Code code) const
 {
-       if (code == InsetBase::FOOT_CODE || code == InsetBase::MARGIN_CODE
-           || code == InsetBase::FLOAT_CODE)
+       if (code == Inset::FOOT_CODE || code == Inset::MARGIN_CODE
+           || code == Inset::FLOAT_CODE)
                return false;
        return InsetCollapsable::insetAllowed(code);
 }