prepare for 1.1.6pre2

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 795ca2c042dc54fcc1bba3c0fe4e049364f9b779..b4188498884956dfdb524659139bc79e1548d98a 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -16,49 +16,47 @@
 #include "insetert.h"
 #include "gettext.h"
 #include "lyxfont.h"
-#include "Painter.h"
 #include "buffer.h"
+#include "insets/insettext.h"
 #include "support/LOstream.h"
 #include "lyx_gui_misc.h"
 
 using std::ostream;
 
-InsetERT::InsetERT(Buffer * bf)
-       : InsetCollapsable(bf)
+InsetERT::InsetERT() : InsetCollapsable()
 {
     setLabel(_("ERT"));
     LyXFont font(LyXFont::ALL_SANE);
     font.setLatex (LyXFont::ON);
-    real_current_font = current_font = font;
-    LyXFont labelfont(LyXFont::ALL_SANE);
+    labelfont = LyXFont(LyXFont::ALL_SANE);
     labelfont.decSize();
     labelfont.decSize();
     labelfont.setColor(LColor::ert);
-    setLabelFont(labelfont);
     setAutoCollapse(false);
     setInsetName("ERT");
 }
 
 
-Inset * InsetERT::Clone() const
+void InsetERT::Write(Buffer const * buf, ostream & os) const 
 {
-    InsetERT * result = new InsetERT(buffer);
-    result->init(buffer, this);
-
-    result->collapsed = collapsed;
-    return result;
+    os << getInsetName() << "\n";
+    InsetCollapsable::Write(buf, os);
 }
 
 
-char const * InsetERT::EditMessage() const 
+Inset * InsetERT::Clone(Buffer const &) const
 {
-       return _("Opened ERT Inset");
+    InsetERT * result = new InsetERT;
+    result->inset->init(inset);
+
+    result->collapsed = collapsed;
+    return result;
 }
 
 
-bool InsetERT::InsertInset(BufferView *, Inset *)
+string const InsetERT::EditMessage() const 
 {
-    return false;
+    return _("Opened ERT Inset");
 }
 
 
@@ -69,10 +67,10 @@ void InsetERT::SetFont(BufferView *, LyXFont const &, bool)
               _("Sorry."));
 }
 
+
 void InsetERT::Edit(BufferView * bv, int x, int y, unsigned int button)
 {
     InsetCollapsable::Edit(bv, x, y, button);
     LyXFont font(LyXFont::ALL_SANE);
     font.setLatex (LyXFont::ON);
-    current_font = real_current_font = font;
 }