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, 11 insertions, 31 deletions

diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index c523548765..932144a343 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -58,7 +58,7 @@
 
 #include "e-text.h"
 
-#define PARENT_TYPE (gnome_canvas_item_get_type())
+G_DEFINE_TYPE (EText, e_text, GNOME_TYPE_CANVAS_ITEM)
 
 #define BORDER_INDENT 3
 #define d(x)
@@ -168,7 +168,6 @@ static gboolean e_text_delete_surrounding_cb   (GtkIMContext *context,
 						gint          n_chars,
 						EText        *text);
 
-static GnomeCanvasItemClass *parent_class;
 static GdkAtom clipboard_atom = GDK_NONE;
 
 
@@ -277,8 +276,8 @@ e_text_dispose (GObject *object)
 		text->font_desc = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	if (G_OBJECT_CLASS (e_text_parent_class)->dispose)
+		(* G_OBJECT_CLASS (e_text_parent_class)->dispose) (object);
 }
 
 static void
@@ -1199,8 +1198,8 @@ e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int fla
 
 	text = E_TEXT (item);
 
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
+	if (GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->update)
+		(* GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->update) (item, affine, clip_path, flags);
 
 	if ( text->needs_recalc_bounds
 	     || (flags & GNOME_CANVAS_UPDATE_AFFINE)) {
@@ -1239,8 +1238,8 @@ e_text_realize (GnomeCanvasItem *item)
 
 	text = E_TEXT (item);
 
-	if (parent_class->realize)
-		(* parent_class->realize) (item);
+	if (GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->realize)
+		(* GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->realize) (item);
 
 	create_layout (text);
 
@@ -1273,8 +1272,8 @@ e_text_unrealize (GnomeCanvasItem *item)
 	gdk_cursor_unref (text->default_cursor);
 	text->default_cursor = NULL;
 
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (item);
+	if (GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->unrealize)
+		(* GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->unrealize) (item);
 }
 
 static void
@@ -2486,8 +2485,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 	}
 	if (return_val)
 		return return_val;
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
+	if (GNOME_CANVAS_ITEM_CLASS(e_text_parent_class)->event)
+		return GNOME_CANVAS_ITEM_CLASS(e_text_parent_class)->event(item, event);
 	else
 		return 0;
 }
@@ -3415,8 +3414,6 @@ e_text_class_init (ETextClass *klass)
 	gobject_class = (GObjectClass *) klass;
 	item_class = (GnomeCanvasItemClass *) klass;
 
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
 	gobject_class->dispose = e_text_dispose;
 	gobject_class->set_property = e_text_set_property;
 	gobject_class->get_property = e_text_get_property;
@@ -3808,23 +3805,6 @@ e_text_init (EText *text)
 	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
 }
 
-/**
- * e_text_get_type:
- * @void: 
- * 
- * Registers the &EText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EText class.
- **/
-E_MAKE_TYPE (e_text,
-	     "EText",
-	     EText,
-	     e_text_class_init,
-	     e_text_init,
-	     PARENT_TYPE)
-
-
 
 /* IM Context Callbacks */
 static void