more IU

[lyx.git] / src / insets / insetref.C

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 959f3e903ce9182c52bba1e7e9b114db7253e30c..cbbd10371ec1151fe988d086be5dec4c3950ead5 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -12,7 +12,9 @@
 #include "insetref.h"
 
 #include "buffer.h"
+#include "cursor.h"
 #include "BufferView.h"
+#include "dispatchresult.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
@@ -29,37 +31,29 @@ using std::ostream;
 
 
 InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
-       : InsetCommand(p), isLatex(buf.isLatex())
+       : InsetCommand(p, "ref"), isLatex(buf.isLatex())
 {}
 
 
 InsetRef::InsetRef(InsetRef const & ir)
        : InsetCommand(ir), isLatex(ir.isLatex)
-{
-}
-
-
-InsetRef::~InsetRef()
-{
-       InsetCommandMailer("ref", *this).hideDialog();
-}
+{}
 
 
-dispatch_result
-InsetRef::priv_dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+InsetRef::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
 {
        switch (cmd.action) {
-       case LFUN_INSET_EDIT:
+       case LFUN_MOUSE_PRESS:
                // Eventually trigger dialog with button 3 not 1
                if (cmd.button() == mouse_button::button3)
-                       cmd.view()->owner()->
-                               dispatch(FuncRequest(LFUN_REF_GOTO, getContents()));
+                       cur.bv().owner()->dispatch(FuncRequest(LFUN_REF_GOTO, getContents()));
                else
-                       InsetCommandMailer("ref", *this).showDialog(cmd.view());
-               return DISPATCHED;
+                       InsetCommandMailer("ref", *this).showDialog(&cur.bv());
+               return DispatchResult(true, true);
 
        default:
-               return InsetCommand::priv_dispatch(cmd, idx, pos);
+               return InsetCommand::priv_dispatch(cur, cmd);
        }
 }
 
@@ -84,7 +78,7 @@ string const InsetRef::getScreenLabel(Buffer const &) const
 
 
 int InsetRef::latex(Buffer const &, ostream & os,
-                   LatexRunParams const &) const
+                   OutputParams const &) const
 {
        if (getOptions().empty())
                os << escape(getCommand());
@@ -96,14 +90,16 @@ int InsetRef::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetRef::ascii(Buffer const &, ostream & os, int) const
+int InsetRef::plaintext(Buffer const &, ostream & os,
+                   OutputParams const &) const
 {
        os << '[' << getContents() << ']';
        return 0;
 }
 
 
-int InsetRef::linuxdoc(Buffer const &, ostream & os) const
+int InsetRef::linuxdoc(Buffer const &, ostream & os,
+                      OutputParams const &) const
 {
        os << "<ref id=\"" << getContents()
           << "\" name=\"" << getOptions() << "\" >";
@@ -111,7 +107,8 @@ int InsetRef::linuxdoc(Buffer const &, ostream & os) const
 }
 
 
-int InsetRef::docbook(Buffer const &, ostream & os, bool) const
+int InsetRef::docbook(Buffer const &, ostream & os,
+                     OutputParams const &) const
 {
        if (getOptions().empty()) {
                os << "<xref linkend=\"" << getContents() << "\">";