From ba0bc7dff09ade6b8014183c44c4c44b42ed1396 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 26 Nov 2004 15:15:36 +0000 Subject: test prog 2004-11-26 JP Rosevear * test-info-label.c: test prog * e-url-entry.c: get image directly from icon factory * e-combo-button.c: ditto; convert to G_DEFINE_TYPE * e-activity-handler.c: convert to G_DEFINE_TYPE * e-task-widget.c: ditto * e-task-bar.c: ditto * e-multi-config-dialog.c: ditto * e-dropdown-button.c: ditto * e-cell-renderer-combo.c: ditto * e-cell-date-edit.c: ditto * e-calendar.c: ditto * e-calendar-item.c: ditto * Makefile.am: don't build the title bar, build an info label test program svn path=/trunk/; revision=27999 --- widgets/misc/e-task-widget.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'widgets/misc/e-task-widget.c') diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index ab610f77f9..c7621d61fc 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -34,14 +34,9 @@ #include -#include - #define SPACING 2 -#define PARENT_TYPE (gtk_event_box_get_type ()) -static GtkEventBoxClass *parent_class = NULL; - struct _ETaskWidgetPrivate { char *component_id; @@ -52,7 +47,8 @@ struct _ETaskWidgetPrivate { GtkWidget *image; }; - +G_DEFINE_TYPE (ETaskWidget, e_task_widget, GTK_TYPE_EVENT_BOX) + /* GObject methods. */ static void @@ -75,7 +71,7 @@ impl_dispose (GObject *object) priv->icon_pixbuf = NULL; } - (* G_OBJECT_CLASS (parent_class)->dispose) (object); + (* G_OBJECT_CLASS (e_task_widget_parent_class)->dispose) (object); } static void @@ -90,21 +86,21 @@ impl_finalize (GObject *object) g_free (priv->component_id); g_free (priv); - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (e_task_widget_parent_class)->finalize) (object); } static void -class_init (GObjectClass *object_class) +e_task_widget_class_init (ETaskWidgetClass *klass) { - parent_class = g_type_class_ref(PARENT_TYPE); - + GObjectClass *object_class = G_OBJECT_CLASS (klass); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } static void -init (ETaskWidget *task_widget) +e_task_widget_init (ETaskWidget *task_widget) { ETaskWidgetPrivate *priv; @@ -248,5 +244,3 @@ e_task_widget_get_component_id (ETaskWidget *task_widget) return task_widget->priv->component_id; } - -E_MAKE_TYPE (e_task_widget, "ETaskWidget", ETaskWidget, class_init, init, PARENT_TYPE) -- cgit v1.2.3