AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-11 21:20:09 +00:00
Code Issues Projects Releases Wiki Activity

API: gdk: Rename GdkWindowObjectClass to GdkWindowClass

Browse Source 
Be consistent in the naming of objects.
This commit is contained in:
Benjamin Otte 2010-12-03 16:14:31 +01:00
parent d916398dd2
commit 350fb1d55c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gdk/gdk3-sections.txt
View File

@ -516,7 +516,7 @@ GDK_TYPE_WM_FUNCTION
gdk_window_get_type gdk_window_get_type
gdk_drawable_get_type gdk_drawable_get_type
GdkWindowObject GdkWindowObject
GdkWindowObjectClass GdkWindowClass
GdkWindowImpl GdkWindowImpl
GdkWindowImplClass GdkWindowImplClass
GdkWindowRedirect GdkWindowRedirect

14
gdk/gdkwindow.c
View File

@ -223,7 +223,7 @@ static void gdk_window_drop_cairo_surface (GdkWindow *private);
static void gdk_window_free_paint_stack (GdkWindow *window); static void gdk_window_free_paint_stack (GdkWindow *window);
static void gdk_window_init (GdkWindow *window); static void gdk_window_init (GdkWindow *window);
static void gdk_window_class_init (GdkWindowObjectClass *klass); static void gdk_window_class_init (GdkWindowClass *klass);
static void gdk_window_finalize (GObject *object); static void gdk_window_finalize (GObject *object);
static void gdk_window_set_property (GObject *object, static void gdk_window_set_property (GObject *object,
@ -284,7 +284,7 @@ gdk_window_get_type (void)
if (!object_type) if (!object_type)
object_type = g_type_register_static_simple (G_TYPE_OBJECT, object_type = g_type_register_static_simple (G_TYPE_OBJECT,
"GdkWindow", "GdkWindow",
sizeof (GdkWindowObjectClass), sizeof (GdkWindowClass),
(GClassInitFunc) gdk_window_class_init, (GClassInitFunc) gdk_window_class_init,
sizeof (GdkWindow), sizeof (GdkWindow),
(GInstanceInitFunc) gdk_window_init, (GInstanceInitFunc) gdk_window_init,
@ -362,7 +362,7 @@ create_surface_accumulator (GSignalInvocationHint *ihint,
static GQuark quark_pointer_window = 0; static GQuark quark_pointer_window = 0;
static void static void
gdk_window_class_init (GdkWindowObjectClass *klass) gdk_window_class_init (GdkWindowClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
@ -412,7 +412,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
g_signal_new (g_intern_static_string ("pick-embedded-child"), g_signal_new (g_intern_static_string ("pick-embedded-child"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkWindowObjectClass, pick_embedded_child), G_STRUCT_OFFSET (GdkWindowClass, pick_embedded_child),
accumulate_get_window, NULL, accumulate_get_window, NULL,
_gdk_marshal_OBJECT__DOUBLE_DOUBLE, _gdk_marshal_OBJECT__DOUBLE_DOUBLE,
GDK_TYPE_WINDOW, GDK_TYPE_WINDOW,
@ -439,7 +439,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
g_signal_new (g_intern_static_string ("to-embedder"), g_signal_new (g_intern_static_string ("to-embedder"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkWindowObjectClass, to_embedder), G_STRUCT_OFFSET (GdkWindowClass, to_embedder),
NULL, NULL, NULL, NULL,
_gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER,
G_TYPE_NONE, G_TYPE_NONE,
@ -468,7 +468,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
g_signal_new (g_intern_static_string ("from-embedder"), g_signal_new (g_intern_static_string ("from-embedder"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkWindowObjectClass, from_embedder), G_STRUCT_OFFSET (GdkWindowClass, from_embedder),
NULL, NULL, NULL, NULL,
_gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER,
G_TYPE_NONE, G_TYPE_NONE,
@ -503,7 +503,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
g_signal_new (g_intern_static_string ("create-surface"), g_signal_new (g_intern_static_string ("create-surface"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkWindowObjectClass, create_surface), G_STRUCT_OFFSET (GdkWindowClass, create_surface),
create_surface_accumulator, NULL, create_surface_accumulator, NULL,
_gdk_marshal_BOXED__INT_INT, _gdk_marshal_BOXED__INT_INT,
CAIRO_GOBJECT_TYPE_SURFACE, CAIRO_GOBJECT_TYPE_SURFACE,

8
gdk/gdkwindow.h
View File

@ -475,17 +475,17 @@ struct _GdkPointerHooks
}; };
typedef struct _GdkWindowObject GdkWindowObject; typedef struct _GdkWindowObject GdkWindowObject;
typedef struct _GdkWindowObjectClass GdkWindowObjectClass; typedef struct _GdkWindowClass GdkWindowClass;
#define GDK_TYPE_WINDOW (gdk_window_get_type ()) #define GDK_TYPE_WINDOW (gdk_window_get_type ())
#define GDK_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow)) #define GDK_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
#define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass)) #define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowClass))
#define GDK_IS_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW)) #define GDK_IS_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
#define GDK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW)) #define GDK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW))
#define GDK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass)) #define GDK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowClass))
struct _GdkWindowObjectClass struct _GdkWindowClass
{ {
GObjectClass parent_class; GObjectClass parent_class;