prepare for 1.1.6pre2

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

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 606648bcb9da111cae6bcbc6e4943c72529a7387..ceb7d8da5c9423e2dda4e8e0f68d90450ae2dcd3 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -17,9 +17,10 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "BufferView.h"
-#include "Painter.h"
 #include "lyxtext.h"
+#include "insets/insettext.h"
 #include "support/LOstream.h"
+#include "debug.h"
 
 using std::ostream;
 using std::endl;
@@ -74,17 +75,17 @@ void InsetMinipage::Write(Buffer const * buf, ostream & os) const
 }
 
 
-Inset * InsetMinipage::Clone() const
+Inset * InsetMinipage::Clone(Buffer const &) const
 {
        InsetMinipage * result = new InsetMinipage;
-       result->init(this);
+       result->inset->init(inset);
        
        result->collapsed = collapsed;
        return result;
 }
 
 
-char const * InsetMinipage::EditMessage() const
+string const InsetMinipage::EditMessage() const
 {
        return _("Opened Minipage Inset");
 }
@@ -95,36 +96,18 @@ int InsetMinipage::Latex(Buffer const * buf,
 {
        os << "\\begin{minipage}{\\columnwidth}%\n";
        
-       int i = InsetText::Latex(buf, os, fragile, fp);
+       int i = inset->Latex(buf, os, fragile, fp);
        os << "\\end{minipage}%\n";
        
        return i + 2;
 }
 
 
-bool InsetMinipage::InsertInset(BufferView * bv, Inset * inset)
+bool InsetMinipage::InsertInsetAllowed(Inset * in) const
 {
-       if (!InsertInsetAllowed(inset))
-               return false;
-       
-       return InsetText::InsertInset(bv, inset);
-}
-
-
-bool InsetMinipage::InsertInsetAllowed(Inset * inset) const
-{
-       if ((inset->LyxCode() == Inset::FLOAT_CODE) ||
-           (inset->LyxCode() == Inset::MARGIN_CODE)) {
+       if ((in->LyxCode() == Inset::FLOAT_CODE) ||
+           (in->LyxCode() == Inset::MARGIN_CODE)) {
                return false;
        }
        return true;
 }
-
-
-LyXFont InsetMinipage::GetDrawFont(BufferView * bv,
-                                  LyXParagraph * p, int pos) const
-{
-       LyXFont fn = getLyXText(bv)->GetFont(bv->buffer(), p, pos);
-       fn.decSize().decSize();
-       return fn;
-}