Yet more dialog tweaking from Rob.

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

diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index 6946a6e919b9b0193df70282edeae1d85d39ecd7..b2dbdad5ff181549e8b1debc11180dbcaedbed23 100644 (file)
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -1,28 +1,31 @@
 /**
  * \file FormMathsSpace.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 "FormMathsSpace.h"
-#include "form_maths_space.h"
+#include "forms/form_maths_space.h"
+#include FORMS_H_LOCATION
 
 extern char * latex_mathspace[];
 
-FormMathsSpace::FormMathsSpace(LyXView * lv, Dialogs * d,
+FormMathsSpace::FormMathsSpace(LyXView & lv, Dialogs & d,
                               FormMathsPanel const & p)
-       : FormMathsSub(lv, d, p, _("Maths Spacing")),
+       : FormMathsSub(lv, d, p, _("Maths Spacing"), false),
          space_(-1)
 {}
 
@@ -30,42 +33,41 @@ FormMathsSpace::FormMathsSpace(LyXView * lv, Dialogs * d,
 FL_FORM * FormMathsSpace::form() const
 {
        if (dialog_.get())
-               return dialog_->form;
+               return dialog_->form;
        return 0;
 }
 
 
 void FormMathsSpace::build()
 {
-       dialog_.reset(build_maths_space());
+       dialog_.reset(build_maths_space(this));
 
-       fl_set_button(dialog_->radio_thin, 1);
+       space_ = -1;
 
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_cancel);
+       bc().setCancel(dialog_->button_close);
 
-       bc().addReadOnly(dialog_->radio_thin);
-       bc().addReadOnly(dialog_->radio_medium);
-       bc().addReadOnly(dialog_->radio_thick);
-       bc().addReadOnly(dialog_->radio_negative);
-       bc().addReadOnly(dialog_->radio_quadratin);
-       bc().addReadOnly(dialog_->radio_twoquadratin);
+       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);
 }
 
 
 void FormMathsSpace::apply()
 {
-       if (space_ > 0)
+       if (space_ >= 0)
                parent_.insertSymbol(latex_mathspace[space_]);
 }
 
 bool FormMathsSpace::input(FL_OBJECT *, long data)
 {
        space_ = -1;
- 
+
        if (data >= 0 && data < 6) {
                space_ = short(data);
+               apply();
        }
        return true;
 }