[gtk+] GL: Follow naming conventions
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GL: Follow naming conventions
- Date: Wed, 22 Oct 2014 05:16:41 +0000 (UTC)
commit 6440263ef304877d3d78b24df7d290e06c7d979e
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Oct 21 23:39:05 2014 -0400
GL: Follow naming conventions
All the GDK type defines are GDK_TYPE_..., so follow this
pattern for the GLContext subclasses as well.
gdk/wayland/gdkglcontext-wayland.c | 2 +-
gdk/wayland/gdkwaylandglcontext.h | 6 +++---
gdk/x11/gdkglcontext-x11.c | 2 +-
gdk/x11/gdkx11glcontext.h | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 60d4de7..8894e8b 100644
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -357,7 +357,7 @@ gdk_wayland_window_create_gl_context (GdkWindow *window,
GDK_NOTE (OPENGL,
g_print ("Created EGL context[%p]\n", ctx));
- context = g_object_new (GDK_WAYLAND_TYPE_GL_CONTEXT,
+ context = g_object_new (GDK_TYPE_WAYLAND_GL_CONTEXT,
"window", window,
"visual", gdk_window_get_visual (window),
NULL);
diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index d57d76b..a2bb2c9 100644
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -30,9 +30,9 @@
G_BEGIN_DECLS
-#define GDK_WAYLAND_TYPE_GL_CONTEXT (gdk_wayland_gl_context_get_type ())
-#define GDK_WAYLAND_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GDK_WAYLAND_TYPE_GL_CONTEXT, GdkWaylandGLContext))
-#define GDK_WAYLAND_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_WAYLAND_TYPE_GL_CONTEXT))
+#define GDK_TYPE_WAYLAND_GL_CONTEXT (gdk_wayland_gl_context_get_type ())
+#define GDK_WAYLAND_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GDK_TYPE_WAYLAND_GL_CONTEXT, GdkWaylandGLContext))
+#define GDK_WAYLAND_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_WAYLAND_GL_CONTEXT))
typedef struct _GdkWaylandGLContext GdkWaylandGLContext;
typedef struct _GdkWaylandGLContextClass GdkWaylandGLContextClass;
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 7811bcf..3ddb05e 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -788,7 +788,7 @@ gdk_x11_window_create_gl_context (GdkWindow *window,
glx_context,
is_direct ? "direct" : "indirect"));
- context = g_object_new (GDK_X11_TYPE_GL_CONTEXT,
+ context = g_object_new (GDK_TYPE_X11_GL_CONTEXT,
"window", window,
"visual", gdk_visual,
NULL);
diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 5fbf36f..6d1d21a 100644
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -29,9 +29,9 @@
G_BEGIN_DECLS
-#define GDK_X11_TYPE_GL_CONTEXT (gdk_x11_gl_context_get_type ())
-#define GDK_X11_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_X11_TYPE_GL_CONTEXT,
GdkX11GLContext))
-#define GDK_X11_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_X11_TYPE_GL_CONTEXT))
+#define GDK_TYPE_X11_GL_CONTEXT (gdk_x11_gl_context_get_type ())
+#define GDK_X11_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_X11_GL_CONTEXT,
GdkX11GLContext))
+#define GDK_X11_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_X11_GL_CONTEXT))
typedef struct _GdkX11GLContext GdkX11GLContext;
typedef struct _GdkX11GLContextClass GdkX11GLContextClass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]