diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-04-04 14:02:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-04 14:02:03 +0000 |
| commit | 10f0736ac7ae3cc388540083133170d48567c092 (patch) | |
| tree | 0bb96ae1608227fad63c4749137e511bc88bfb32 /gdk/gdkpixmap.c | |
| parent | 7d49b31a7919f04877f8bc7758f07efadc5e626c (diff) | |
| download | gtk+-10f0736ac7ae3cc388540083133170d48567c092.tar.gz | |
Use G_DEFINE_TYPE.
2006-04-04 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkdisplay.c:
* gdk/gdkdisplaymanager.c:
* gdk/gdkdraw.c:
* gdk/gdkkeys.c:
* gdk/gdkpixmap.c:
* gdk/gdkscreen.c:
* gdk/gdkwindow.c:
* gdk/x11/gdkcolor-x11.c:
* gdk/x11/gdkdisplay-x11.c:
* gdk/x11/gdkdnd-x11.c:
* gdk/x11/gdkdrawable-x11.c:
* gdk/x11/gdkgc-x11.c:
* gdk/x11/gdkimage-x11.c:
* gdk/x11/gdkinput.c:
* gdk/x11/gdkpixmap-x11.c:
* gdk/x11/gdkscreen-x11.c:
* gdk/x11/gdkwindow-x11.c: Use G_DEFINE_TYPE.
* gdk/x11/gdkcolor-x11.c:
* gdk/x11/gdkdnd-x11.c:
* gdk/x11/gdkimage-x11.c: Use instance private data.
Diffstat (limited to 'gdk/gdkpixmap.c')
| -rw-r--r-- | gdk/gdkpixmap.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 9c2d1100f3..bee1035915 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -153,39 +153,9 @@ static void gdk_pixmap_real_set_colormap (GdkDrawable *drawable, static GdkColormap* gdk_pixmap_real_get_colormap (GdkDrawable *drawable); static GdkScreen* gdk_pixmap_real_get_screen (GdkDrawable *drawable); -static void gdk_pixmap_init (GdkPixmapObject *pixmap); -static void gdk_pixmap_class_init (GdkPixmapObjectClass *klass); static void gdk_pixmap_finalize (GObject *object); -static gpointer parent_class = NULL; - -GType -gdk_pixmap_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - static const GTypeInfo object_info = - { - sizeof (GdkPixmapObjectClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gdk_pixmap_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdkPixmapObject), - 0, /* n_preallocs */ - (GInstanceInitFunc) gdk_pixmap_init, - }; - - object_type = g_type_register_static (GDK_TYPE_DRAWABLE, - g_intern_static_string ("GdkPixmap"), - &object_info, 0); - } - - return object_type; -} +G_DEFINE_TYPE (GdkPixmapObject, gdk_pixmap, GDK_TYPE_DRAWABLE); static void gdk_pixmap_init (GdkPixmapObject *pixmap) @@ -200,8 +170,6 @@ gdk_pixmap_class_init (GdkPixmapObjectClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->finalize = gdk_pixmap_finalize; drawable_class->create_gc = gdk_pixmap_create_gc; @@ -237,7 +205,7 @@ gdk_pixmap_finalize (GObject *object) g_object_unref (obj->impl); obj->impl = NULL; - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gdk_pixmap_parent_class)->finalize (object); } static GdkGC * |