From c3b341cbcbbca6f777146c04e9dfc6e1c394dbdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Tue, 24 Aug 2010 01:29:22 +0000
Subject: [PATCH] InsetCaption: we use IndianRad as frame color while the float
 frames use DarkRed; as discussed, providing to specify a special caption
 frame color in the preferences is unnecessary

-> remove caption frame color from preferences
-> use the collapsible frame color also for caption frames

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35187 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Color.cpp               | 1 -
 src/ColorCode.h             | 3 ---
 src/insets/InsetCaption.cpp | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Color.cpp b/src/Color.cpp
index f858a7ae5f..8e4940a4fc 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -213,7 +213,6 @@ ColorSet::ColorSet()
 	{ Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend", "black", "mathmacroblend" },
 	{ Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" },
 	{ Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" },
-	{ Color_captionframe, N_("caption frame"), "captionframe", "IndianRed", "captionframe" },
 	{ Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
 	{ Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
 	{ Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
diff --git a/src/ColorCode.h b/src/ColorCode.h
index b68d108296..9e94827f27 100644
--- a/src/ColorCode.h
+++ b/src/ColorCode.h
@@ -132,9 +132,6 @@ enum ColorCode
 	/// Math line color
 	Color_mathline,
 
-	/// Caption frame color
-	Color_captionframe,
-
 	/// Collapsable insets text
 	Color_collapsable,
 	/// Collapsable insets frame
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index c8b774c0bc..6e2c03ddfa 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -53,7 +53,7 @@ InsetCaption::InsetCaption(Buffer * buf)
 {
 	setAutoBreakRows(true);
 	setDrawFrame(true);
-	setFrameColor(Color_captionframe);
+	setFrameColor(Color_collapsableframe);
 }