Fix text frame drawing.

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

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 95b8b70b4caa37f78aa0e565c744828e1fab7201..4138a66195fcb7b0859f1341122a754925ae4234 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -13,16 +13,16 @@
 
 #include "InsetVSpace.h"
 
-#include "buffer.h"
-#include "cursor.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "Cursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "LColor.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "Color.h"
+#include "Lexer.h"
+#include "Text.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -57,13 +57,13 @@ InsetVSpace::~InsetVSpace()
 }
 
 
-std::auto_ptr<InsetBase> InsetVSpace::doClone() const
+Inset * InsetVSpace::clone() const
 {
-       return std::auto_ptr<InsetBase>(new InsetVSpace(*this));
+       return new InsetVSpace(*this);
 }
 
 
-void InsetVSpace::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -73,17 +73,18 @@ void InsetVSpace::doDispatch(LCursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_MOUSE_RELEASE:
-               InsetVSpaceMailer(*this).showDialog(&cur.bv());
+               if (!cur.selection())
+                       InsetVSpaceMailer(*this).showDialog(&cur.bv());
                break;
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
                break;
        }
 }
 
 
-void InsetVSpace::read(Buffer const &, LyXLex & lex)
+void InsetVSpace::read(Buffer const &, Lexer & lex)
 {
        BOOST_ASSERT(lex.isOK());
        string vsp;
@@ -123,7 +124,7 @@ bool InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
        if (space_.length().len().value() >= 0.0)
                height = max(height, space_.inPixels(*mi.base.bv));
 
-       LyXFont font;
+       Font font;
        font.decSize();
        font.decSize();
 
@@ -178,8 +179,8 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
        int a = 0;
        int d = 0;
 
-       LyXFont font;
-       font.setColor(LColor::added_space);
+       Font font;
+       font.setColor(Color::added_space);
        font.decSize();
        font.decSize();
        docstring const lab = label();
@@ -187,23 +188,23 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 
        pi.pain.rectText(x + 2 * arrow_size + 5,
                         start + (end - start) / 2 + (a - d) / 2,
-                        lab, font, LColor::none, LColor::none);
+                        lab, font, Color::none, Color::none);
 
        // top arrow
-       pi.pain.line(x, ty1, midx, ty2, LColor::added_space);
-       pi.pain.line(midx, ty2, rightx, ty1, LColor::added_space);
+       pi.pain.line(x, ty1, midx, ty2, Color::added_space);
+       pi.pain.line(midx, ty2, rightx, ty1, Color::added_space);
 
        // bottom arrow
-       pi.pain.line(x, by1, midx, by2, LColor::added_space);
-       pi.pain.line(midx, by2, rightx, by1, LColor::added_space);
+       pi.pain.line(x, by1, midx, by2, Color::added_space);
+       pi.pain.line(midx, by2, rightx, by1, Color::added_space);
 
        // joining line
-       pi.pain.line(midx, ty2, midx, by2, LColor::added_space);
+       pi.pain.line(midx, ty2, midx, by2, Color::added_space);
 }
 
 
 int InsetVSpace::latex(Buffer const & buf, odocstream & os,
-                       OutputParams const &) const
+                      OutputParams const &) const
 {
        os << from_ascii(space_.asLatexCommand(buf.params())) << '\n';
        return 1;
@@ -211,7 +212,7 @@ int InsetVSpace::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetVSpace::plaintext(Buffer const &, odocstream & os,
-                           OutputParams const &) const
+                          OutputParams const &) const
 {
        os << "\n\n";
        return PLAINTEXT_NEWLINE;
@@ -219,7 +220,7 @@ int InsetVSpace::plaintext(Buffer const &, odocstream & os,
 
 
 int InsetVSpace::docbook(Buffer const &, odocstream & os,
-                         OutputParams const &) const
+                        OutputParams const &) const
 {
        os << '\n';
        return 1;
@@ -247,7 +248,7 @@ void InsetVSpaceMailer::string2params(string const & in, VSpace & vspace)
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;