* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

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

diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index cce32e334f61c8490c0d451729c56abeb8381992..2656bd453da578c310d1b3aa41ba535f8521688a 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(InsetBase const *) const
+RenderBase * RenderButton::clone(Inset const *) const
 {
-       return auto_ptr<RenderBase>(new RenderButton(*this));
+       return new RenderButton(*this);
 }
 
 
@@ -43,30 +40,27 @@ void RenderButton::update(docstring const & text, bool editable)
 }
 
 
-bool RenderButton::metrics(MetricsInfo &, Dimension & dim) const
+void 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
                fm.rectText(text_, dim.wid, dim.asc, dim.des);
 
        dim.wid += 4;
-       if (dim_ == dim)
-               return false;
        dim_ = dim;
-       return true;
 }
 
 
 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();