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 eb422e29652cfc1c67b58a4ae6ae54a50981ba03..56e9a8f0c61db8a3ec92f1f46b7cabf3f91521f9 100644 (file)
--- a/src/frontends/xforms/FormMathsDeco.C
+++ b/src/frontends/xforms/FormMathsDeco.C
@@ -1,67 +1,74 @@
 /**
  * \file FormMathsDeco.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 Alejandro Aguilar Sierra
- * \author Pablo De Napoli, pdenapo@dm.uba.ar
- * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Pablo De Napoli
+ * \author John Levon
+ * \author Angus Leeming 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG_
+#ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include "ControlMath.h"
 #include "FormMathsDeco.h"
-#include "form_maths_deco.h"
-#include "Dialogs.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"
-};
-
-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"))
-{}
 
+typedef FormCB<ControlMathSub, FormDB<FD_maths_deco> > base_class;
 
-FL_FORM * FormMathsDeco::form() const
-{
-       if (dialog_.get())
-               return dialog_->form;
-       return 0;
-}
+FormMathsDeco::FormMathsDeco()
+       : base_class(_("Maths Decorations & Accents"), false)
+{}
 
 
 void FormMathsDeco::build()
 {
-       dialog_.reset(build_maths_deco());
+       dialog_.reset(build_maths_deco(this));
+
+       fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 4,
+                           deco1_width, deco1_height, deco1_bits);
+       fl_set_bmtable_maxitems(dialog_->bmtable_deco1, 12);
 
-       fl_set_bmtable_data(dialog_->bmtable, 3, 3,
-                           deco_width, deco_height, deco_bits);
-       fl_set_bmtable_maxitems(dialog_->bmtable, 8);
+       fl_set_bmtable_data(dialog_->bmtable_deco2, 4, 3,
+                           deco2_width, deco2_height, deco2_bits);
+       fl_set_bmtable_maxitems(dialog_->bmtable_deco2, 10);
 
-       bc().setCancel(dialog_->button_cancel);
-       bc().addReadOnly(dialog_->bmtable);
+       bc().setCancel(dialog_->button_close);
+       bc().addReadOnly(dialog_->bmtable_deco1);
+       bc().addReadOnly(dialog_->bmtable_deco2);
 }
 
 
 void FormMathsDeco::apply()
 {
-       int const i = fl_get_bmtable(dialog_->bmtable);
- 
-       if (i >= nr_decoration_names)
-               return;
- 
-       parent_.insertSymbol(decoration_names[i]);
+       if (deco_ < nr_latex_deco)
+               controller().insertSymbol(latex_deco[deco_]);
+}
+
+
+ButtonPolicy::SMInput FormMathsDeco::input(FL_OBJECT * ob, long)
+{
+       deco_ = fl_get_bmtable(ob);
+       if (deco_ < 0)
+               return ButtonPolicy::SMI_INVALID;
+       //if (ob == dialog_->bmtable_deco1)
+       //      deco_ += 0;
+       if (ob == dialog_->bmtable_deco2)
+               deco_ += 12;
+       apply();
+       return ButtonPolicy::SMI_VALID;
 }