fix crash with "save as"

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

diff --git a/src/frontends/xforms/FormMathsDeco.C b/src/frontends/xforms/FormMathsDeco.C
index f24031c5805b598becff8422c54a6b739faa2d62..56e9a8f0c61db8a3ec92f1f46b7cabf3f91521f9 100644 (file)
--- a/src/frontends/xforms/FormMathsDeco.C
+++ b/src/frontends/xforms/FormMathsDeco.C
@@ -1,6 +1,7 @@
 /**
  * \file FormMathsDeco.C
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
  * \author Pablo De Napoli
@@ -16,40 +17,24 @@
 #pragma implementation
 #endif
 
+#include "ControlMath.h"
 #include "FormMathsDeco.h"
 #include "forms/form_maths_deco.h"
+#include "xformsBC.h"
+
 #include "bmtable.h"
 #include FORMS_H_LOCATION
 
 #include "deco.xbm"
 
 
-static char const * decoration_names[] = {
-       "widehat", "widetilde", "overbrace", "overleftarrow", "overrightarrow",
-       "overline", "underbrace", "underline", "underleftarrow", "underrightarrow",
-       "underleftrightarrow", "overleftrightarrow",
-       "hat", "acute", "bar", "dot",
-       "check", "grave", "vec", "ddot",
-       "breve", "tilde"
-};
-
+typedef FormCB<ControlMathSub, FormDB<FD_maths_deco> > base_class;
 
-static int const nr_decoration_names = sizeof(decoration_names) / sizeof(char const *);
-
-FormMathsDeco::FormMathsDeco(LyXView & lv, Dialogs & d,
-                            FormMathsPanel const & p)
-       : FormMathsSub(lv, d, p, _("Maths Decorations & Accents"), false)
+FormMathsDeco::FormMathsDeco()
+       : base_class(_("Maths Decorations & Accents"), false)
 {}
 
 
-FL_FORM * FormMathsDeco::form() const
-{
-       if (dialog_.get())
-               return dialog_->form;
-       return 0;
-}
-
-
 void FormMathsDeco::build()
 {
        dialog_.reset(build_maths_deco(this));
@@ -70,20 +55,20 @@ void FormMathsDeco::build()
 
 void FormMathsDeco::apply()
 {
-       if (deco_ < nr_decoration_names)
-               parent_.insertSymbol(decoration_names[deco_]);
+       if (deco_ < nr_latex_deco)
+               controller().insertSymbol(latex_deco[deco_]);
 }
 
 
-bool FormMathsDeco::input(FL_OBJECT * ob, long)
+ButtonPolicy::SMInput FormMathsDeco::input(FL_OBJECT * ob, long)
 {
        deco_ = fl_get_bmtable(ob);
        if (deco_ < 0)
-               return false;
+               return ButtonPolicy::SMI_INVALID;
        //if (ob == dialog_->bmtable_deco1)
        //      deco_ += 0;
        if (ob == dialog_->bmtable_deco2)
                deco_ += 12;
        apply();
-       return true;
+       return ButtonPolicy::SMI_VALID;
 }