Scrap LColor mathcursor. Use only logical colours in mathed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6801 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 809138fe7423722a94149be2606a9207648d2104..55f35fbec9f2fac9fd54a318526ac86e3feeb16e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-14  Angus Leeming  <leeming@lyx.org>
+
+       * LColor.[Ch]: scrap LColor mathcursor.
+
 2003-04-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * lyxlex.[Ch] (text): delete function

diff --git a/src/LColor.C b/src/LColor.C
index a6027492a068bcdc88a086a0ff9bf0f6c2955398..7f0d978357e20fbe3421e1165cdeb4ccc8c505d9 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -70,7 +70,6 @@ LColor::LColor()
        { graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" },
        { mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" },
        { mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
-       { mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
        { mathline, N_("math line"), "mathline", "Blue", "mathline" },
        { captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
        { collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },

diff --git a/src/LColor.h b/src/LColor.h
index ef0a2382a93f092d16e7cb9172e7f2350082ca7f..98aadd8f1c5ebd0735dd55d3ccd8586b660c7ab1 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -107,8 +107,6 @@ public:
                mathmacrobg,
                /// Math inset frame color
                mathframe,
-               /// Math cursor color
-               mathcursor,
                /// Math line color
                mathline,
 

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 7b8213826f9324cd341c1d0a4aac679b5a96e257..899cf2c1c819e136ab0646777846328d69ef2fb5 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -2,6 +2,8 @@
 
        * math_fboxinset.C:
        * math_frameboxinset.C: s/\(LColor::\)black/\1foreground/
+       * math_macrotemplate.C: s/\(LColor::\)blue/\1mathline/
+       * math_support.C: s/\(LColor::\)mathcursor/\1cursor/
 
 2003-04-02  John Levon  <levon@movementarian.org>
 

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 60e270e20f2ee37e36729b4d1c8621075f1621cc..4f1ae017ecda13724097afeded1e4c8464703418 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -78,10 +78,10 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
        int const w1 = cell(1).width();
        cell(0).draw(pi, x + 2, y + 1);
        pi.pain.rectangle(x, y - ascent() + 1, w0 + 4, height(),
-                       LColor::blue);
+                       LColor::mathline);
        cell(1).draw(pi, x + 8 + w0, y + 1);
        pi.pain.rectangle(x + w0 + 6 , y - ascent() + 1, w1 + 4,
-                       height(), LColor::blue);
+                       height(), LColor::mathline);
 }
 
 

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 2deec75f1dde2523b384d94b66f1e4fb8c6a4efd..a893da51ce5fd494cb69b6dcde57d8f827e2ebd1 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -400,7 +400,7 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
 {
        if (name == ".") {
                pi.pain.line(x + w/2, y, x + w/2, y + h,
-                         LColor::mathcursor, Painter::line_onoffdash);
+                         LColor::cursor, Painter::line_onoffdash);
                return;
        }