Require a buffer on construction of InsetGraphics and InsetExternal. Eventually,...

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index aea6976a526561b70aa3bdb6a127a1862416ff40..244467ac86aa6bb0542b393af62f01bbc5d994c2 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -18,13 +18,11 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "OutputParams.h"
@@ -33,21 +31,18 @@
 
 #include "support/convert.h"
 #include "support/docstream.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::endl;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
 
-
-InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
-       : InsetCollapsable(bp), name_(from_utf8(type))
+InsetWrap::InsetWrap(Buffer const & buf, string const & type)
+       : InsetCollapsable(buf), name_(from_utf8(type))
 {
-       setLabel(_("wrap: ") + floatName(type, bp));
+       setLabel(_("wrap: ") + floatName(type, buf.params()));
        params_.type = type;
        params_.lines = 0;
        params_.placement = "o";
@@ -79,15 +74,6 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetWrapMailer(*this).updateDialog(&cur.bv());
                break;
 
-       case LFUN_MOUSE_RELEASE: {
-               if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
-                       InsetWrapMailer(*this).showDialog(&cur.bv());
-                       break;
-               }
-               InsetCollapsable::doDispatch(cur, cmd);
-               break;
-       }
-
        default:
                InsetCollapsable::doDispatch(cur, cmd);
                break;
@@ -110,17 +96,18 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(Buffer const & buf, ParIterator const & it)
+void InsetWrap::updateLabels(ParIterator const & it)
 {
-       Counters & cnts = buf.params().getTextClass().counters();
+       setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
+       Counters & cnts = buffer().params().documentClass().counters();
        string const saveflt = cnts.current_float();
 
        // Tell to captions what the current float is
        cnts.current_float(params().type);
 
-       InsetCollapsable::updateLabels(buf, it);
+       InsetCollapsable::updateLabels(it);
 
-       //reset afterwards
+       // reset afterwards
        cnts.current_float(saveflt);
 }
 
@@ -183,17 +170,17 @@ void InsetWrapParams::read(Lexer & lex)
 }
 
 
-void InsetWrap::write(Buffer const & buf, ostream & os) const
+void InsetWrap::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-void InsetWrap::read(Buffer const & buf, Lexer & lex)
+void InsetWrap::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(buf, lex);
+       InsetCollapsable::read(lex);
 }
 
 
@@ -204,20 +191,13 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetWrap::clone() const
-{
-       return new InsetWrap(*this);
-}
-
-
-docstring const InsetWrap::editMessage() const
+docstring InsetWrap::editMessage() const
 {
        return _("Opened Wrap Inset");
 }
 
 
-int InsetWrap::latex(Buffer const & buf, odocstream & os,
-                    OutputParams const & runparams) const
+int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
 {
        os << "\\begin{wrap" << from_ascii(params_.type) << '}';
        // no optional argument when lines are zero
@@ -229,29 +209,28 @@ int InsetWrap::latex(Buffer const & buf, odocstream & os,
        if (over.value() != 0)
                os << '[' << from_ascii(params_.overhang.asLatexString()) << ']';
        os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n";
-       int const i = InsetText::latex(buf, os, runparams);
+       int const i = InsetText::latex(os, runparams);
        os << "\\end{wrap" << from_ascii(params_.type) << "}%\n";
        return i + 2;
 }
 
 
-int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams) const
+int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const
 {
-       os << '[' << buf.B_("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
-       InsetText::plaintext(buf, os, runparams);
+       os << '[' << buffer().B_("wrap") << ' '
+               << floatName(params_.type, buffer().params()) << ":\n";
+       InsetText::plaintext(os, runparams);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetWrap::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 {
        // FIXME UNICODE
        os << '<' << from_ascii(params_.type) << '>';
-       int const i = InsetText::docbook(buf, os, runparams);
+       int const i = InsetText::docbook(os, runparams);
        os << "</" << from_ascii(params_.type) << '>';
        return i;
 }