Yet more dialog tweaking from Rob.

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

diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C
index a45f10c6ff955155cc0a7a2fa03800b5fc6c88a9..d94196dcf2a25184809c52bf6f0db2afff68fa76 100644 (file)
--- a/src/frontends/xforms/FormThesaurus.C
+++ b/src/frontends/xforms/FormThesaurus.C
@@ -1,9 +1,11 @@
 /**
  * \file FormThesaurus.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Edwin Leuven
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -12,14 +14,15 @@
 #pragma implementation
 #endif
 
-#include <cctype>
-#include "support/lstrings.h"
-#include "xformsBC.h"
-#include "xforms_helpers.h"
 #include "ControlThesaurus.h"
 #include "FormThesaurus.h"
-#include "form_thesaurus.h"
+#include "forms/form_thesaurus.h"
+#include "xformsBC.h"
+#include "xforms_helpers.h"
 #include "debug.h"
+#include "support/lstrings.h"
+#include FORMS_H_LOCATION
+#include <cctype>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::isupper;
@@ -29,11 +32,11 @@ using std::islower;
 using std::vector;
 
 
-typedef FormCB<ControlThesaurus, FormDB<FD_form_thesaurus> > base_class;
+typedef FormCB<ControlThesaurus, FormDB<FD_thesaurus> > base_class;
 
 
-FormThesaurus::FormThesaurus(ControlThesaurus & c)
-       : base_class(c, _("LyX: Thesaurus"), false),
+FormThesaurus::FormThesaurus()
+       : base_class(_("Thesaurus"), false),
          clickline_(-1)
 {
 }
@@ -41,7 +44,7 @@ FormThesaurus::FormThesaurus(ControlThesaurus & c)
 
 void FormThesaurus::build()
 {
-       dialog_.reset(build_thesaurus());
+       dialog_.reset(build_thesaurus(this));
 
        fl_set_input_return(dialog_->input_entry,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_replace, FL_RETURN_CHANGED);
@@ -149,7 +152,7 @@ void FormThesaurus::setReplace(string const & templ, string const & nstr)
 ButtonPolicy::SMInput FormThesaurus::input(FL_OBJECT * obj, long)
 {
        if (obj == dialog_->input_entry) {
-               string s = strip(frontStrip(fl_get_input(dialog_->input_entry)));
+               string s = trim(fl_get_input(dialog_->input_entry));
 
                updateMeanings(s);
 
@@ -173,7 +176,7 @@ ButtonPolicy::SMInput FormThesaurus::input(FL_OBJECT * obj, long)
        int const line = fl_get_browser(obj);
        if (line > 0) {
                setReplace(fl_get_input(dialog_->input_entry),
-                          strip(frontStrip(fl_get_browser_line(obj, line))));
+                          trim(fl_get_browser_line(obj, line)));
        }
 
        if (clickline_ == fl_get_browser(obj)) {