* InsetCollapsable:

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 52e9e4970d241a16aa7d3b8c552dd98bc2d01cca..cc33329a974fc8867ba3a6e9c267cc556a0d81f7 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -27,7 +27,6 @@
 #include "gettext.h"
 #include "InsetList.h"
 #include "Intl.h"
-#include "Color.h"
 #include "lyxfind.h"
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -76,7 +75,7 @@ using std::vector;
 
 
 InsetText::InsetText(BufferParams const & bp)
-       : drawFrame_(false), frame_color_(Color::insetframe)
+       : drawFrame_(false), frame_color_(Color_insetframe)
 {
        paragraphs().push_back(Paragraph());
        paragraphs().back().layout(bp.getTextClass().defaultLayout());
@@ -174,7 +173,7 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
        //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
 
        // Hand font through to contained lyxtext:
-       tm.font_ = mi.base.font;
+       tm.font_.fontInfo() = mi.base.font;
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        if (hasFixedWidth())
                tm.metrics(mi, dim, mi.base.textwidth);
@@ -366,13 +365,13 @@ void InsetText::setDrawFrame(bool flag)
 }
 
 
-Color_color InsetText::frameColor() const
+ColorCode InsetText::frameColor() const
 {
-       return Color::color(frame_color_);
+       return frame_color_;
 }
 
 
-void InsetText::setFrameColor(Color_color col)
+void InsetText::setFrameColor(ColorCode col)
 {
        frame_color_ = col;
 }