Ensure the focus is returned to the editing area after a dispatch.

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index d9f4d5e999cb6a9253355ba62b9c97b04a46dca4..349bf067b0d3523d6a2239b055cdcbcd38a333b0 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -22,7 +22,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <map>
 #include <cmath>
@@ -77,7 +77,7 @@ string const X11hexname(RGBColor const & col)
 RGBColor rgbFromHexName(string const & x11hexname)
 {
        RGBColor c;
-       BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#');
+       LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/);
        c.r = hexstrToInt(x11hexname.substr(1,2));
        c.g = hexstrToInt(x11hexname.substr(3,2));
        c.b = hexstrToInt(x11hexname.substr(5,2));
@@ -102,6 +102,8 @@ ColorSet::ColorSet()
        { Color_background, N_("background"), "background", "linen", "background" },
        { Color_foreground, N_("text"), "foreground", "black", "foreground" },
        { Color_selection, N_("selection"), "selection", "LightBlue", "selection" },
+       { Color_selectiontext, N_("selected text"),
+               "selectiontext", "black", "selectiontext" },
        { Color_latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
        { Color_inlinecompletion, N_("inline completion"),
                "inlinecompletion", "grey60", "inlinecompletion" },
@@ -150,8 +152,8 @@ ColorSet::ColorSet()
        { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
        { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
        { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" },
-       { Color_deletedtext, N_("Deleted text"), "deletedtext", "red", "deletedtext" },
-       { Color_addedtext, N_("Added text"), "addedtext", "blue", "addedtext" },
+       { Color_deletedtext, N_("Deleted text"), "deletedtext", "#ff0000", "deletedtext" },
+       { Color_addedtext, N_("Added text"), "addedtext", "#0000ff", "addedtext" },
        { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
        { Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" },
        { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },