Fix text frame drawing.

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index edf5ab462f38080c3cd7308bd42a32664f00d68b..893946372701d2fad019c50110c54de28695709c 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -15,17 +15,16 @@
 #include "InsetBox.h"
 
 #include "BufferView.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "debug.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
-#include "LyXLex.h"
+#include "Color.h"
+#include "Lexer.h"
 #include "MetricsInfo.h"
-#include "Paragraph.h"
 #include "TextMetrics.h"
 
 #include "support/Translator.h"
@@ -35,7 +34,6 @@
 
 namespace lyx {
 
-using std::auto_ptr;
 using std::string;
 using std::istringstream;
 using std::ostream;
@@ -90,7 +88,6 @@ BoxTranslatorLoc const & boxtranslator_loc()
 
 void InsetBox::init()
 {
-       setInsetName(from_ascii("Box"));
        setButtonLabel();
 }
 
@@ -115,9 +112,9 @@ InsetBox::~InsetBox()
 }
 
 
-auto_ptr<InsetBase> InsetBox::doClone() const
+Inset * InsetBox::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetBox(*this));
+       return new InsetBox(*this);
 }
 
 
@@ -134,7 +131,7 @@ void InsetBox::write(Buffer const & buf, ostream & os) const
 }
 
 
-void InsetBox::read(Buffer const & buf, LyXLex & lex)
+void InsetBox::read(Buffer const & buf, Lexer & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -144,7 +141,7 @@ void InsetBox::read(Buffer const & buf, LyXLex & lex)
 
 void InsetBox::setButtonLabel()
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
 
@@ -164,8 +161,7 @@ void InsetBox::setButtonLabel()
 
        setLabel(label);
 
-       font.setColor(LColor::foreground);
-       setBackgroundColor(LColor::background);
+       font.setColor(Color::foreground);
        setLabelFont(font);
 }
 
@@ -206,7 +202,7 @@ bool InsetBox::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -236,7 +232,7 @@ void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
@@ -260,7 +256,7 @@ bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
 
 
 int InsetBox::latex(Buffer const & buf, odocstream & os,
-                    OutputParams const & runparams) const
+                   OutputParams const & runparams) const
 {
        BoxType btype = boxtranslator().find(params_.type);
 
@@ -397,7 +393,7 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetBox::plaintext(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        BoxType const btype = boxtranslator().find(params_.type);
 
@@ -427,7 +423,7 @@ int InsetBox::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetBox::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        return InsetText::docbook(buf, os, runparams);
 }
@@ -485,7 +481,7 @@ void InsetBoxMailer::string2params(string const & in,
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;
@@ -494,7 +490,7 @@ void InsetBoxMailer::string2params(string const & in,
                return print_mailer_error("InsetBoxMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "Box")
@@ -508,12 +504,12 @@ InsetBoxParams::InsetBoxParams(string const & label)
        : type(label),
          use_parbox(false),
          inner_box(true),
-         width(LyXLength("100col%")),
+         width(Length("100col%")),
          special("none"),
          pos('t'),
          hor_pos('c'),
          inner_pos('t'),
-         height(LyXLength("1in")),
+         height(Length("1in")),
          height_special("totalheight") // default is 1\\totalheight
 {}
 
@@ -533,7 +529,7 @@ void InsetBoxParams::write(ostream & os) const
 }
 
 
-void InsetBoxParams::read(LyXLex & lex)
+void InsetBoxParams::read(Lexer & lex)
 {
        if (!lex.isOK())
                return;
@@ -614,7 +610,7 @@ void InsetBoxParams::read(LyXLex & lex)
                return;
        if (token == "width") {
                lex.next();
-               width = LyXLength(lex.getString());
+               width = Length(lex.getString());
        } else {
                lyxerr << "InsetBox::Read: Missing 'width'-tag!" << endl;
                lex.pushToken(token);
@@ -638,7 +634,7 @@ void InsetBoxParams::read(LyXLex & lex)
                return;
        if (token == "height") {
                lex.next();
-               height = LyXLength(lex.getString());
+               height = Length(lex.getString());
        } else {
                lyxerr << "InsetBox::Read: Missing 'height'-tag!" << endl;
                lex.pushToken(token);