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/gdkscreen.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/gdkscreen.c')
| -rw-r--r-- | gdk/gdkscreen.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 47db11a95c..6f531a96f0 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -29,8 +29,6 @@ #include "gdkintl.h" #include "gdkalias.h" -static void gdk_screen_class_init (GdkScreenClass *klass); -static void gdk_screen_init (GdkScreen *screen); static void gdk_screen_dispose (GObject *object); static void gdk_screen_finalize (GObject *object); static void gdk_screen_set_property (GObject *object, @@ -57,42 +55,13 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer parent_class = NULL; - -GType -gdk_screen_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - static const GTypeInfo object_info = - { - sizeof (GdkScreenClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gdk_screen_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdkScreen), - 0, /* n_preallocs */ - (GInstanceInitFunc) gdk_screen_init, - }; - - object_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GdkScreen"), &object_info, 0); - } - - return object_type; -} +G_DEFINE_TYPE(GdkScreen, gdk_screen, G_TYPE_OBJECT); static void gdk_screen_class_init (GdkScreenClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->dispose = gdk_screen_dispose; object_class->finalize = gdk_screen_finalize; object_class->set_property = gdk_screen_set_property; @@ -164,7 +133,7 @@ gdk_screen_dispose (GObject *object) } } - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (gdk_screen_parent_class)->dispose (object); } static void @@ -175,7 +144,7 @@ gdk_screen_finalize (GObject *object) if (screen->font_options) cairo_font_options_destroy (screen->font_options); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gdk_screen_parent_class)->finalize (object); } void |