Yet more dialog tweaking from Rob.

[lyx.git] / src / frontends / xforms / FormSendto.C

diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index 78101b2852176083b7f097b9f79f2d607a2faab2..c226dd5b4d84ad4f98b25a75ab2486acca153fd2 100644 (file)
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -1,9 +1,11 @@
-/*
+/**
  * \file FormSendto.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Angus Leeming 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -13,26 +15,27 @@
 #endif
 
 #include "FormSendto.h"
-#include "form_sendto.h"
+#include "forms/form_sendto.h"
 #include "ControlSendto.h"
 #include "xformsBC.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
 #include "converter.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 using std::vector;
 
-typedef FormCB<ControlSendto, FormDB<FD_form_sendto> > base_class;
+typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
 
-FormSendto::FormSendto(ControlSendto & c)
-       : base_class(c, _("Send document to command"))
+FormSendto::FormSendto()
+       : base_class(_("Send document to command"))
 {}
 
 
 void FormSendto::build()
 {
-       dialog_.reset(build_sendto());
+       dialog_.reset(build_sendto(this));
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_command);
@@ -68,7 +71,7 @@ void FormSendto::update()
        }
 
        vector<string> const browser_keys =
-               getVectorFromBrowser(dialog_->browser_formats);
+               getVector(dialog_->browser_formats);
 
        if (browser_keys == keys)
                return;
@@ -91,8 +94,8 @@ ButtonPolicy::SMInput FormSendto::input(FL_OBJECT *, long)
        if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
                return ButtonPolicy::SMI_INVALID;
 
-       string cmd = getStringFromInput(dialog_->input_command);
-       cmd = strip(frontStrip(cmd));
+       string cmd = getString(dialog_->input_command);
+       cmd = trim(cmd);
        if (cmd.empty())
                return ButtonPolicy::SMI_INVALID;
 
@@ -106,7 +109,7 @@ void FormSendto::apply()
        if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
                return;
 
-       string const cmd = getStringFromInput(dialog_->input_command);
+       string const cmd = getString(dialog_->input_command);
 
        controller().setFormat(all_formats_[line-1]);
        controller().setCommand(cmd);