From 9c73777f2268b5bf2622f893e2a3ba7d0f720572 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 2 Nov 2002 08:25:03 +0000 Subject: First big sync of my GNOME 2 porting work (incomplete, and still pretty broken). Weeeeee! svn path=/trunk/; revision=18503 --- widgets/misc/e-clipped-label.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'widgets/misc/e-clipped-label.c') diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c index 6da313940c..adefe64048 100644 --- a/widgets/misc/e-clipped-label.c +++ b/widgets/misc/e-clipped-label.c @@ -40,7 +40,6 @@ #include #include -#include #include @@ -156,7 +155,7 @@ e_clipped_label_size_request (GtkWidget *widget, g_return_if_fail (requisition != NULL); label = E_CLIPPED_LABEL (widget); - font = widget->style->font; + font = gtk_style_get_font (widget->style); requisition->width = 0; requisition->height = font->ascent + font->descent @@ -194,7 +193,7 @@ e_clipped_label_expose (GtkWidget *widget, label = E_CLIPPED_LABEL (widget); misc = GTK_MISC (widget); - font = widget->style->font; + font = gtk_style_get_font (widget->style); /* If the label isn't visible or has no text, just return. */ if (!GTK_WIDGET_VISIBLE (widget) || !GTK_WIDGET_MAPPED (widget) @@ -339,7 +338,7 @@ e_clipped_label_recalc_chars_displayed (EClippedLabel *label) GdkFont *font; gint max_width, width, ch, last_width; - font = GTK_WIDGET (label)->style->font; + font = gtk_style_get_font (GTK_WIDGET (label)->style); max_width = GTK_WIDGET (label)->allocation.width - 2 * GTK_MISC (label)->xpad; -- cgit v1.2.3