aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-clipped-label.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
commit9c73777f2268b5bf2622f893e2a3ba7d0f720572 (patch)
treef81b79f19b87f84b4429d329b3fc0f9ff7946060 /widgets/misc/e-clipped-label.c
parent236c15d106b4e740d4e3996e0649334ca8e13876 (diff)
downloadgsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.gz
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.bz2
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.lz
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.xz
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.zst
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.zip
First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken). Weeeeee! svn path=/trunk/; revision=18503
Diffstat (limited to 'widgets/misc/e-clipped-label.c')
-rw-r--r--widgets/misc/e-clipped-label.c7
1 files changed, 3 insertions, 4 deletions
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 <glib.h>
#include <gdk/gdki18n.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
@@ -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;