ws changes only

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 68fe887ab036aaa95f0d9d8de2971fcfa2c56cab..c54f763e4f6276e70768b281545467d9ba0fb6fa 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -17,6 +17,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "debug.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "funcrequest.h"
 #include "metricsinfo.h"
@@ -27,16 +28,17 @@
 #include "frontends/Painter.h"
 #include "frontends/LyXView.h"
 
+
 using lyx::graphics::PreviewLoader;
 
 using std::endl;
-
+using std::string;
 using std::max;
 using std::ostream;
 
 
 InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
-       : UpdatableInset(), collapsed_(collapsed), inset(bp),
+       : UpdatableInset(), inset(bp), collapsed_(collapsed),
          button_dim(0, 0, 0, 0), label("Label"),
 #if 0
        autocollapse(false),
@@ -52,15 +54,13 @@ InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
 
 
 InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
-       : UpdatableInset(in), collapsed_(in.collapsed_),
-         framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
-         button_dim(0, 0, 0, 0), label(in.label),
+       : UpdatableInset(in), inset(in.inset), collapsed_(in.collapsed_),
+         labelfont_(in.labelfont_), button_dim(0, 0, 0, 0), label(in.label),
 #if 0
          autocollapse(in.autocollapse),
 #endif
          in_update(false), first_after_edit(false)
 {
-       inset.init(&(in.inset));
        inset.setOwner(this);
 }
 
@@ -104,14 +104,14 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 
 void InsetCollapsable::dimension_collapsed(Dimension & dim) const
 {
-       font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
+       font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
 }
 
 
 int InsetCollapsable::height_collapsed() const
 {
        Dimension dim;
-       font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
+       font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
        return dim.asc + dim.des;
 }
 
@@ -132,15 +132,12 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
 {
-       pi.pain.buttonText(x, y, label, labelfont);
+       pi.pain.buttonText(x, y, label, labelfont_);
 }
 
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
 {
-       BOOST_ASSERT(pi.base.bv);
-       cache(pi.base.bv);
-
        Dimension dim_collapsed;
        dimension_collapsed(dim_collapsed);
 
@@ -274,7 +271,7 @@ bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
 }
 
 
-InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetCollapsable::localDispatch(FuncRequest const & cmd)
 {
        //lyxerr << "InsetCollapsable::localDispatch: "
        //      << cmd.action << " '" << cmd.argument << "'\n";
@@ -346,7 +343,7 @@ InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
                        return DISPATCHED;
 
                default:
-                       UpdatableInset::RESULT result = inset.localDispatch(cmd);
+                       dispatch_result result = inset.localDispatch(cmd);
                        if (result >= FINISHED)
                                bv->unlockInset(this);
                        first_after_edit = false;
@@ -435,9 +432,10 @@ void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
 }
 
 
-void InsetCollapsable::getLabelList(std::vector<string> & list) const
+void InsetCollapsable::getLabelList(Buffer const & buffer,
+                                   std::vector<string> & list) const
 {
-       inset.getLabelList(list);
+       inset.getLabelList(buffer, list);
 }
 
 
@@ -498,6 +496,12 @@ void InsetCollapsable::setLabel(string const & l) const
 }
 
 
+void InsetCollapsable::setCollapsed(bool c) const
+{
+       collapsed_ = c;
+}
+
+
 void InsetCollapsable::markErased()
 {
        inset.markErased();
@@ -555,15 +559,3 @@ void InsetCollapsable::addPreview(PreviewLoader & loader) const
 {
        inset.addPreview(loader);
 }
-
-
-void InsetCollapsable::cache(BufferView * bv) const
-{
-       view_ = bv->owner()->view();
-}
-
-
-BufferView * InsetCollapsable::view() const
-{
-       return view_.lock().get();
-}