Replace LString.h with support/std_string.h,

[features.git] / src / frontends / xforms / FormMathsDelim.C

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 2707032fa0f257d9a481c2b0ae74b6f829500826..2415e74902e2c71c81527cda4c8e4cc701ffe39f 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -8,27 +8,21 @@
  * \author John Levon
  * \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 "FormMathsDelim.h"
 #include "forms/form_maths_delim.h"
 #include "ControlMath.h"
-#include "xformsBC.h"
 
 #include "bmtable.h"
+#include "xformsBC.h"
 
-#include "support/lstrings.h"
-
-#include "Lsstream.h"
+#include "controllers/ButtonController.h"
 
-#include FORMS_H_LOCATION
+#include "support/std_sstream.h"
 
 #include "delim.xbm"
 #include "delim0.xpm"
@@ -36,8 +30,8 @@
 
 
 static int const delim_rversion[] = {
-       1,1,3,3,4,5,7,7,9,9,10,11,
-       13,13,14,15,16,17,19,19,20,21,22,23
+1,1,3,3,4,5,7,7,9,9,10,11,
+
 };
 
 
@@ -51,10 +45,10 @@ static char const * delim_values[] = {
 using std::endl;
 
 
-typedef FormCB<ControlMathSub, FormDB<FD_maths_delim> > base_class;
+typedef FormController<ControlMath, FormView<FD_maths_delim> > base_class;
 
-FormMathsDelim::FormMathsDelim()
-       : base_class(_("Maths Delimiters"), false)
+FormMathsDelim::FormMathsDelim(Dialog & parent)
+       : base_class(parent, _("Math Delimiters"), false)
 {}
 
 
@@ -73,15 +67,15 @@ void FormMathsDelim::build()
                            delim_width, delim_height, delim_bits);
        fl_set_bmtable_maxitems(dialog_->bmtable, 23);
 
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_close);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
 
-       bc().addReadOnly(dialog_->bmtable);
-       bc().addReadOnly(dialog_->radio_right);
-       bc().addReadOnly(dialog_->radio_left);
-       bc().addReadOnly(dialog_->radio_both);
-       bc().addReadOnly(dialog_->button_pix);
+       bcview().addReadOnly(dialog_->bmtable);
+       bcview().addReadOnly(dialog_->radio_right);
+       bcview().addReadOnly(dialog_->radio_left);
+       bcview().addReadOnly(dialog_->radio_both);
+       bcview().addReadOnly(dialog_->button_pix);
 }
 
 
@@ -92,7 +86,7 @@ void FormMathsDelim::apply()
 
        ostringstream os;
        os << delim_values[left] << ' ' << delim_values[right];
-       controller().dispatchFunc(LFUN_MATH_DELIM, STRCONV(os.str()));
+       controller().dispatchDelim(STRCONV(os.str()));
 }