Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index 685d0ac518b77cce27cac2bdc784c7b74d238a1a..1875816b784bcc30c78ec7583ef447450f153066 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -19,8 +19,6 @@
 
 #include "LString.h"
 
-using std::map;
-
 /**
   This is a stateless class. 
 
@@ -78,6 +76,11 @@ public:
                noteframe,
 
 
+               /// Color for the depth bars in the margin
+               depthbar,
+               /// Color for marking foreign language words
+               language,
+
                /// Text color for command insets
                command,
                /// Background color for command insets
@@ -138,6 +141,10 @@ public:
                topline,
                /// Table line color
                tableline,
+               /// Table line color
+               tabularline,
+               /// Table line color
+               tabularonoffline,
                /// Bottom area color
                bottomarea,
                /// Page break color
@@ -166,6 +173,8 @@ public:
        LColor();
        ///
        void setColor(LColor::color col, string const & x11name);
+       ///
+       bool setColor(string const & lyxname, string const & x11name);
        /// Get GUI name of color
        string getGUIName(LColor::color c) const;
 
@@ -196,8 +205,7 @@ private:
                  string const & lyx);
 
        ///
-       //typedef map<LColor::color, information, less<LColor::color> > InfoTab;
-       typedef map<LColor::color, information> InfoTab;
+       typedef std::map<LColor::color, information> InfoTab;
 
        InfoTab infotab;
 };