Use the font #defines. (month_view_new): Set the colors of the month view

1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* month-view.c (month_view_init): Use the font #defines.
	(month_view_new): Set the colors of the month view upon creation.
	(mark_current_day): New function to mark the current day in the
	month view.
	(month_view_set): Mark the current day.
	(month_view_colors_changed): Mark the current day and colorify the
	month item appropriately.

	* month-view.h: Added year and month fields to the MonthView
	structure.

	* main.c: Renamed the Appointments color property, since it will
	be used by the month view as well.

	* goto.c (update): Set the current day's font and color.

	* year-view.c (year_view_init): Set the fonts of the month items
	when creating them.

	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.

	* year-view.c (year_view_init): Use the new font #defines.

	* prop.c (prop_apply_colors): Fixed to work with the
	I-am-paranoid-and-I-need-to-size-my-ints changes to
	GnomeColorPicker.
	(color_spec_from_picker): Likewise.

svn path=/trunk/; revision=424

1 files changed, 7 insertions, 4 deletions

diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
index f0809a45dc..fe8e52fe23 100644
--- a/calendar/gui/prop.c
+++ b/calendar/gui/prop.c
@@ -87,11 +87,14 @@ prop_apply_colors (void)
 {
 	int i;
 	char *cspec;
+	gushort r, g, b;
 
 	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[i]),
-					    &color_props[i].r, &color_props[i].g, &color_props[i].b, NULL);
-
+		gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[i]), &r, &g, &b, NULL);
+		color_props[i].r = r;
+		color_props[i].g = g;
+		color_props[i].b = b;
+		
 		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
 		gnome_config_set_string (color_props[i].key, cspec);
 	}
@@ -338,7 +341,7 @@ canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer dat
 static char *
 color_spec_from_picker (int num)
 {
-	int r, g, b;
+	gushort r, g, b;
 
 	gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[num]), &r, &g, &b, NULL);