cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index b410378dc23ba89e2439af64334c2590472bb70a..422b55625ea120fddd895fa4896ebbf0801359c2 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -93,7 +93,8 @@ public:
                greyedout,
                /// Background color of greyedout inset
                greyedoutbg,
-
+               /// Shaded box background
+               shadedbg,
 
                /// Color for the depth bars in the margin
                depthbar,
@@ -189,7 +190,7 @@ public:
        ///
        ~LColor();
        ///
-       void operator=(LColor const &);
+       LColor & operator=(LColor);
 
        /** set the given LyX color to the color defined by the X11 name given
         *  \returns true if successful.
@@ -218,11 +219,13 @@ public:
        LColor::color getFromGUIName(std::string const & guiname) const;
        /// \returns the LColor::color associated with the LyX name.
        LColor::color getFromLyXName(std::string const & lyxname) const;
+       /// \returns the LColor::color associated with the LaTeX name.
+       LColor::color getFromLaTeXName(std::string const & latexname) const;
 private:
        ///
        void addColor(LColor::color c, std::string const & lyxname) const;
        ///
-       struct Pimpl;
+       class Pimpl;
        ///
        boost::scoped_ptr<Pimpl> pimpl_;
 };