diff options
Diffstat (limited to 'widgets/table/e-table-field-chooser-item.c')
| -rw-r--r-- | widgets/table/e-table-field-chooser-item.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index d09dfd6e11..b4555685cb 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-field-chooser-item.c * Copyright 2000, 2001, Ximian, Inc. * @@ -25,10 +25,10 @@ #include <string.h> #include <gtk/gtksignal.h> #include <gtk/gtkdnd.h> -#include <libgnomeui/gnome-canvas.h> -#include <libgnomeui/gnome-canvas-util.h> -#include <libgnomeui/gnome-canvas-polygon.h> -#include <libgnomeui/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/gnome-canvas-util.h> +#include <libgnomecanvas/gnome-canvas-polygon.h> +#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include "gal/util/e-util.h" @@ -72,15 +72,20 @@ enum { }; static void -etfci_destroy (GtkObject *object){ +etfci_destroy (GtkObject *object) +{ ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (object); etfci_drop_table_header (etfci); etfci_drop_full_header (etfci); - if (etfci->combined_header != NULL) + + if (etfci->combined_header) gtk_object_unref (GTK_OBJECT (etfci->combined_header)); - - gdk_font_unref(etfci->font); + etfci->combined_header = NULL; + + if (etfci->font) + gdk_font_unref(etfci->font); + etfci->font = NULL; if (GTK_OBJECT_CLASS (etfci_parent_class)->destroy) (*GTK_OBJECT_CLASS (etfci_parent_class)->destroy) (object); @@ -206,8 +211,12 @@ etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flag item->y1 = c1.y; item->x2 = c2.x; item->y2 = c2.y; - +#ifndef NO_WARNINGS +#warning Group Child bounds !? +#endif +#if 0 gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), item); +#endif } gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); } @@ -217,8 +226,8 @@ etfci_font_load (ETableFieldChooserItem *etfci) { if (etfci->font) gdk_font_unref (etfci->font); - - etfci->font = GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style->font; + + etfci->font = gtk_style_get_font (GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style); gdk_font_ref(etfci->font); } |