* In the process of fixing the math background color bug, this commit transfer backgr...

[lyx.git] / src / insets / inset.h

diff --git a/src/insets/inset.h b/src/insets/inset.h
index aa817aa3d50c092f758b2b46c35d0c358d590ffa..73c8a4380f72e2e04ed22de600b48d3844caf9c9 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -16,11 +16,9 @@
 #define INSETOLD_H
 
 #include "insetbase.h"
-#include "dimension.h"
 
-class LColor_color;
-class UpdatableInset;
 
+namespace lyx {
 
 /// Insets
 class InsetOld : public InsetBase {
@@ -28,50 +26,28 @@ public:
        ///
        enum {
                ///
-               TEXT_TO_INSET_OFFSET = 2
+               TEXT_TO_INSET_OFFSET = 4
        };
 
        ///
        InsetOld();
-       ///
-       int ascent() const;
-       ///
-       int descent() const;
-       ///
-       int width() const;
 
        ///
-       void setInsetName(std::string const & s) { name_ = s; }
-       ///
-       std::string const & getInsetName() const { return name_; }
-       ///
-       virtual void setBackgroundColor(LColor_color);
+       void setInsetName(docstring const & s) { name_ = s; }
        ///
-       LColor_color backgroundColor() const;
+       virtual docstring const & getInsetName() const { return name_; }
        /// set x/y drawing position cache
        void setPosCache(PainterInfo const &, int, int) const;
-       /// returns the actual scroll-value
-       virtual int scroll(bool recursive = true) const;
 
-       ///
-       bool forceDefaultParagraphs(InsetBase const * inset) const;
 protected:
        ///
        InsetOld(InsetOld const & in);
-       ///
-       mutable int scx;
-       ///
-       mutable Dimension dim_;
 
 private:
        InsetOld & operator=(InsetOld const &) const;
 
        ///
-       std::string name_;
-       /** We store the LColor::color value as an int to get LColor.h out
-        *  of the header file.
-        */
-       int background_color_;
+       docstring name_;
 };
 
 
@@ -86,4 +62,7 @@ public:
        operator InsetBase::Code() const { return val_; }
 };
 
+
+} // namespace lyx
+
 #endif