change "support/std_sstream.h" to <sstream>

[features.git] / src / insets / insetcharstyle.C

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index dd7c66f7831a6f471a2d5db3f8382d3275186169..910350243cdc87a3660326791d1b4dc9d4c7f63c 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -27,7 +27,8 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 
 using std::string;
@@ -105,38 +106,34 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 {
-       xo_ = x;
-       yo_ = y;
+       setPosCache(pi, x, y);
 
        // FIXME: setStatus(Inlined); this is not a const operation
        LyXFont tmpfont = pi.base.font;
-       inset.setDrawFrame(InsetText::NEVER);
+       //setDrawFrame(InsetText::NEVER);
        getDrawFont(pi.base.font);
-       inset.draw(pi, x, y);
+       InsetText::draw(pi, x, y);
        pi.base.font = tmpfont;
 
-       pi.pain.line(x + 2, y + inset.descent() - 4, x + 2,
-               y + inset.descent(), params_.labelfont.color());
-       pi.pain.line(x + 2, y + inset.descent(), x + dim_.wid - 2,
-               y + inset.descent(), params_.labelfont.color());
-       pi.pain.line(x + dim_.wid - 2, y + inset.descent(), x + dim_.wid - 2,
-               y + inset.descent() - 4, params_.labelfont.color());
+       pi.pain.line(x + 2, y + InsetText::descent() - 4, x + 2,
+               y + InsetText::descent(), params_.labelfont.color());
+       pi.pain.line(x + 2, y + InsetText::descent(), x + dim_.wid - 2,
+               y + InsetText::descent(), params_.labelfont.color());
+       pi.pain.line(x + dim_.wid - 2, y + InsetText::descent(), x + dim_.wid - 2,
+               y + InsetText::descent() - 4, params_.labelfont.color());
 
        if (has_label_) {
-               if (!owner())
-                       x += scroll();
-
-       LyXFont font(params_.labelfont);
-       font.realize(LyXFont(LyXFont::ALL_SANE));
-       font.decSize();
-       font.decSize();
-       int w = 0;
-       int a = 0;
-       int d = 0;
-       font_metrics::rectText(params_.type, font, w, a, d);
-       pi.pain.rectText(x + 0.5 * (dim_.wid - w), 
-               y + inset.descent() + a,
-               params_.type, font, LColor::none, LColor::none);
+               LyXFont font(params_.labelfont);
+               font.realize(LyXFont(LyXFont::ALL_SANE));
+               font.decSize();
+               font.decSize();
+               int w = 0;
+               int a = 0;
+               int d = 0;
+               font_metrics::rectText(params_.type, font, w, a, d);
+               pi.pain.rectText(x + (dim_.wid - w) / 2,
+                       y + InsetText::descent() + a,
+                       params_.type, font, LColor::none, LColor::none);
        }
 }
 
@@ -147,33 +144,31 @@ void InsetCharStyle::getDrawFont(LyXFont & font) const
 }
 
 
-DispatchResult
-InsetCharStyle::priv_dispatch(FuncRequest const & cmd,
-                       idx_type & idx, pos_type & pos)
+void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
        setStatus(Inlined);
        switch (cmd.action) {
                case LFUN_MOUSE_PRESS:
-                       if (cmd.button() == mouse_button::button3) {
+                       if (cmd.button() == mouse_button::button3)
                                has_label_ = !has_label_;
-                               return DispatchResult(true);
-                       }
-                       inset.dispatch(cmd);
-                       return DispatchResult(true, true);
+                       else
+                               InsetText::dispatch(cur, cmd);
                        break;
+
                default:
-                       return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+                       InsetCollapsable::priv_dispatch(cur, cmd);
+                       break;
        }
 }
 
 
 namespace {
 
-int outputVerbatim(std::ostream & os, InsetText inset)
+int outputVerbatim(std::ostream & os, InsetText const & inset)
 {
        int lines = 0;
-       ParagraphList::iterator par = inset.paragraphs().begin();
-       ParagraphList::iterator end = inset.paragraphs().end();
+       ParagraphList::const_iterator par = inset.paragraphs().begin();
+       ParagraphList::const_iterator end = inset.paragraphs().end();
        while (par != end) {
                lyx::pos_type siz = par->size();
                for (lyx::pos_type i = 0; i < siz; ++i) {
@@ -203,7 +198,7 @@ int InsetCharStyle::latex(Buffer const &, ostream & os,
        if (!params_.latexparam.empty())
                os << params_.latexparam;
        os << "{";
-       int i = outputVerbatim(os, inset);
+       int i = outputVerbatim(os, *this);
        os << "}%\n";
                i += 2;
        return i;
@@ -217,7 +212,7 @@ int InsetCharStyle::linuxdoc(Buffer const &, std::ostream & os,
        if (!params_.latexparam.empty())
                os << " " << params_.latexparam;
        os << ">";
-       int const i = outputVerbatim(os, inset);
+       int const i = outputVerbatim(os, *this);
        os << "</" << params_.latexname << ">";
        return i;
 }
@@ -230,16 +225,16 @@ int InsetCharStyle::docbook(Buffer const &, std::ostream & os,
        if (!params_.latexparam.empty())
                os << " " << params_.latexparam;
        os << ">";
-       int const i = outputVerbatim(os, inset);
+       int const i = outputVerbatim(os, *this);
        os << "</" << params_.latexname << ">";
        return i;
 }
 
 
 int InsetCharStyle::plaintext(Buffer const &, std::ostream & os,
-                             OutputParams const & runparams) const
+                             OutputParams const & /*runparams*/) const
 {
-       return outputVerbatim(os, inset);
+       return outputVerbatim(os, *this);
 }