* \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>
-
#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 "controllers/ButtonController.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
-#include FORMS_H_LOCATION
+using std::ostringstream;
#include "delim.xbm"
#include "delim0.xpm"
#include "delim1.xpm"
-static int const delim_rversion[] = {
-1,1,3,3,4,5,7,7,9,9,10,11,
+namespace {
+int const delim_rversion[] = {
+ 1,1,3,3,4,5,7,7,9,9,10,11,
+ 3,13,15,15,16,17,19,19,20,21,22
};
+int const delim_size =
+ sizeof(delim_rversion) / sizeof(delim_rversion[0]);
-
-static char const * delim_values[] = {
+char const * delim_values[] = {
"(", ")", "lceil", "rceil", "uparrow", "Uparrow",
"[", "]", "lfloor", "rfloor", "updownarrow", "Updownarrow",
"{", "}", "/", "backslash", "downarrow", "Downarrow",
"langle", "rangle", "|", "Vert", ".", 0
};
-using std::endl;
+
+} // namespace anon
-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)
{}
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);
}
ostringstream os;
os << delim_values[left] << ' ' << delim_values[right];
- controller().dispatchFunc(LFUN_MATH_DELIM, STRCONV(os.str()));
+ controller().dispatchDelim(os.str());
}
if (both) {
right = delim_rversion[i];
// Add left delimiter in "both" case if right one was pressed:
- for (int j = 0; j <= 23; ++j) {
+ for (int j = 0; j < delim_size; ++j) {
if (delim_rversion[j] == left) {
right = left;
left = j;