Hopefully fix the problem with stateText() in lyxfont.C

[lyx.git] / src / mathed / formulamacro.h

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index d2ce795473ec8e64d7effa404d8acd0596599d42..6daeb3d9ff5b6b4487629c2001923cb1201fc214 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -6,7 +6,7 @@
  *  Created:     January 1996
  *  Description: Allows the edition of math paragraphs inside Lyx. 
  *
- *  Copyright: (c) 1996, Alejandro Aguilar Sierra
+ *  Copyright: 1996, Alejandro Aguilar Sierra
  *
  *  Version: 0.4, Lyx project.
  *
@@ -32,10 +32,10 @@ public:
        ///
        InsetFormulaMacro();
        ///
+       explicit
        InsetFormulaMacro(string name, int na = 0, bool env = false);
        ///
        ~InsetFormulaMacro();
-#ifdef USE_PAINTER
        ///
        int ascent(Painter &, LyXFont const &) const;
        ///
@@ -44,42 +44,32 @@ public:
        int width(Painter &, LyXFont const &) const;
        ///
        void draw(Painter &, LyXFont const &, int baseline, float & x) const;
-#else
-       ///
-       int Ascent(LyXFont const & font) const;
-       ///
-       int Descent(LyXFont const & font) const;
-       ///
-       int Width(LyXFont const & font) const;
-       ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
-#endif
        ///
        void Read(LyXLex & lex);
         ///
-       void Write(ostream & os);
-       ///
-       int Latex(ostream & os, signed char fragile);
+       void Write(std::ostream & os) const;
        ///
-       int Latex(string & file, signed char fragile);
+       int Latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Linuxdoc(string & file);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(string & file);
+       int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
 
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const {return _("Math macro editor mode");}
+       char const * EditMessage() const;
        ///
-       void Edit(int x, int y);
+       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       void InsetUnlock();
+       void InsetUnlock(BufferView *);
        ///
-       bool LocalDispatch(int, char const *);
+       RESULT LocalDispatch(BufferView *, int, string const &);
+
 protected:
        ///
-       void UpdateLocal();
+       //void UpdateLocal();
+
 private:
        ///
         bool opened;