X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=5f0b633794979a5e7b0c6f9fb2c615067bc68579;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=cd9b7a27568de784daf0c2042233f1d8214ecc61;hpb=0ca871014add94c501cb423d8dc65c1405f4d141;p=lyx.git

diff --git a/src/insets/inset.C b/src/insets/inset.C
index cd9b7a2756..5f0b633794 100644
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -14,66 +14,33 @@
 #include <config.h>
 
 #include "inset.h"
-#include "updatableinset.h"
 
 #include "BufferView.h"
+#include "debug.h"
 #include "gettext.h"
+#include "lyxtext.h"
 #include "LColor.h"
+#include "metricsinfo.h"
+#include "coordcache.h"
 
 
+namespace lyx {
+
 using std::string;
 
 
 InsetOld::InsetOld()
-	: InsetBase(),
-	xo_(0), yo_(0), scx(0), owner_(0),
-	background_color_(LColor::inherit)
+	: //background_color_(LColor::inherit)
+	  background_color_(LColor::background)
 {}
 
 
 InsetOld::InsetOld(InsetOld const & in)
-	: InsetBase(),
-	xo_(0), yo_(0), scx(0), owner_(0),
-	name_(in.name_), background_color_(in.background_color_)
+	: InsetBase(in), name_(in.name_),
+	  background_color_(in.background_color_)
 {}
 
 
-bool InsetOld::directWrite() const
-{
-	return false;
-}
-
-
-InsetOld::EDITABLE InsetOld::editable() const
-{
-	return NOT_EDITABLE;
-}
-
-
-bool InsetOld::autoDelete() const
-{
-	return false;
-}
-
-
-#if 0
-LyXFont const InsetOld::convertFont(LyXFont const & font) const
-{
-#if 1
-	return font;
-#else
-	return LyXFont(font);
-#endif
-}
-#endif
-
-
-string const InsetOld::editMessage() const
-{
-	return _("Opened inset");
-}
-
-
 void InsetOld::setBackgroundColor(LColor_color color)
 {
 	background_color_ = color;
@@ -82,28 +49,7 @@ void InsetOld::setBackgroundColor(LColor_color color)
 
 LColor_color InsetOld::backgroundColor() const
 {
-	if (background_color_ == LColor::inherit) {
-		if (owner())
-			return owner()->backgroundColor();
-		else
-			return LColor::background;
-	} else
-		return LColor::color(background_color_);
-}
-
-
-bool InsetOld::forceDefaultParagraphs(InsetOld const * inset) const
-{
-	if (owner())
-		return owner()->forceDefaultParagraphs(inset);
-	return false;
-}
-
-int InsetOld::latexTextWidth(BufferView * bv) const
-{
-	if (owner())
-		return (owner()->latexTextWidth(bv));
-	return bv->workWidth();
+	return LColor::color(background_color_);
 }
 
 
@@ -125,32 +71,11 @@ int InsetOld::width() const
 }
 
 
-bool InsetOld::insetAllowed(InsetOld * in) const
-{
-	return insetAllowed(in->lyxCode());
-}
-
-
-bool InsetOld::checkInsertChar(LyXFont &)
-{
-	return false;
-}
-
-
-int InsetOld::scroll(bool recursive) const
+void InsetOld::setPosCache(PainterInfo const & pi, int x, int y) const
 {
-	if (!recursive || !owner_)
-		return scx;
-	return 0;
-}
-
-bool isEditableInset(InsetOld const * i)
-{
-	return i && i->editable();
+	//lyxerr << "InsetOld:: position cache to " << x << " " << y << std::endl;
+	pi.base.bv->coordCache().insets().add(this, x, y);
 }
 
 
-bool isHighlyEditableInset(InsetOld const * i)
-{
-	return i && i->editable() == InsetOld::HIGHLY_EDITABLE;
-}
+} // namespace lyx