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

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index d43d7390516fadb284a0b7e0b798d5a0142d23ab..b63f716fbd59a400f8745d6e1dcc2db0dfc6b4be 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -110,6 +110,7 @@ LColor::LColor()
        { commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
        { greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" },
        { greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
+       { shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
        { depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
        { language, N_("language"), "language", "Blue", "language" },
        { command, N_("command inset"), "command", "black", "command" },
@@ -176,7 +177,7 @@ string const LColor::getGUIName(LColor::color c) const
 {
        Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
        if (it != pimpl_->infotab.end())
-               return _(it->second.guiname);
+               return lyx::to_utf8(_(it->second.guiname));
        return "none";
 }
 
@@ -253,7 +254,7 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
        Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
        Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
        for (; it != end; ++it) {
-               if (!compare_ascii_no_case(_(it->second.guiname), guiname))
+               if (!compare_ascii_no_case(lyx::to_utf8(_(it->second.guiname)), guiname))
                        return it->first;
        }
        return LColor::inherit;