X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=5f0b633794979a5e7b0c6f9fb2c615067bc68579;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=0f8bbc739e611b613aa3ce294506b890ba923319;hpb=02ebc072b039aa001d0e18293eca596b41b4338c;p=lyx.git diff --git a/src/insets/inset.C b/src/insets/inset.C index 0f8bbc739e..5f0b633794 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -14,7 +14,6 @@ #include #include "inset.h" -#include "updatableinset.h" #include "BufferView.h" #include "debug.h" @@ -24,18 +23,20 @@ #include "metricsinfo.h" #include "coordcache.h" + +namespace lyx { + using std::string; InsetOld::InsetOld() - : scx(0), - //background_color_(LColor::inherit) + : //background_color_(LColor::inherit) background_color_(LColor::background) {} InsetOld::InsetOld(InsetOld const & in) - : InsetBase(in), scx(0), name_(in.name_), + : InsetBase(in), name_(in.name_), background_color_(in.background_color_) {} @@ -52,12 +53,6 @@ LColor_color InsetOld::backgroundColor() const } -bool InsetOld::forceDefaultParagraphs(InsetBase const *) const -{ - return false; -} - - int InsetOld::ascent() const { return dim_.asc; @@ -76,14 +71,11 @@ int InsetOld::width() const } -int InsetOld::scroll(bool) const -{ - return scx; -} - - void InsetOld::setPosCache(PainterInfo const & pi, int x, int y) const { //lyxerr << "InsetOld:: position cache to " << x << " " << y << std::endl; - theCoords.insets_.add(this, x, y + pi.base.bv->top_y()); + pi.base.bv->coordCache().insets().add(this, x, y); } + + +} // namespace lyx