From 6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Fri, 27 Jul 2007 21:14:15 +0000 Subject: Remove E_MAKE_TYPE macro. 2007-07-27 Hiroyuki Ikezoe * e-util/e-util.h: Remove E_MAKE_TYPE macro. * e-util/e-bit-array.c: * e-util/e-sorter-array.c: * e-util/e-sorter.c: * e-util/e-text-event-processor-emacs-like.c: * e-util/e-text-event-processor.c: * widgets/menus/gal-define-views-dialog.c: * widgets/menus/gal-define-views-model.c: * widgets/menus/gal-view-collection.c: * widgets/menus/gal-view-etable.c: * widgets/menus/gal-view-factory-etable.c: * widgets/menus/gal-view-factory.c: * widgets/menus/gal-view-instance-save-as-dialog.c: * widgets/menus/gal-view-instance.c: * widgets/menus/gal-view-new-dialog.c: * widgets/menus/gal-view.c: * widgets/misc/e-canvas-background.c: * widgets/misc/e-canvas-vbox.c: * widgets/misc/e-canvas.c: * widgets/misc/e-printable.c: * widgets/misc/e-reflow-model.c: * widgets/misc/e-reflow.c: * widgets/misc/e-selection-model-array.c: * widgets/misc/e-selection-model-simple.c: * widgets/misc/e-selection-model.c: * widgets/table/e-cell-checkbox.c: * widgets/table/e-cell-combo.c: * widgets/table/e-cell-date.c: * widgets/table/e-cell-float.c: * widgets/table/e-cell-hbox.c: * widgets/table/e-cell-number.c: * widgets/table/e-cell-pixbuf.c: * widgets/table/e-cell-popup.c: * widgets/table/e-cell-progress.c: * widgets/table/e-cell-size.c: * widgets/table/e-cell-spin-button.c: * widgets/table/e-cell-text.c: * widgets/table/e-cell-toggle.c: * widgets/table/e-cell-tree.c: * widgets/table/e-cell-vbox.c: * widgets/table/e-cell.c: * widgets/table/e-table-click-to-add.c: * widgets/table/e-table-col.c: * widgets/table/e-table-column-specification.c: * widgets/table/e-table-column.c: * widgets/table/e-table-config-field.c: * widgets/table/e-table-config.c: * widgets/table/e-table-extras.c: * widgets/table/e-table-field-chooser-dialog.c: * widgets/table/e-table-field-chooser-item.c: * widgets/table/e-table-field-chooser.c: * widgets/table/e-table-group-container.c: * widgets/table/e-table-group-leaf.c: * widgets/table/e-table-group.c: * widgets/table/e-table-header-item.c: * widgets/table/e-table-header.c: * widgets/table/e-table-item.c: * widgets/table/e-table-memory-callbacks.c: * widgets/table/e-table-memory-store.c: * widgets/table/e-table-memory.c: * widgets/table/e-table-model.c: * widgets/table/e-table-one.c: * widgets/table/e-table-scrolled.c: * widgets/table/e-table-search.c: * widgets/table/e-table-selection-model.c: * widgets/table/e-table-simple.c: * widgets/table/e-table-sort-info.c: * widgets/table/e-table-sorted-variable.c: * widgets/table/e-table-sorted.c: * widgets/table/e-table-sorter.c: * widgets/table/e-table-specification.c: * widgets/table/e-table-state.c: * widgets/table/e-table-subset-variable.c: * widgets/table/e-table-subset.c: * widgets/table/e-table-without.c: * widgets/table/e-table.c: * widgets/table/e-tree-memory-callbacks.c: * widgets/table/e-tree-memory.c: * widgets/table/e-tree-model.c: * widgets/table/e-tree-scrolled.c: * widgets/table/e-tree-selection-model.c: * widgets/table/e-tree-simple.c: * widgets/table/e-tree-sorted-variable.c: * widgets/table/e-tree-sorted.c: * widgets/table/e-tree-table-adapter.c: * widgets/table/e-tree.c: * widgets/text/e-completion-callbacks.c: * widgets/text/e-completion-view.c: * widgets/text/e-completion.c: * widgets/text/e-entry.c: * widgets/text/e-table-text-model.c: * widgets/text/e-text-model-uri.c: * widgets/text/e-text-model.c: * widgets/text/e-text.c: Use G_DEFINE_TYPE instead of E_MAKE_TYPE. svn path=/trunk/; revision=33864 --- widgets/table/e-cell-popup.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'widgets/table/e-cell-popup.c') diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index c2c8c28554..a8a8d5c4ca 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -45,7 +45,7 @@ #define E_CELL_POPUP_ARROW_YPAD 3 -static void e_cell_popup_class_init (GtkObjectClass *object_class); +static void e_cell_popup_class_init (ECellPopupClass *klass); static void e_cell_popup_init (ECellPopup *ecp); static void e_cell_popup_dispose (GObject *object); @@ -115,19 +115,14 @@ static gint e_cell_popup_do_popup (ECellPopupView *ecp_view, int row, int model_col); -static ECellClass *parent_class; - - -E_MAKE_TYPE (e_cell_popup, "ECellPopup", ECellPopup, e_cell_popup_class_init, - e_cell_popup_init, e_cell_get_type()) - +G_DEFINE_TYPE (ECellPopup, e_cell_popup, E_CELL_TYPE) static void -e_cell_popup_class_init (GtkObjectClass *object_class) +e_cell_popup_class_init (ECellPopupClass *klass) { - ECellClass *ecc = (ECellClass *) object_class; + ECellClass *ecc = E_CELL_CLASS (klass); - G_OBJECT_CLASS (object_class)->dispose = e_cell_popup_dispose; + G_OBJECT_CLASS (klass)->dispose = e_cell_popup_dispose; ecc->new_view = ecp_new_view; ecc->kill_view = ecp_kill_view; @@ -144,7 +139,6 @@ e_cell_popup_class_init (GtkObjectClass *object_class) ecc->show_tooltip = ecp_show_tooltip; ecc->get_bg_color = ecp_get_bg_color; - parent_class = g_type_class_ref (E_CELL_TYPE); gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_POPUP_TYPE, gal_a11y_e_cell_popup_new); @@ -187,7 +181,7 @@ e_cell_popup_dispose (GObject *object) g_object_unref (ecp->child); ecp->child = NULL; - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (e_cell_popup_parent_class)->dispose (object); } @@ -249,8 +243,8 @@ ecp_realize (ECellView *ecv) e_cell_realize (ecp_view->child_view); - if (parent_class->realize) - (* parent_class->realize) (ecv); + if (E_CELL_CLASS (e_cell_popup_parent_class)->realize) + (* E_CELL_CLASS (e_cell_popup_parent_class)->realize) (ecv); } @@ -264,8 +258,8 @@ ecp_unrealize (ECellView *ecv) e_cell_unrealize (ecp_view->child_view); - if (parent_class->unrealize) - (* parent_class->unrealize) (ecv); + if (E_CELL_CLASS (e_cell_popup_parent_class)->unrealize) + (* E_CELL_CLASS (e_cell_popup_parent_class)->unrealize) (ecv); } -- cgit v1.2.3