InsetListings: change the interface of diaplay function and allow AlignLeft. Applied...

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

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index efcc1e7a4236757be976f49c3489fb08fa9b361f..a861acc539bcbef1258ac3c760ff01fc35663e7d 100644 (file)
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -12,8 +12,8 @@
 
 #include "RenderButton.h"
 
-#include "LColor.h"
-#include "metricsinfo.h"
+#include "Color.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -30,7 +30,7 @@ RenderButton::RenderButton()
 {}
 
 
-auto_ptr<RenderBase> RenderButton::clone(InsetBase const *) const
+auto_ptr<RenderBase> RenderButton::clone(Inset const *) const
 {
        return auto_ptr<RenderBase>(new RenderButton(*this));
 }
@@ -45,7 +45,7 @@ void RenderButton::update(docstring const & text, bool editable)
 
 bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        frontend::FontMetrics const & fm =
                theFontMetrics(font);
@@ -66,15 +66,15 @@ bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
 void RenderButton::draw(PainterInfo & pi, int x, int y) const
 {
        // Draw it as a box with the LaTeX text
-       LyXFont font(LyXFont::ALL_SANE);
-       font.setColor(LColor::command);
+       Font font(Font::ALL_SANE);
+       font.setColor(Color::command);
        font.decSize();
 
        if (editable_) {
                pi.pain.buttonText(x + 2, y, text_, font, renderState());
        } else {
                pi.pain.rectText(x + 2, y, text_, font,
-                                LColor::commandbg, LColor::commandframe);
+                                Color::commandbg, Color::commandframe);
        }
 }