diff options
author | Hiroyuki Ikezoe <poincare@ikezoe.net> | 2007-07-28 05:14:15 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-07-28 05:14:15 +0800 |
commit | 6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f (patch) | |
tree | 64868338277e36a40c6b37106dfb8112fc278264 /widgets/table/e-table-header-item.c | |
parent | 08de5e9e147248b84bc1fa618f7cc9d892ddb136 (diff) | |
download | gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.gz gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.bz2 gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.lz gsoc2013-evolution-6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f.tar.xz 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-table-header-item.c')
-rw-r--r-- | widgets/table/e-table-header-item.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 5e45bb2e66..d6096e08c7 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -74,13 +74,12 @@ static guint ethi_signals [LAST_SIGNAL] = { 0, }; #define ETHI_RESIZING(x) ((x)->resize_col != -1) -#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type () +#define ethi_get_type e_table_header_item_get_type +G_DEFINE_TYPE (ETableHeaderItem, ethi, GNOME_TYPE_CANVAS_ITEM) #define ELEMENTS(x) (sizeof (x) / sizeof (x[0])) #define d(x) -static GnomeCanvasItemClass *ethi_parent_class; - static void ethi_drop_table_header (ETableHeaderItem *ethi); /* @@ -1855,12 +1854,11 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) } static void -ethi_class_init (GObjectClass *object_class) +ethi_class_init (ETableHeaderItemClass *klass) { - GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class; + GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - ethi_parent_class = g_type_class_ref (PARENT_OBJECT_TYPE); - object_class->dispose = ethi_dispose; object_class->set_property = ethi_set_property; object_class->get_property = ethi_get_property; @@ -1944,9 +1942,9 @@ ethi_class_init (GObjectClass *object_class) } static void -ethi_init (GnomeCanvasItem *item) +ethi_init (ETableHeaderItem *ethi) { - ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); + GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ethi); ethi->resize_col = -1; @@ -1970,9 +1968,3 @@ ethi_init (GnomeCanvasItem *item) ethi->selected_col = 0; } -E_MAKE_TYPE (e_table_header_item, - "ETableHeaderItem", - ETableHeaderItem, - ethi_class_init, - ethi_init, - PARENT_OBJECT_TYPE) |