Skip setting the "font_gdk" arg for now.

2003-02-02  Hans Petter Jansson  <hpj@ximian.com>

	* gui/e-day-view.c (e_day_view_set_event_font_cb): Skip setting the
	"font_gdk" arg for now.
	(e_day_view_update_main_canvas_drag): Ditto.

	* gui/e-week-view.c (e_week_view_style_set): Ditto.

	* gui/weekday-picker.c (configure_items): Ditto.

	* gui/dialogs/event-page.c (get_widgets): Show custom widgets
	manually, since the visibility specified in the Glade XML appears
	to not have any effect.

	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.

svn path=/trunk/; revision=19706

6 files changed, 29 insertions, 0 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a7e22922ae..977ae8a2e8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,19 @@
+2003-02-02  Hans Petter Jansson  <hpj@ximian.com>
+
+	* gui/e-day-view.c (e_day_view_set_event_font_cb): Skip setting the
+	"font_gdk" arg for now.
+	(e_day_view_update_main_canvas_drag): Ditto.
+
+	* gui/e-week-view.c (e_week_view_style_set): Ditto.
+
+	* gui/weekday-picker.c (configure_items): Ditto.
+
+	* gui/dialogs/event-page.c (get_widgets): Show custom widgets
+	manually, since the visibility specified in the Glade XML appears
+	to not have any effect.
+
+	* gui/dialogs/recurrence-page.c (get_widgets): Ditto.
+
 2003-30-01 Ronald Kuetemeier <ronald@kuetemeier.com>
                                                                                         
 	Fixes #35572
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 9c5cc514ad..dc5a6ba0a2 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -767,8 +767,12 @@ get_widgets (EventPage *epage)
 	priv->summary = GW ("general-summary");
 	priv->location = GW ("location");
 
+	/* Glade's visibility flag doesn't seem to work for custom widgets */
 	priv->start_time = GW ("start-time");
+	gtk_widget_show (priv->start_time);
 	priv->end_time = GW ("end-time");
+	gtk_widget_show (priv->end_time);
+
 	priv->start_timezone = GW ("start-timezone");
 	priv->end_timezone = GW ("end-timezone");
 	priv->all_day_event = GW ("all-day-event");
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 79c0224509..162f7a9737 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2033,6 +2033,7 @@ get_widgets (RecurrencePage *rpage)
 	priv->custom_warning_bin = GW ("custom-warning-bin");
 	      
 	priv->exception_date = GW ("exception-date");
+	gtk_widget_show (priv->exception_date);
 	priv->exception_list = GW ("exception-list");
 	priv->exception_add = GW ("exception-add");
 	priv->exception_modify = GW ("exception-modify");
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index da70dd248f..91baa1e382 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1260,10 +1260,12 @@ e_day_view_set_event_font_cb		(EDayView	*day_view,
 		event = &g_array_index (day_view->events[day],
 					EDayViewEvent, event_num);
 
+#if 0
 	if (event->canvas_item)
 		gnome_canvas_item_set (event->canvas_item,
 				       "font_gdk", font,
 				       NULL);
+#endif
 
 	return TRUE;
 }
@@ -6984,7 +6986,9 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 
 	font = gtk_style_get_font (gtk_widget_get_style (GTK_WIDGET (day_view)));
 	gnome_canvas_item_set (day_view->drag_item,
+#if 0
 			       "font_gdk", font,
+#endif
 			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,
 			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,
 			       NULL);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index a5c8f3b656..8996aa9c8e 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -744,6 +744,7 @@ e_week_view_style_set (GtkWidget *widget,
 	week_view->pm_string_width = get_string_width (layout,
 						       week_view->pm_string);
 
+#if 0
 	/* Set the font of all the EText items. */
 	if (week_view->spans) {
 		for (span_num = 0; span_num < week_view->spans->len;
@@ -756,6 +757,7 @@ e_week_view_style_set (GtkWidget *widget,
 						       NULL);
 		}
 	}
+#endif
 
 	g_object_unref (layout);
 }
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index f4311574fd..67e4a12ea2 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -298,7 +298,9 @@ configure_items (WeekdayPicker *wp)
 		c = g_strndup (str + day, 1);
 		gnome_canvas_item_set (priv->labels[i],
 				       "text", c,
+#if 0
 				       "font_gdk", gtk_style_get_font (gtk_widget_get_style (GTK_WIDGET (wp))),
+#endif
 				       "x", (double) (i * box_width) + box_width / 2.0,
 				       "y", (double) (1 + PADDING),
 				       "anchor", GTK_ANCHOR_N,