Tiny clean-ups.

[lyx.git] / src / frontends / xforms / FormMathsBitmap.h

diff --git a/src/frontends/xforms/FormMathsBitmap.h b/src/frontends/xforms/FormMathsBitmap.h
index 82f0e854220d0b618bfa723bc7e5acc209de1ba9..375f4e87769ba21907998fffe4fdde7d422ed9b1 100644 (file)
--- a/src/frontends/xforms/FormMathsBitmap.h
+++ b/src/frontends/xforms/FormMathsBitmap.h
@@ -6,23 +6,18 @@
  *
  * \author Alejandro Aguilar Sierra
  * \author John Levon
- * \author Angus Leeming 
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORM_MATHSBITMAP_H
 #define FORM_MATHSBITMAP_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-#include <boost/shared_ptr.hpp>
+#include "FormDialogView.h"
 #include <vector>
 
-struct BitmapStore 
+struct BitmapStore
 {
        BitmapStore(int nt_in, int nx_in, int ny_in, int bw_in, int bh_in,
                    unsigned char const * data_in, bool vert_in)
@@ -40,7 +35,7 @@ struct BitmapStore
 };
 
 
-struct FD_maths_bitmap 
+struct FD_maths_bitmap
 {
        ~FD_maths_bitmap();
        FL_FORM * form;
@@ -52,16 +47,15 @@ struct FD_maths_bitmap
  * This class provides an XForms implementation of a maths bitmap form.
  */
 
-class ControlMathSub;
+class ControlMath;
 
-class FormMathsBitmap : public FormCB<ControlMathSub, FormDB<FD_maths_bitmap> >
-{
+class FormMathsBitmap
+       : public FormController<ControlMath, FormView<FD_maths_bitmap> > {
 public:
        ///
-       FormMathsBitmap(string const &, std::vector<string> const &);
+       FormMathsBitmap(Dialog &, std::string const &, std::vector<std::string> const &);
        ///
-       void addBitmap(int, int, int, int, int, unsigned char const *,
-                      bool = true);
+       void addBitmap(BitmapStore const &);
 
 private:
        ///
@@ -80,9 +74,9 @@ private:
        FL_OBJECT * buildBitmap(BitmapStore const & bmstore);
 
        /// The latex names associated with each symbol
-       std::vector<string> latex_;
+       std::vector<std::string> latex_;
        /// The latex name chosen
-       string latex_chosen_;
+       std::string latex_chosen_;
 
        /** Temporary store for bitmap data passed to addBitmap()
         *  but before the FL_OBJECT is created in build().