Force foreground when background is forced in expert info dialogs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25211 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index 7d0bcd3060cf4f5da520f54fcc872ba3a0003898..fa3e60c4de22b97284118655e0f2e3c94d53b46b 100644 (file)
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -241,6 +241,7 @@ expert_dlg_draw(void *data)
                default:
                        g_assert_not_reached();
                }
+               gtk_clist_set_foreground(etd->table, row, &expert_color_foreground);
        }
 
        gtk_clist_sort(etd->table);

diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index 6125d6ea044f007ded3a9a9504b06bfa70a601db..e2b3d711a6e7710dc4cbeffd4784933e2234a98d 100644 (file)
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -1354,6 +1354,7 @@ GdkColor  expert_color_chat       = { 0, 0xcc00, 0xcc00, 0xe000 };        /* a pale bluegrey *
 GdkColor       expert_color_note       = { 0, 0xa000, 0xff00, 0xff00 };        /* a bright turquoise */
 GdkColor       expert_color_warn       = { 0, 0xff00, 0xff00, 0 };                     /* yellow */
 GdkColor       expert_color_error      = { 0, 0xff00, 0x5c00, 0x5c00 };        /* pale red */
+GdkColor       expert_color_foreground = { 0, 0x0000, 0x0000, 0x0000 };        /* black */
 GdkColor       hidden_proto_item       = { 0, 0x4400, 0x4400, 0x4400 };        /* gray */
 
 void proto_draw_colors_init(void)
@@ -1366,6 +1367,7 @@ void proto_draw_colors_init(void)
        get_color(&expert_color_note);
        get_color(&expert_color_warn);
        get_color(&expert_color_error);
+       get_color(&expert_color_foreground);
        get_color(&hidden_proto_item);
 
        colors_ok = TRUE;

diff --git a/gtk/main_proto_draw.h b/gtk/main_proto_draw.h
index 91201e5c975df486f2d33a152bbe3e1d22c0284f..925bc5f08141a8468e39ec1f19e32c558bbec7e9 100644 (file)
--- a/gtk/main_proto_draw.h
+++ b/gtk/main_proto_draw.h
@@ -230,5 +230,6 @@ extern GdkColor     expert_color_chat;
 extern GdkColor        expert_color_note;
 extern GdkColor        expert_color_warn;
 extern GdkColor        expert_color_error;
+extern GdkColor        expert_color_foreground;
 
 #endif