Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index b2dbdad5ff181549e8b1debc11180dbcaedbed23..80453a92838d8746d1b98c63021480a77c86d7de 100644 (file)
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -6,36 +6,31 @@
  * \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
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "FormMathsSpace.h"
 #include "forms/form_maths_space.h"
-#include FORMS_H_LOCATION
+#include "ControlMath.h"
+#include "xformsBC.h"
+
+#include "lyx_forms.h"
 
 extern char * latex_mathspace[];
 
-FormMathsSpace::FormMathsSpace(LyXView & lv, Dialogs & d,
-                              FormMathsPanel const & p)
-       : FormMathsSub(lv, d, p, _("Maths Spacing"), false),
-         space_(-1)
-{}
+namespace lyx {
+namespace frontend {
 
+typedef FormController<ControlMath, FormView<FD_maths_space> > base_class;
 
-FL_FORM * FormMathsSpace::form() const
-{
-       if (dialog_.get())
-               return dialog_->form;
-       return 0;
-}
+FormMathsSpace::FormMathsSpace(Dialog & parent)
+       : base_class(parent, _("Math Spacing"), false),
+         space_(-1)
+{}
 
 
 void FormMathsSpace::build()
@@ -44,30 +39,35 @@ void FormMathsSpace::build()
 
        space_ = -1;
 
-       bc().setCancel(dialog_->button_close);
+       bcview().setCancel(dialog_->button_close);
 
-       bc().addReadOnly(dialog_->button_thin);
-       bc().addReadOnly(dialog_->button_medium);
-       bc().addReadOnly(dialog_->button_thick);
-       bc().addReadOnly(dialog_->button_negative);
-       bc().addReadOnly(dialog_->button_quadratin);
-       bc().addReadOnly(dialog_->button_twoquadratin);
+       bcview().addReadOnly(dialog_->button_negative);
+       bcview().addReadOnly(dialog_->button_negmedspace);
+       bcview().addReadOnly(dialog_->button_negthickspace);
+       bcview().addReadOnly(dialog_->button_thin);
+       bcview().addReadOnly(dialog_->button_medium);
+       bcview().addReadOnly(dialog_->button_thick);
+       bcview().addReadOnly(dialog_->button_quadratin);
+       bcview().addReadOnly(dialog_->button_twoquadratin);
 }
 
 
 void FormMathsSpace::apply()
 {
        if (space_ >= 0)
-               parent_.insertSymbol(latex_mathspace[space_]);
+               controller().dispatchInsert(latex_mathspace[space_]);
 }
 
-bool FormMathsSpace::input(FL_OBJECT *, long data)
+ButtonPolicy::SMInput FormMathsSpace::input(FL_OBJECT *, long data)
 {
        space_ = -1;
 
-       if (data >= 0 && data < 6) {
+       if (data >= 0 && data < 8) {
                space_ = short(data);
                apply();
        }
-       return true;
+       return ButtonPolicy::SMI_VALID;
 }
+
+} // namespace frontend
+} // namespace lyx