[gtkglarea] gdkgl.c: Use G_DEFINE_TYPE() to define GdkGLContext
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkglarea] gdkgl.c: Use G_DEFINE_TYPE() to define GdkGLContext
- Date: Wed, 26 Mar 2014 00:00:26 +0000 (UTC)
commit 8b1018f186d826cb8913419e5aae15f5b049044e
Author: Javier Jardón <jjardon gnome org>
Date: Tue Mar 25 23:47:57 2014 +0000
gdkgl.c: Use G_DEFINE_TYPE() to define GdkGLContext
gtkgl/gdkgl.c | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/gtkgl/gdkgl.c b/gtkgl/gdkgl.c
index dad97c8..f8a5210 100644
--- a/gtkgl/gdkgl.c
+++ b/gtkgl/gdkgl.c
@@ -62,7 +62,6 @@ struct _GdkGLContextClass {
};
typedef struct _GdkGLContextClass GdkGLContextClass;
-static GObjectClass *glcontext_parent_class;
static void gdk_gl_context_class_init (GdkGLContextClass *class);
/*
@@ -195,32 +194,7 @@ int gdk_gl_get_config(GdkVisual *visual, int attrib)
* GL context support
*/
-GType
-gdk_gl_context_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (GdkGLContextClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gdk_gl_context_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GdkGLContext),
- 0, /* n_preallocs */
- (GInstanceInitFunc) NULL,
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT,
- "GdkGLContext",
- &object_info, 0);
- }
- return object_type;
-}
+G_DEFINE_TYPE (GdkGLContext, gdk_gl_context, G_TYPE_OBJECT)
static void
gdk_gl_context_finalize(GObject *object)
@@ -249,7 +223,7 @@ gdk_gl_context_finalize(GObject *object)
context->glxcontext = NULL;
#endif
- (* glcontext_parent_class->finalize)(object);
+ G_OBJECT_CLASS (gdk_gl_context_parent_class)->finalize (object);
}
@@ -259,12 +233,17 @@ gdk_gl_context_class_init(GdkGLContextClass *class)
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS(class);
- glcontext_parent_class = g_type_class_peek_parent(class);
gobject_class->finalize = gdk_gl_context_finalize;
}
+static void
+gdk_gl_context_init (GdkGLContext *gl_context)
+{
+}
+
+
GdkGLContext *
gdk_gl_context_new(GdkVisual *visual)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]