aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table/e-cell-hbox.c
diff options
context:
space:
mode:
authorHiroyuki Ikezoe <poincare@ikezoe.net>2007-07-28 05:14:15 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-07-28 05:14:15 +0800
commit6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f (patch)
tree64868338277e36a40c6b37106dfb8112fc278264 /widgets/table/e-cell-hbox.c
parent08de5e9e147248b84bc1fa618f7cc9d892ddb136 (diff)
downloadgsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.gz
gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.zst
gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.zip
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
Diffstat (limited to 'widgets/table/e-cell-hbox.c')
-rw-r--r--widgets/table/e-cell-hbox.c27
1 files changed, 10 insertions, 17 deletions
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index f00ab3f4eb..58f8f7194b 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -41,9 +41,7 @@
#include "e-cell-hbox.h"
#include "e-table-item.h"
-#define PARENT_TYPE e_cell_get_type ()
-
-static ECellClass *parent_class;
+G_DEFINE_TYPE (ECellHbox, e_cell_hbox, E_CELL_TYPE)
#define INDENT_AMOUNT 16
#define MAX_CELL_SIZE 25
@@ -117,8 +115,8 @@ ecv_realize (ECellView *ecell_view)
for (i = 0; i < hbox_view->subcell_view_count; i++)
e_cell_realize (hbox_view->subcell_views[i]);
- if (parent_class->realize)
- (* parent_class->realize) (ecell_view);
+ if (E_CELL_CLASS (e_cell_hbox_parent_class)->realize)
+ (* E_CELL_CLASS (e_cell_hbox_parent_class)->realize) (ecell_view);
}
/*
@@ -134,8 +132,8 @@ ecv_unrealize (ECellView *ecv)
for (i = 0; i < hbox_view->subcell_view_count; i++)
e_cell_unrealize (hbox_view->subcell_views[i]);
- if (parent_class->unrealize)
- (* parent_class->unrealize) (ecv);
+ if (E_CELL_CLASS (e_cell_hbox_parent_class)->unrealize)
+ (* E_CELL_CLASS (e_cell_hbox_parent_class)->unrealize) (ecv);
}
/*
@@ -260,13 +258,14 @@ ecv_dispose (GObject *object)
ecv->subcells = NULL;
ecv->subcell_count = 0;
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (e_cell_hbox_parent_class)->dispose (object);
}
static void
-e_cell_hbox_class_init (GObjectClass *object_class)
+e_cell_hbox_class_init (ECellHboxClass *klass)
{
- ECellClass *ecc = (ECellClass *) object_class;
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ ECellClass *ecc = E_CELL_CLASS (klass);
object_class->dispose = ecv_dispose;
@@ -280,22 +279,16 @@ e_cell_hbox_class_init (GObjectClass *object_class)
ecc->max_width = ecv_max_width;
- parent_class = g_type_class_ref (PARENT_TYPE);
-
/* gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
}
static void
-e_cell_hbox_init (GtkObject *object)
+e_cell_hbox_init (ECellHbox *ecv)
{
- ECellHbox *ecv = E_CELL_HBOX (object);
-
ecv->subcells = NULL;
ecv->subcell_count = 0;
}
-E_MAKE_TYPE(e_cell_hbox, "ECellHbox", ECellHbox, e_cell_hbox_class_init, e_cell_hbox_init, PARENT_TYPE)
-
/**
* e_cell_hbox_new:
*