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 3763752daebfb4e1f772f78ca02191ccbd309604..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,50 +32,51 @@ public:
        ///
        InsetFormulaMacro();
        ///
+       explicit
        InsetFormulaMacro(string name, int na = 0, bool env = false);
        ///
        ~InsetFormulaMacro();
        ///
-       int Ascent(LyXFont const & font) const;
+       int ascent(Painter &, LyXFont const &) const;
        ///
-       int Descent(LyXFont const & font) const;
+       int descent(Painter &, LyXFont const &) const;
        ///
-       int Width(LyXFont const & font) const;
+       int width(Painter &, LyXFont const &) const;
        ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
        ///
        void Read(LyXLex & lex);
         ///
-       void Write(FILE * file);
+       void Write(std::ostream & os) const;
        ///
-       int Latex(FILE * file, signed char fragile);
+       int Latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Latex(string & file, signed char fragile);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int Linuxdoc(string & file);
-       ///
-       int DocBook(string & file);
+       int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
 
        /// what appears in the minibuffer when opening
-       char const * EditMessage() {return "Math macro editor mode";}
+       char const * EditMessage() const;
+       ///
+       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       void Edit(int x, int y);
+       void InsetUnlock(BufferView *);
        ///
-       void InsetUnlock();
-   
-       bool LocalDispatch(int, char const *);
-   
+       RESULT LocalDispatch(BufferView *, int, string const &);
+
 protected:
-       void UpdateLocal();
+       ///
+       //void UpdateLocal();
+
 private:
+       ///
         bool opened;
-        string name; 
-        class MathMacroTemplate * tmacro;
-
+       ///
+        string name;
+       ///
+        MathMacroTemplate * tmacro;
 };
 
-
 #endif
-