fix scons again. (I begin to believe that Andre cripples scons intentionally. :-)

[features.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index 422b55625ea120fddd895fa4896ebbf0801359c2..d7ca132759fc7d485e5397883d1463fcd776dc74 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -19,8 +19,12 @@
 #ifndef LCOLOR_H
 #define LCOLOR_H
 
+#include "support/docstring.h"
+
 #include <boost/scoped_ptr.hpp>
-#include <string>
+
+
+namespace lyx {
 
 /**
  * This is a stateless class.
@@ -163,16 +167,12 @@ public:
                pagebreak,
 
                // FIXME: why are the next four separate ??
-               /// Color used for top of boxes
-               top,
-               /// Color used for bottom of boxes
-               bottom,
-               /// Color used for left side of boxes
-               left,
-               /// Color used for right side of boxes
-               right,
+               /// Color used for button frame
+               buttonframe,
                /// Color used for bottom background
                buttonbg,
+               /// Color used for buttom under focus
+               buttonhoverbg,
 
                // Logical attributes
 
@@ -204,7 +204,7 @@ public:
        bool setColor(std::string const & lyxname, std::string const & x11name);
 
        /// Get the GUI name of \c color.
-       std::string const getGUIName(LColor::color c) const;
+       docstring const getGUIName(LColor::color c) const;
 
        /// Get the X11 name of \c color.
        std::string const getX11Name(LColor::color c) const;
@@ -215,8 +215,6 @@ public:
        /// Get the LyX name of \c color.
        std::string const getLyXName(LColor::color c) const;
 
-       /// \returns the LColor::color associated with the GUI name.
-       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.
@@ -252,4 +250,7 @@ extern LColor lcolor;
 /// the system color definitions
 extern LColor system_lcolor;
 
+
+} // namespace lyx
+
 #endif