Fix text frame drawing.

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

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index 3e151e46590206fce3049f12cd7210a035c6f246..f1ae80043005ca11a6110647fa4bf51169a912a3 100644 (file)
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -21,18 +21,15 @@
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-
 
 RenderButton::RenderButton()
        : editable_(false)
 {}
 
 
-auto_ptr<RenderBase> RenderButton::clone(Inset const *) const
+RenderBase * RenderButton::clone(Inset const *) const
 {
-       return auto_ptr<RenderBase>(new RenderButton(*this));
+       return new RenderButton(*this);
 }
 
 
@@ -45,11 +42,11 @@ 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);
-       
+
        if (editable_)
                fm.buttonText(text_, dim.wid, dim.asc, dim.des);
        else
@@ -66,7 +63,7 @@ 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 font(Font::ALL_SANE);
        font.setColor(Color::command);
        font.decSize();