X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormMathsPanel.h;h=48427cff873588a3ea6258205d798921edbd202b;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=1c5a65ef7fd6b82ad3bfe469b91d435cbc72aba1;hpb=a97c4f51c3763ec213ecf84b4badec0bba8c0f60;p=lyx.git

diff --git a/src/frontends/xforms/FormMathsPanel.h b/src/frontends/xforms/FormMathsPanel.h
index 1c5a65ef7f..48427cff87 100644
--- a/src/frontends/xforms/FormMathsPanel.h
+++ b/src/frontends/xforms/FormMathsPanel.h
@@ -1,127 +1,49 @@
 // -*- C++ -*-
 /**
  * \file FormMathsPanel.h
- * 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 John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author John Levon
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORM_MATHSPANEL_H
 #define FORM_MATHSPANEL_H
 
-#include "commandtags.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBaseDeprecated.h"
-#include "MathsSymbols.h"
+#include "FormDialogView.h"
 
-#include <boost/scoped_ptr.hpp>
+namespace lyx {
+namespace frontend {
 
-class FormMathsBitmap;
-class FormMathsDeco;
-class FormMathsDelim;
-class FormMathsMatrix;
-class FormMathsSpace;
-class FormMathsStyle;
-class FormMathsSub;
+class ControlMath;
 struct FD_maths_panel;
 
 /**
  * This class provides an XForms implementation of the maths panel.
  */
-class FormMathsPanel : public FormBaseBD {
+class FormMathsPanel
+	: public FormController<ControlMath, FormView<FD_maths_panel> > {
 public:
 	///
-	FormMathsPanel(LyXView *, Dialogs *);
-	///
-	void setActive(FormMathsSub *) const;
-	/// dispatch a symbol insert
-	void insertSymbol(string const & sym, bool bs = true) const;
-	/// dispatch an LFUN:
-	void dispatchFunc(kb_action action) const;
-private:
-	/// Pointer to the actual instantiation of the ButtonController.
-	virtual xformsBC & bc();
-
-	/// Build the dialog
-	virtual void build();
-	/// input handler
-	virtual bool input(FL_OBJECT *, long);
-
-	/// Pointer to the actual instantiation of the xforms form
-	virtual FL_FORM * form() const;
-
-	// Real GUI implementation
-	boost::scoped_ptr<FD_maths_panel> dialog_;
-
-	/// send LFUN_MATH_DISPLAY
-	void mathDisplay() const;
-
-	/// Subdialogs
-	boost::scoped_ptr<FormMathsDeco>   deco_;
-	boost::scoped_ptr<FormMathsDelim>  delim_;
-	boost::scoped_ptr<FormMathsMatrix> matrix_;
-	boost::scoped_ptr<FormMathsSpace>  space_;
-	boost::scoped_ptr<FormMathsStyle>  style_;
-	boost::scoped_ptr<FormMathsBitmap> arrow_;
-	boost::scoped_ptr<FormMathsBitmap> boperator_;
-	boost::scoped_ptr<FormMathsBitmap> brelats_;
-	boost::scoped_ptr<FormMathsBitmap> greek_;
-	boost::scoped_ptr<FormMathsBitmap> misc_;
-	boost::scoped_ptr<FormMathsBitmap> dots_;
-	boost::scoped_ptr<FormMathsBitmap> varsize_;
-	boost::scoped_ptr<FormMathsBitmap> ams_misc_;
-	boost::scoped_ptr<FormMathsBitmap> ams_arrows_;
-	boost::scoped_ptr<FormMathsBitmap> ams_rel_;
-	boost::scoped_ptr<FormMathsBitmap> ams_nrel_;
-	boost::scoped_ptr<FormMathsBitmap> ams_ops_;
+	FormMathsPanel(Dialog &);
 
-	/// A pointer to the currently active subdialog
-	mutable FormMathsSub * active_;
-
-	/// The ButtonController
-	ButtonController<OkCancelReadOnlyPolicy, xformsBC> bc_;
-};
-
-
-class FormMathsSub : public FormBaseBD {
-	friend class FormMathsPanel; // has subdialogs to manipulate
-
-public:
+private:
+	/// Not needed.
+	virtual void apply() {}
 	///
-	FormMathsSub(LyXView *, Dialogs *, FormMathsPanel const &,
-		     string const &, bool allowResize=true);
+	virtual void update() {}
 
-protected:
-	/// Pointer to the actual instantiation of the ButtonController.
-	virtual xformsBC & bc();
-	/// The parent Maths Panel
-	FormMathsPanel const & parent_;
-private:
 	///
-	virtual void connect();
+	virtual void build();
 	///
-	virtual void disconnect();
-	/// The ButtonController
-	ButtonController<IgnorantPolicy, xformsBC> bc_;
+	virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 };
 
+} // namespace frontend
+} // namespace lyx
 
-inline
-xformsBC & FormMathsSub::bc()
-{
-	return bc_;
-}
-
-inline
-xformsBC & FormMathsPanel::bc()
-{
-	return bc_;
-}
 #endif //  FORM_MATHSPANEL_H