aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-canvas-background.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/misc/e-canvas-background.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/misc/e-canvas-background.c')
-rw-r--r--widgets/misc/e-canvas-background.c40
1 files changed, 15 insertions, 25 deletions
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 02f8f1675c..334b01f232 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -38,7 +38,9 @@
#include "e-canvas-background.h"
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
+/* workaround for avoiding API broken */
+#define ecb_get_type e_canvas_background_get_type
+G_DEFINE_TYPE (ECanvasBackground, ecb, GNOME_TYPE_CANVAS_ITEM)
#define d(x)
@@ -55,8 +57,6 @@ struct _ECanvasBackgroundPrivate {
guint needs_redraw : 1;
};
-static GnomeCanvasItemClass *parent_class;
-
enum {
STYLE_SET,
LAST_SIGNAL
@@ -131,8 +131,8 @@ ecb_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
ArtPoint o1, o2;
ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
- if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
- GNOME_CANVAS_ITEM_CLASS (parent_class)->update (item, affine, clip_path, flags);
+ if (GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->update)
+ GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->update (item, affine, clip_path, flags);
o1.x = item->x1;
o1.y = item->y1;
@@ -191,8 +191,8 @@ ecb_dispose (GObject *object)
ecb->priv = NULL;
}
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ if (G_OBJECT_CLASS (ecb_parent_class)->dispose)
+ G_OBJECT_CLASS (ecb_parent_class)->dispose (object);
}
static void
@@ -316,10 +316,8 @@ ecb_get_property (GObject *object,
}
static void
-ecb_init (GnomeCanvasItem *item)
+ecb_init (ECanvasBackground *ecb)
{
- ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
-
ecb->priv = g_new (ECanvasBackgroundPrivate, 1);
ecb->priv->color.pixel = 0;
@@ -339,8 +337,8 @@ ecb_realize (GnomeCanvasItem *item)
{
ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
- if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
- GNOME_CANVAS_ITEM_CLASS (parent_class)->realize (item);
+ if (GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize)
+ GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize (item);
ecb->priv->gc = gdk_gc_new (item->canvas->layout.bin_window);
get_color (ecb);
@@ -361,8 +359,8 @@ ecb_unrealize (GnomeCanvasItem *item)
g_object_unref (ecb->priv->gc);
ecb->priv->gc = NULL;
- if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
- GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize (item);
+ if (GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->unrealize)
+ GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->unrealize (item);
}
static void
@@ -433,12 +431,10 @@ ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style)
}
static void
-ecb_class_init (GObjectClass *object_class)
+ecb_class_init (ECanvasBackgroundClass *ecb_class)
{
- GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
- ECanvasBackgroundClass *ecb_class = (ECanvasBackgroundClass *) object_class;
-
- parent_class = g_type_class_ref (PARENT_OBJECT_TYPE);
+ GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (ecb_class);
+ GObjectClass *object_class = G_OBJECT_CLASS (ecb_class);
object_class->dispose = ecb_dispose;
object_class->set_property = ecb_set_property;
@@ -517,9 +513,3 @@ ecb_class_init (GObjectClass *object_class)
G_TYPE_NONE, 1, GTK_TYPE_STYLE);
}
-E_MAKE_TYPE (e_canvas_background,
- "ECanvasBackground",
- ECanvasBackground,
- ecb_class_init,
- ecb_init,
- PARENT_OBJECT_TYPE)