* \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 "FormMathsMatrix.h"
#include "forms/form_maths_matrix.h"
#include "ControlMath.h"
+
#include "xformsBC.h"
-#include "support/LAssert.h"
+#include "controllers/ButtonController.h"
+
#include "support/lyxalgo.h" // lyx::count
-#include "Lsstream.h"
+#include "lyx_forms.h"
+
+#include "support/std_sstream.h"
-#include FORMS_H_LOCATION
-#include <algorithm>
+using std::ostringstream;
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
char const * cur, int c)
{
- lyx::Assert(ob);
+ BOOST_ASSERT(ob);
FormMathsMatrix * pre =
static_cast<FormMathsMatrix *>(ob->u_vdata);
- lyx::Assert(pre);
+ BOOST_ASSERT(pre);
return pre->AlignFilter(cur, c);
}
}
-typedef FormCB<ControlMathSub, FormDB<FD_maths_matrix> > base_class;
+typedef FormController<ControlMath, FormView<FD_maths_matrix> > base_class;
-FormMathsMatrix::FormMathsMatrix()
- : base_class(_("Maths Matrix"), false)
+FormMathsMatrix::FormMathsMatrix(Dialog & parent)
+ : base_class(parent, _("Math Matrix"), false)
{}
{
dialog_.reset(build_maths_matrix(this));
- fl_addto_choice(dialog_->choice_valign, _("Top | Center | Bottom"));
+ fl_addto_choice(dialog_->choice_valign,
+ _("Top | Middle | Bottom").c_str());
fl_set_choice(dialog_->choice_valign, 2);
fl_set_input(dialog_->input_halign, h_align_str);
dialog_->input_halign->u_vdata = this;
C_FormMathsMatrixAlignFilter);
setPrehandler(dialog_->input_halign);
- 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_->slider_rows);
- bc().addReadOnly(dialog_->slider_columns);
- bc().addReadOnly(dialog_->choice_valign);
- bc().addReadOnly(dialog_->input_halign);
+ bcview().addReadOnly(dialog_->slider_rows);
+ bcview().addReadOnly(dialog_->slider_columns);
+ bcview().addReadOnly(dialog_->choice_valign);
+ bcview().addReadOnly(dialog_->input_halign);
}
ostringstream os;
os << nx << ' ' << ny << ' ' << c << ' ' << sh;
- controller().dispatchFunc(LFUN_INSERT_MATRIX, STRCONV(os.str()));
+ controller().dispatchMatrix(os.str());
}