Cleanup mouse/selection/context-menu interactions.

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 50d7e79cde222aeb0204cd62ee328ed7c5c81a50..ade0a22f49c6481f72be6a7b8a5e30d1856aadee 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -17,11 +17,9 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXAction.h"
@@ -33,73 +31,55 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <sstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-
-using std::endl;
-using std::min;
-
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-
-
-InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
-       : InsetCollapsable(bp, status)
-{}
-
 
-InsetERT::InsetERT(InsetERT const & in)
-       : InsetCollapsable(in)
+InsetERT::InsetERT(Buffer const & buf, CollapseStatus status)
+       : InsetCollapsable(buf, status)
 {}
 
 
-Inset * InsetERT::clone() const
-{
-       return new InsetERT(*this);
-}
-
-
 InsetERT::~InsetERT()
 {
        InsetERTMailer(*this).hideDialog();
 }
 
 
-void InsetERT::write(Buffer const & buf, ostream & os) const
+void InsetERT::write(ostream & os) const
 {
        os << "ERT" << "\n";
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-docstring const InsetERT::editMessage() const
+docstring InsetERT::editMessage() const
 {
        return _("Opened ERT Inset");
 }
 
 
-int InsetERT::latex(Buffer const & buf, odocstream & os,
-                   OutputParams const & op) const
+int InsetERT::latex(odocstream & os, OutputParams const & op) const
 {
-       return InsetCollapsable::latex(buf, os, op);
+       return InsetCollapsable::latex(os, op);
 }
 
 
-int InsetERT::plaintext(Buffer const &, odocstream &,
-                       OutputParams const &) const
+int InsetERT::plaintext(odocstream &, OutputParams const &) const
 {
        return 0; // do not output TeX code
 }
 
 
-int InsetERT::docbook(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+int InsetERT::docbook(odocstream & os, OutputParams const &) const
 {
        // FIXME can we do the same thing here as for LaTeX?
        ParagraphList::const_iterator par = paragraphs().begin();
@@ -124,20 +104,9 @@ int InsetERT::docbook(Buffer const &, odocstream & os,
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        BufferParams const & bp = cur.buffer().params();
-       LayoutPtr const layout =
-                       bp.getTextClass().defaultLayout();
+       Layout const layout = bp.documentClass().emptyLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
-
-       case LFUN_MOUSE_PRESS:
-               if (cmd.button() != mouse_button::button3)
-                       InsetCollapsable::doDispatch(cur, cmd);
-               else
-                       // This makes the cursor leave the
-                       // inset when it collapses on mouse-3
-                       cur.undispatched();
-               break;
-
        case LFUN_QUOTE_INSERT: {
                // We need to bypass the fancy quotes in Text
                FuncRequest f(LFUN_SELF_INSERT, "\"");
@@ -157,8 +126,8 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
                // start of an existing paragraph get the buffer language
                // and not latex_language, so we take this brute force
                // approach.
-               cur.current_font.fontInfo() = layout->font;
-               cur.real_current_font.fontInfo() = layout->font;
+               cur.current_font.fontInfo() = layout.font;
+               cur.real_current_font.fontInfo() = layout.font;
                InsetCollapsable::doDispatch(cur, cmd);
                break;
        }
@@ -195,8 +164,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetERT::setButtonLabel()
 {
-       // FIXME UNICODE
-       if (decoration() == Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
        else
                setLabel(getNewLabel(_("ERT")));