clear()->erase() ; lots of using directives for cxx

[lyx.git] / src / insets / insetert.h

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 99e5294647c622db48b6d249e1789dbd1eb0ff58..d49fae2742d4be2dfbe36b0cbd73776c825b64a5 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -18,7 +18,7 @@
 #pragma interface
 #endif
 
-#include "insettext.h"
+#include "insetcollapsable.h"
 
 class Painter;
 
@@ -27,60 +27,23 @@ class Painter;
   To write full ert (including styles and other insets) in a given
   space. 
 */
-class InsetERT : public InsetText {
+class InsetERT : public InsetCollapsable {
 public:
     ///
     InsetERT(Buffer *);
     ///
-    //     InsetERT(InsetERT const &, Buffer *);
-    ///
     ~InsetERT() {}
     ///
-    InsetERT * Clone() const;
-    ///
-    //    void Read(LyXLex &);
-    ///
-    void Write(ostream &) const;
-    ///
-    int ascent(Painter &, LyXFont const &) const;
-    ///
-    int descent(Painter &, LyXFont const &) const;
-    ///
-    int width(Painter &, LyXFont const & f) const;
-    ///
-    void draw(Painter & pain, const LyXFont &, int , float &) const;
-    ///
-    //LString EditMessage() const;
+    Inset * Clone() const;
     ///
-    void InsetButtonRelease(BufferView *, int, int, int);
+    char const * EditMessage() const;
     ///
-    void InsetButtonPress(BufferView *, int, int, int);
+    bool InsertInset(BufferView *, Inset *);
     ///
-    void InsetMotionNotify(BufferView *, int, int, int);
+    void SetFont(BufferView *, LyXFont const &, bool toggleall = false);
     ///
     void Edit(BufferView *, int, int, unsigned int);
     ///
-    void InsetUnlock(BufferView *);
-    ///
-    bool InsertInset(Inset *);
-    ///
-    void SetFont(LyXFont const &, bool toggleall);
-
-protected:
-    ///
-    int ascent_closed(Painter &, LyXFont const &) const;
-    ///
-    int descent_closed(Painter &, LyXFont const &) const;
-    ///
-    int width_closed(Painter &, LyXFont const & f) const;
-    ///
-    void draw_closed(Painter & pain, LyXFont const &, int , float &) const;
-
-private:
-       ///
-       bool closed;
-       ///
-       bool nomotion;
 };
 
 #endif