remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C
index 4837052b2786833214b82285c943a642183b9bd9..155dbb9b4c35ed02078541eb4cdf9a02d2f23b42 100644 (file)
--- a/src/frontends/xforms/FormMathsStyle.C
+++ b/src/frontends/xforms/FormMathsStyle.C
@@ -1,11 +1,12 @@
 /**
  * \file FormMathsStyle.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
  * \author John Levon
- * \author Angus Leeming 
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS
  * Adapted from FormMathsSpace martin.vermeer@hut.fi
@@ -13,15 +14,13 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "FormMathsStyle.h"
 #include "forms/form_maths_style.h"
-#include "bmtable.h"
+#include "ControlMath.h"
+#include "xformsBC.h"
 
-#include "debug.h"
+#include "bmtable.h"
 
 #include FORMS_H_LOCATION
 
@@ -34,26 +33,18 @@ char const * latex_mathstyle[] = {
 
 kb_action latex_mathfontcmds[] = {
        LFUN_BOLD, LFUN_SANS, LFUN_ROMAN, LFUN_ITAL, LFUN_CODE,
-       LFUN_NOUN, LFUN_FRAK, LFUN_EMPH, LFUN_FREE, LFUN_DEFAULT
+       LFUN_NOUN, LFUN_FRAK, LFUN_EMPH, LFUN_FREEFONT_APPLY, LFUN_DEFAULT
 };
 
 
+typedef FormCB<ControlMathSub, FormDB<FD_maths_style> > base_class;
 
-FormMathsStyle::FormMathsStyle(LyXView & lv, Dialogs & d,
-                              FormMathsPanel const & p)
-       : FormMathsSub(lv, d, p, _("Maths Styles & Fonts"), false),
+FormMathsStyle::FormMathsStyle()
+       : base_class(_("Maths Styles & Fonts"), false),
          style_(-1)
 {}
 
 
-FL_FORM * FormMathsStyle::form() const
-{
-       if (dialog_.get())
-               return dialog_->form;
-       return 0;
-}
-
-
 void FormMathsStyle::build()
 {
        dialog_.reset(build_maths_style(this));
@@ -61,45 +52,47 @@ void FormMathsStyle::build()
        fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1,
                            style1_width, style1_height, style1_bits);
        fl_set_bmtable_maxitems(dialog_->bmtable_style1, 1);
-       bc().addReadOnly(dialog_->bmtable_style1);
+       bcview().addReadOnly(dialog_->bmtable_style1);
 
        fl_set_bmtable_data(dialog_->bmtable_style2, 1, 3,
                            style2_width, style2_height, style2_bits);
        fl_set_bmtable_maxitems(dialog_->bmtable_style2, 3);
-       bc().addReadOnly(dialog_->bmtable_style2);
+       bcview().addReadOnly(dialog_->bmtable_style2);
 
        fl_set_bmtable_data(dialog_->bmtable_font1, 1, 5,
                            font1_width, font1_height, font1_bits);
        fl_set_bmtable_maxitems(dialog_->bmtable_font1, 5);
-       bc().addReadOnly(dialog_->bmtable_font1);
+       bcview().addReadOnly(dialog_->bmtable_font1);
 
        fl_set_bmtable_data(dialog_->bmtable_font2, 1, 3,
                            font2_width, font2_height, font2_bits);
        fl_set_bmtable_maxitems(dialog_->bmtable_font2, 3);
-       bc().addReadOnly(dialog_->bmtable_font2);
+       bcview().addReadOnly(dialog_->bmtable_font2);
 
-       bc().setCancel(dialog_->button_close);
+       bcview().setCancel(dialog_->button_close);
 }
 
 
 void FormMathsStyle::apply()
 {
        if ((style_ >= 0) && (style_ < 4))
-               parent_.insertSymbol(latex_mathstyle[style_]);
+               controller().insertSymbol(latex_mathstyle[style_]);
        else if ((style_ >= 4) && (style_ < 14))
-               parent_.dispatchFunc(latex_mathfontcmds[style_ - 4]);
+               controller().dispatchFunc(latex_mathfontcmds[style_-4]);
 }
 
 
-bool FormMathsStyle::input(FL_OBJECT * ob, long data)
+ButtonPolicy::SMInput FormMathsStyle::input(FL_OBJECT * ob, long data)
 {
        style_ = fl_get_bmtable(ob);
-       if (style_ < 0) return false;
+       if (style_ < 0) return ButtonPolicy::SMI_INVALID;
+
        //if (ob == dialog_->bmtable_style1) style_ += 0;
        if (ob == dialog_->bmtable_style2) style_ += 1;
        if (ob == dialog_->bmtable_font1)  style_ += 4;
        if (ob == dialog_->bmtable_font2)  style_ += 9;
        if (data >= 12) style_ = short(data);
        apply();
-       return true;
+
+       return ButtonPolicy::SMI_VALID;
 }