X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.h;h=16935ac1fb3a6d1d378a7ea8383e352296fa8821;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=e282761c1b2d8abb24982c78efddc7be0ee038ad;hpb=797d87b4513088a66b17c7ac653b84e36ea80458;p=lyx.git

diff --git a/src/LColor.h b/src/LColor.h
index e282761c1b..16935ac1fb 100644
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -18,7 +18,7 @@
 #include <map>
 
 #include "LString.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 /**
   This is a stateless class. 
@@ -32,7 +32,10 @@
   - A logical color, such as no color, inherit, math
 
   */
-class LColor : public noncopyable {
+class LColor //: public noncopyable {
+// made copyable for same reasons as LyXRC was made copyable. See there for
+// explanation.
+{
 public:
 	/// Names of colors, including all logical colors
 	enum color {
@@ -57,6 +60,8 @@ public:
 
 		// Needed interface colors
 
+		/// Cursor color
+		cursor,
 		/// Background color
 		background,
 		/// Foreground color
@@ -176,16 +181,16 @@ public:
 	///
 	bool setColor(string const & lyxname, string const & x11name);
 	/// Get GUI name of color
-	string getGUIName(LColor::color c) const;
+	string const getGUIName(LColor::color c) const;
 
 	/// Get X11 name of color
-	string getX11Name(LColor::color c) const;
+	string const getX11Name(LColor::color c) const;
 
 	/// Get LaTeX name of color
-	string getLaTeXName(LColor::color c) const;
+	string const getLaTeXName(LColor::color c) const;
 
 	/// Get LyX name of color
-	string getLyXName(LColor::color c) const;
+	string const getLyXName(LColor::color c) const;
 	///
 	LColor::color getFromGUIName(string const & guiname) const;
 	///
@@ -216,5 +221,7 @@ private:
 
 ///
 extern LColor lcolor;
+///
+extern LColor system_lcolor;
 
 #endif