get rid of COLOR_TEXT. (struct _EIconBarItem): add pixbuf member to hold

2000-08-16  Larry Ewing  <lewing@helixcode.com>

	* e-icon-bar.h (enum): get rid of COLOR_TEXT.
	(struct _EIconBarItem): add pixbuf member to hold unmodified
	pixbuf.

	* e-icon-bar.c (e_icon_bar_style_set): update the image and the
	colors based on the new style.
	(e_icon_bar_add_item): store the full alpha pixbuf so that we can
	update the background color if the style changes.  Use the style
	colors where appropriate.
	(e_icon_bar_on_editing_stopped): revert to style colors.
	(e_icon_bar_on_editing_started): use style fg instead of
	COLOR_TEXT.

	* e-shortcut-bar.c (e_shortcut_bar_add_group): add an #ifndef
	E_USE_STYLES around the call to e_shortcut_bar_set_canvas_style to
	allow people to test out the style stuff that is in progress.

svn path=/trunk/; revision=4856

1 files changed, 2 insertions, 0 deletions

diff --git a/widgets/shortcut-bar/e-shortcut-bar.c b/widgets/shortcut-bar/e-shortcut-bar.c
index 20e0336fcb..a7d7f76aba 100644
--- a/widgets/shortcut-bar/e-shortcut-bar.c
+++ b/widgets/shortcut-bar/e-shortcut-bar.c
@@ -387,7 +387,9 @@ e_shortcut_bar_add_group	(EShortcutBar	*shortcut_bar,
 			    GTK_SIGNAL_FUNC (e_shortcut_bar_on_drag_end),
 			    shortcut_bar);
 
+#ifndef E_USE_STYLES
 	e_shortcut_bar_set_canvas_style (shortcut_bar, group->icon_bar);
+#endif
 
 	button = gtk_button_new ();
 	label = e_clipped_label_new (group_name);