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, 10 insertions, 16 deletions

diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 4a3e8efccc..1fb97dae7d 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -55,7 +55,7 @@
 
 #define COLUMN_HEADER_HEIGHT 16
 
-#define PARENT_TYPE gtk_table_get_type ()
+G_DEFINE_TYPE (ETable, e_table, GTK_TYPE_TABLE)
 
 #define d(x)
 
@@ -65,8 +65,6 @@
 #define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x)))
 #endif
 
-static GtkObjectClass *parent_class;
-
 enum {
 	CURSOR_CHANGE,
 	CURSOR_ACTIVATED,
@@ -223,8 +221,8 @@ static void
 et_size_request (GtkWidget *widget, GtkRequisition *request)
 {
 	ETable *et = E_TABLE (widget);
-	if (GTK_WIDGET_CLASS (parent_class)->size_request)
-		GTK_WIDGET_CLASS (parent_class)->size_request (widget, request);
+	if (GTK_WIDGET_CLASS (e_table_parent_class)->size_request)
+		GTK_WIDGET_CLASS (e_table_parent_class)->size_request (widget, request);
 	if (et->horizontal_resize)
 		request->width = MAX (request->width, et->header_width);
 }
@@ -393,7 +391,7 @@ et_dispose (GObject *object)
 	g_free(et->domain);
 	et->domain = NULL;
 
-	(*G_OBJECT_CLASS (parent_class)->dispose)(object);
+	(*G_OBJECT_CLASS (e_table_parent_class)->dispose)(object);
 }
 
 static void
@@ -401,8 +399,8 @@ et_unrealize (GtkWidget *widget)
 {
 	scroll_off (E_TABLE (widget));
 
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+	if (GTK_WIDGET_CLASS (e_table_parent_class)->unrealize)
+		GTK_WIDGET_CLASS (e_table_parent_class)->unrealize (widget);
 }
 
 static gboolean
@@ -500,16 +498,15 @@ et_finalize (GObject *object)
 
 	g_free(et->domain);
 	et->domain = NULL;
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (e_table_parent_class)->finalize (object);
 }
 
 static void
-e_table_init (GtkObject *object)
+e_table_init (ETable *e_table)
 {
-	ETable *e_table = E_TABLE (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
+	GtkTable *gtk_table = GTK_TABLE (e_table);
 
-	GTK_WIDGET_SET_FLAGS (e_table, GTK_CAN_FOCUS);
+	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (e_table), GTK_CAN_FOCUS);
 
 	gtk_table->homogeneous          = FALSE;
 
@@ -3062,8 +3059,6 @@ e_table_class_init (ETableClass *class)
 	object_class                    = (GObjectClass *) class;
 	widget_class                    = (GtkWidgetClass *) class;
 
-	parent_class                    = g_type_class_peek_parent (class);
-
 	object_class->dispose           = et_dispose;
 	object_class->finalize          = et_finalize;
 	object_class->set_property      = et_set_property;
@@ -3345,4 +3340,3 @@ e_table_class_init (ETableClass *class)
 	gal_a11y_e_table_init ();
 }
 
-E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE)