Remove E_MAKE_TYPE macro.

2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>

	* 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

1 files changed, 15 insertions, 13 deletions

diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 1751176637..860133dfa7 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -51,7 +51,8 @@
 #include "tree-unexpanded.xpm"
 
 
-#define PARENT_TYPE e_cell_get_type ()
+G_DEFINE_TYPE (ECellTree, e_cell_tree, E_CELL_TYPE)
+
 
 typedef struct {
 	ECellView    cell_view;
@@ -65,8 +66,6 @@ typedef struct {
 
 } ECellTreeView;
 
-static ECellClass *parent_class;
-
 #define INDENT_AMOUNT 16
 
 ECellView *
@@ -183,8 +182,8 @@ ect_realize (ECellView *ecell_view)
 				    GDK_JOIN_MITER);
 	gdk_gc_set_dashes (tree_view->gc, 0, (gint8 *)"\1\1", 2);
 
-	if (parent_class->realize)
-		(* parent_class->realize) (ecell_view);
+	if (E_CELL_CLASS (e_cell_tree_parent_class)->realize)
+		(* E_CELL_CLASS (e_cell_tree_parent_class)->realize) (ecell_view);
 }
 
 /*
@@ -201,8 +200,8 @@ ect_unrealize (ECellView *ecv)
 	g_object_unref (tree_view->gc);
 	tree_view->gc = NULL;
 
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
+	if (E_CELL_CLASS (e_cell_tree_parent_class)->unrealize)
+		(* E_CELL_CLASS (e_cell_tree_parent_class)->unrealize) (ecv);
 }
 
 static void
@@ -818,13 +817,14 @@ ect_dispose (GObject *object)
 		g_object_unref (ect->closed_pixbuf);
 	ect->closed_pixbuf = NULL;
 
-	G_OBJECT_CLASS (parent_class)->dispose (object);
+	G_OBJECT_CLASS (e_cell_tree_parent_class)->dispose (object);
 }
 
 static void
-e_cell_tree_class_init (GObjectClass *object_class)
+e_cell_tree_class_init (ECellTreeClass *klass)
 {
-	ECellClass *ecc = (ECellClass *) object_class;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	ECellClass *ecc = E_CELL_CLASS (klass);
 
 	object_class->dispose = ect_dispose;
 
@@ -843,12 +843,14 @@ e_cell_tree_class_init (GObjectClass *object_class)
 	ecc->show_tooltip     = ect_show_tooltip;
 	ecc->get_bg_color     = ect_get_bg_color;
 
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
         gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TREE_TYPE, gal_a11y_e_cell_tree_new);
 }
 
-E_MAKE_TYPE(e_cell_tree, "ECellTree", ECellTree, e_cell_tree_class_init, NULL, PARENT_TYPE)
+static void
+e_cell_tree_init (ECellTree *ect)
+{
+	/* nothing to do */
+}
 
 /**
  * e_cell_tree_construct: